From e03059fc96931416c551d7d0a30eccb727a4f524 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 14 Mar 2012 10:46:14 +0100
Subject: [PATCH] lib/util: use a helper variable in
 directory_create_or_exist()

metze
---
 lib/util/util.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/util/util.c b/lib/util/util.c
index 54237c57d81..54a8c88245e 100644
--- a/lib/util/util.c
+++ b/lib/util/util.c
@@ -145,11 +145,13 @@ _PUBLIC_ bool directory_exist(const char *dname)
 _PUBLIC_ bool directory_create_or_exist(const char *dname, uid_t uid, 
 			       mode_t dir_perms)
 {
+	int ret;
 	mode_t old_umask;
   	struct stat st;
       
 	old_umask = umask(0);
-	if (lstat(dname, &st) == -1) {
+	ret = lstat(dname, &st);
+	if (ret == -1) {
 		if (errno != ENOENT) {
 			DEBUG(0, ("lstat failed on directory %s: %s\n",
 				  dname, strerror(errno)));
@@ -158,7 +160,8 @@ _PUBLIC_ bool directory_create_or_exist(const char *dname, uid_t uid,
 		}
 
 		/* Create directory */
-		if (mkdir(dname, dir_perms) == -1) {
+		ret = mkdir(dname, dir_perms);
+		if (ret == -1) {
 			DEBUG(0, ("mkdir failed on directory "
 				  "%s: %s\n", dname,
 				  strerror(errno)));
-- 
2.11.4.GIT