Attachment 2099 Details for Bug 1942 – ssh-mkdir.diff

[patch] ssh-mkdir.diff

ssh-mkdir.diff (text/plain), 1.03 KB, created by Damien Miller on 2011-10-14 21:35:27 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2011-10-14 21:35:27 AEDT

Size: 1.03 KB

patch

obsolete

>Index: ssh.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/ssh.c,v
>retrieving revision 1.366
>diff -u -p -r1.366 ssh.c
>--- ssh.c	23 Sep 2011 07:45:05 -0000	1.366
>+++ ssh.c	14 Oct 2011 10:34:39 -0000
>@@ -841,11 +841,14 @@ main(int ac, char **av)
> 	 * Now that we are back to our own permissions, create ~/.ssh
> 	 * directory if it doesn't already exist.
> 	 */
>-	r = snprintf(buf, sizeof buf, "%s%s%s", pw->pw_dir,
>-	    strcmp(pw->pw_dir, "/") ? "/" : "", _PATH_SSH_USER_DIR);
>-	if (r > 0 && (size_t)r < sizeof(buf) && stat(buf, &st) < 0)
>-		if (mkdir(buf, 0700) < 0)
>-			error("Could not create directory '%.200s'.", buf);
>+	if (config == NULL) {
>+		r = snprintf(buf, sizeof buf, "%s%s%s", pw->pw_dir,
>+		    strcmp(pw->pw_dir, "/") ? "/" : "", _PATH_SSH_USER_DIR);
>+		if (r > 0 && (size_t)r < sizeof(buf) && stat(buf, &st) < 0)
>+			if (mkdir(buf, 0700) < 0)
>+				error("Could not create directory '%.200s'.",
>+				    buf);
>+	}
> 
> 	/* load options.identity_files */
> 	load_public_identity_files();

Actions: View | Diff

Attachments on bug 1942: 2097 | 2099