- (dtucker) [ssh-rand-helper.c] Don't exit if mkdir fails because the

   target already exists.

diff --git a/ChangeLog b/ChangeLog
index a1893d05c3e364a08e67d5b886b871fb5560eb29..967a70d44fe22778465774208d5a8fa20c5053e7 100644 (file)
--- 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 d88a246eba180d77b7292d77ca5442c5d9fdb8d3..605de72f9fa20e91fca9a318a8b3b4bafb57f26e 100644 (file)
--- 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);