summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/sshd.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@cvs.openbsd.org>2010-03-07 11:57:14 +0000
committerDarren Tucker <dtucker@cvs.openbsd.org>2010-03-07 11:57:14 +0000
commita886d240ca3215f7f7cc8c9d280e32c8bd72ec6a (patch)
tree48583579147dc69873fae04ba6c42b1f4e5e5a7a /usr.bin/ssh/sshd.c
parentf8a9ce1075d3707930dfd3852079a9fed7f18911 (diff)
Hold authentication debug messages until after successful authentication.
Fixes an info leak of environment variables specified in authorized_keys, reported by Jacob Appelbaum. ok djm@
Diffstat (limited to 'usr.bin/ssh/sshd.c')
-rw-r--r--usr.bin/ssh/sshd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c
index 04796515d0e..adb2aec90bd 100644
--- a/usr.bin/ssh/sshd.c
+++ b/usr.bin/ssh/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.373 2010/02/26 20:29:54 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.374 2010/03/07 11:57:13 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1823,6 +1823,7 @@ main(int ac, char **av)
/* prepare buffer to collect messages to display to user after login */
buffer_init(&loginmsg);
+ auth_debug_reset();
if (use_privsep)
if (privsep_preauth(authctxt) == 1)