From e5c27607ef483d2177762093bf1ae8f126bb182a Mon Sep 17 00:00:00 2001
From: dtucker <dtucker>
Date: Wed, 5 Jul 2006 11:35:48 +0000
Subject: [PATCH]  - (dtucker) [ssh-rand-helper.c] Don't exit if mkdir fails
 because the    target already exists.

---
 ChangeLog         | 4 ++++
 ssh-rand-helper.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a1893d05..967a70d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20060705
+ - (dtucker) [ssh-rand-helper.c] Don't exit if mkdir fails because the
+   target already exists.
+
 20060630
  - (dtucker) [openbsd-compat/openbsd-compat.h] SNPRINTF_CONST for snprintf
    declaration too.  Patch from russ at sludge.net.
diff --git a/ssh-rand-helper.c b/ssh-rand-helper.c
index d88a246e..605de72f 100644
--- a/ssh-rand-helper.c
+++ b/ssh-rand-helper.c
@@ -573,8 +573,8 @@ prng_write_seedfile(void)
 	/* Try to ensure that the parent directory is there */
 	snprintf(filename, sizeof(filename), "%.512s/%s", pw->pw_dir,
 	    _PATH_SSH_USER_DIR);
-	if (mkdir(filename, 0700) < 0)
-		fatal("mkdir: %s", strerror(errno));
+	if (mkdir(filename, 0700) < 0 && errno != EEXIST)
+		fatal("mkdir %.200s: %s", filename, strerror(errno));
 
 	snprintf(filename, sizeof(filename), "%.512s/%s", pw->pw_dir,
 	    SSH_PRNG_SEED_FILE);
-- 
2.45.1