tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2011/10/18 05:15:28 

[ssh.c]
     ssh(1): skip attempting to create ~/.ssh when -F is passed; ok markus@
This commit is contained in:
Darren Tucker 2011-11-04 10:50:40 +11:00
parent 9f157abbb6
commit 45c66d7ad4
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
20111104
- (dtucker) OpenBSD CVS Sync
- djm@cvs.openbsd.org 2011/10/18 05:15:28
[ssh.c]
ssh(1): skip attempting to create ~/.ssh when -F is passed; ok markus@
20111025 20111025
- (dtucker) [contrib/cygwin/Makefile] Continue if installing a doc file - (dtucker) [contrib/cygwin/Makefile] Continue if installing a doc file
fails. Patch from Corinna Vinschen. fails. Patch from Corinna Vinschen.

7
ssh.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh.c,v 1.366 2011/09/23 07:45:05 markus Exp $ */ /* $OpenBSD: ssh.c,v 1.367 2011/10/18 05:15:28 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -886,6 +886,7 @@ main(int ac, char **av)
* Now that we are back to our own permissions, create ~/.ssh * Now that we are back to our own permissions, create ~/.ssh
* directory if it doesn't already exist. * directory if it doesn't already exist.
*/ */
if (config == NULL) {
r = snprintf(buf, sizeof buf, "%s%s%s", pw->pw_dir, r = snprintf(buf, sizeof buf, "%s%s%s", pw->pw_dir,
strcmp(pw->pw_dir, "/") ? "/" : "", _PATH_SSH_USER_DIR); strcmp(pw->pw_dir, "/") ? "/" : "", _PATH_SSH_USER_DIR);
if (r > 0 && (size_t)r < sizeof(buf) && stat(buf, &st) < 0) { if (r > 0 && (size_t)r < sizeof(buf) && stat(buf, &st) < 0) {
@ -893,11 +894,13 @@ main(int ac, char **av)
ssh_selinux_setfscreatecon(buf); ssh_selinux_setfscreatecon(buf);
#endif #endif
if (mkdir(buf, 0700) < 0) if (mkdir(buf, 0700) < 0)
error("Could not create directory '%.200s'.", buf); error("Could not create directory '%.200s'.",
buf);
#ifdef WITH_SELINUX #ifdef WITH_SELINUX
ssh_selinux_setfscreatecon(NULL); ssh_selinux_setfscreatecon(NULL);
#endif #endif
} }
}
/* load options.identity_files */ /* load options.identity_files */
load_public_identity_files(); load_public_identity_files();