diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2002-03-22 03:14:45 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-03-22 03:14:45 +0000 |
commit | 1ee9ec32a36e6692dd619e784248768bdd5f853e (patch) | |
tree | 71f6ca979cc6c9d1a9cd5374e0ba6067ad381853 | |
parent | c7431341911e911993776c357ca57d1fb7ed1b23 (diff) |
- markus@cvs.openbsd.org 2002/03/21 10:21:20
[ssh-add.c]
ignore errors for nonexisting default keys in ssh-add,
fixes http://bugzilla.mindrot.org/show_bug.cgi?id=158
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | sshd.c | 4 |
2 files changed, 7 insertions, 3 deletions
@@ -104,6 +104,10 @@ | |||
104 | [servconf.c servconf.h ssh.h sshd.c] | 104 | [servconf.c servconf.h ssh.h sshd.c] |
105 | for unprivileged user, group do: | 105 | for unprivileged user, group do: |
106 | pw=getpwnam(SSH_PRIVSEP_USER); do_setusercontext(pw). ok provos@ | 106 | pw=getpwnam(SSH_PRIVSEP_USER); do_setusercontext(pw). ok provos@ |
107 | - markus@cvs.openbsd.org 2002/03/21 10:21:20 | ||
108 | [ssh-add.c] | ||
109 | ignore errors for nonexisting default keys in ssh-add, | ||
110 | fixes http://bugzilla.mindrot.org/show_bug.cgi?id=158 | ||
107 | 111 | ||
108 | 20020317 | 112 | 20020317 |
109 | - (tim) [configure.ac] Assume path given with --with-pid-dir=PATH is wanted, | 113 | - (tim) [configure.ac] Assume path given with --with-pid-dir=PATH is wanted, |
@@ -7950,4 +7954,4 @@ | |||
7950 | - Wrote replacements for strlcpy and mkdtemp | 7954 | - Wrote replacements for strlcpy and mkdtemp |
7951 | - Released 1.0pre1 | 7955 | - Released 1.0pre1 |
7952 | 7956 | ||
7953 | $Id: ChangeLog,v 1.1954 2002/03/22 03:11:49 mouring Exp $ | 7957 | $Id: ChangeLog,v 1.1955 2002/03/22 03:14:45 mouring Exp $ |
@@ -42,7 +42,7 @@ | |||
42 | */ | 42 | */ |
43 | 43 | ||
44 | #include "includes.h" | 44 | #include "includes.h" |
45 | RCSID("$OpenBSD: sshd.c,v 1.235 2002/03/20 19:12:25 stevesk Exp $"); | 45 | RCSID("$OpenBSD: sshd.c,v 1.236 2002/03/20 21:08:08 stevesk Exp $"); |
46 | 46 | ||
47 | #include <openssl/dh.h> | 47 | #include <openssl/dh.h> |
48 | #include <openssl/bn.h> | 48 | #include <openssl/bn.h> |
@@ -543,7 +543,7 @@ privsep_preauth_child(void) | |||
543 | fatal("chroot(\"%s\"): %s", _PATH_PRIVSEP_CHROOT_DIR, | 543 | fatal("chroot(\"%s\"): %s", _PATH_PRIVSEP_CHROOT_DIR, |
544 | strerror(errno)); | 544 | strerror(errno)); |
545 | if (chdir("/") == -1) | 545 | if (chdir("/") == -1) |
546 | fatal("chdir(/)"); | 546 | fatal("chdir(\"/\"): %s", strerror(errno)); |
547 | 547 | ||
548 | /* Drop our privileges */ | 548 | /* Drop our privileges */ |
549 | debug3("privsep user:group %u:%u", (u_int)pw->pw_uid, | 549 | debug3("privsep user:group %u:%u", (u_int)pw->pw_uid, |