- OpenBSD CVS Sync

   - djm@cvs.openbsd.org 2010/04/23 01:47:41
     [ssh-keygen.c]
     bz#1740: display a more helpful error message when $HOME is
     inaccessible while trying to create .ssh directory. Based on patch
     from jchadima AT redhat.com; ok dtucker@

2 files changed, 22 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 6dbaa1647..2ceea43e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+20100510
+ - OpenBSD CVS Sync
+   - djm@cvs.openbsd.org 2010/04/23 01:47:41
+     [ssh-keygen.c]
+     bz#1740: display a more helpful error message when $HOME is
+     inaccessible while trying to create .ssh directory. Based on patch
+     from jchadima AT redhat.com; ok dtucker@
+
 20100423
  - (dtucker) [configure.ac] Bug #1756: Check for the existence of a lib64 dir
    in the openssl install directory (some newer openssl versions do this on at
diff --git a/ssh-keygen.c b/ssh-keygen.c
index f0ddd4cfc..45248237c 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.187 2010/04/16 06:47:04 jmc Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.188 2010/04/23 01:47:41 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1884,13 +1884,19 @@ main(int argc, char **argv)
                 ask_filename(pw, "Enter file in which to save the key");
 
         /* Create ~/.ssh directory if it doesn't already exist. */
-        snprintf(dotsshdir, sizeof dotsshdir, "%s/%s", pw->pw_dir, _PATH_SSH_USER_DIR);
-        if (strstr(identity_file, dotsshdir) != NULL &&
-            stat(dotsshdir, &st) < 0) {
-                if (mkdir(dotsshdir, 0700) < 0)
-                        error("Could not create directory '%s'.", dotsshdir);
-                else if (!quiet)
-                        printf("Created directory '%s'.\n", dotsshdir);
+        snprintf(dotsshdir, sizeof dotsshdir, "%s/%s",
+            pw->pw_dir, _PATH_SSH_USER_DIR);
+        if (strstr(identity_file, dotsshdir) != NULL) {
+                if (stat(dotsshdir, &st) < 0) {
+                        if (errno != ENOENT) {
+                                error("Could not stat %s: %s", dotsshdir,
+                                    strerror(errno));
+                        } else if (mkdir(dotsshdir, 0700) < 0) {
+                                error("Could not create directory '%s': %s",
+                                    dotsshdir, strerror(errno));
+                        } else if (!quiet)
+                                printf("Created directory '%s'.\n", dotsshdir);
+                }
         }
         /* If the file already exists, ask the user to confirm. */
         if (stat(identity_file, &st) >= 0) {