From bfe990af89ebd870625c0740f1c6073a5349771e Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 14 Mar 2012 10:50:34 +0100
Subject: lib/util: cope with races between lstat and mkdir in
 directory_create_or_exist()

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

(limited to 'lib')

diff --git a/lib/util/util.c b/lib/util/util.c
index 54a8c88245..e3d22f3614 100644
--- a/lib/util/util.c
+++ b/lib/util/util.c
@@ -161,7 +161,7 @@ _PUBLIC_ bool directory_create_or_exist(const char *dname, uid_t uid,
 
 		/* Create directory */
 		ret = mkdir(dname, dir_perms);
-		if (ret == -1) {
+		if (ret == -1 && errno != EEXIST) {
 			DEBUG(0, ("mkdir failed on directory "
 				  "%s: %s\n", dname,
 				  strerror(errno)));
@@ -169,7 +169,13 @@ _PUBLIC_ bool directory_create_or_exist(const char *dname, uid_t uid,
 			return false;
 		}
 
-		return true;
+		ret = lstat(dname, &st);
+		if (ret == -1) {
+			DEBUG(0, ("lstat failed on created directory %s: %s\n",
+				  dname, strerror(errno)));
+			umask(old_umask);
+			return false;
+		}
 	}
 
 	/* Check ownership and permission on existing directory */
-- 
cgit