From 1ee9ec32a36e6692dd619e784248768bdd5f853e Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Fri, 22 Mar 2002 03:14:45 +0000 Subject: - 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 --- ChangeLog | 6 +++++- sshd.c | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 48a67cb04..030ef5a61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -104,6 +104,10 @@ [servconf.c servconf.h ssh.h sshd.c] for unprivileged user, group do: pw=getpwnam(SSH_PRIVSEP_USER); do_setusercontext(pw). ok provos@ + - 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 20020317 - (tim) [configure.ac] Assume path given with --with-pid-dir=PATH is wanted, @@ -7950,4 +7954,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1954 2002/03/22 03:11:49 mouring Exp $ +$Id: ChangeLog,v 1.1955 2002/03/22 03:14:45 mouring Exp $ diff --git a/sshd.c b/sshd.c index dc109815f..26124b777 100644 --- a/sshd.c +++ b/sshd.c @@ -42,7 +42,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshd.c,v 1.235 2002/03/20 19:12:25 stevesk Exp $"); +RCSID("$OpenBSD: sshd.c,v 1.236 2002/03/20 21:08:08 stevesk Exp $"); #include #include @@ -543,7 +543,7 @@ privsep_preauth_child(void) fatal("chroot(\"%s\"): %s", _PATH_PRIVSEP_CHROOT_DIR, strerror(errno)); if (chdir("/") == -1) - fatal("chdir(/)"); + fatal("chdir(\"/\"): %s", strerror(errno)); /* Drop our privileges */ debug3("privsep user:group %u:%u", (u_int)pw->pw_uid, -- cgit v1.2.3