summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ssh-rand-helper.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 1b4ac886d..8f7d74546 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120060705
2 - (dtucker) [ssh-rand-helper.c] Don't exit if mkdir fails because the
3 target already exists.
4
120060630 520060630
2 - (dtucker) [openbsd-compat/openbsd-compat.h] SNPRINTF_CONST for snprintf 6 - (dtucker) [openbsd-compat/openbsd-compat.h] SNPRINTF_CONST for snprintf
3 declaration too. Patch from russ at sludge.net. 7 declaration too. Patch from russ at sludge.net.
@@ -4720,4 +4724,4 @@
4720 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4724 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4721 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4725 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4722 4726
4723$Id: ChangeLog,v 1.4353 2006/06/30 06:20:58 dtucker Exp $ 4727$Id: ChangeLog,v 1.4354 2006/07/05 11:35:48 dtucker Exp $
diff --git a/ssh-rand-helper.c b/ssh-rand-helper.c
index d88a246eb..605de72f9 100644
--- a/ssh-rand-helper.c
+++ b/ssh-rand-helper.c
@@ -573,8 +573,8 @@ prng_write_seedfile(void)
573 /* Try to ensure that the parent directory is there */ 573 /* Try to ensure that the parent directory is there */
574 snprintf(filename, sizeof(filename), "%.512s/%s", pw->pw_dir, 574 snprintf(filename, sizeof(filename), "%.512s/%s", pw->pw_dir,
575 _PATH_SSH_USER_DIR); 575 _PATH_SSH_USER_DIR);
576 if (mkdir(filename, 0700) < 0) 576 if (mkdir(filename, 0700) < 0 && errno != EEXIST)
577 fatal("mkdir: %s", strerror(errno)); 577 fatal("mkdir %.200s: %s", filename, strerror(errno));
578 578
579 snprintf(filename, sizeof(filename), "%.512s/%s", pw->pw_dir, 579 snprintf(filename, sizeof(filename), "%.512s/%s", pw->pw_dir,
580 SSH_PRNG_SEED_FILE); 580 SSH_PRNG_SEED_FILE);