summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2010-03-07 23:05:17 +1100
committerDarren Tucker <dtucker@zip.com.au>2010-03-07 23:05:17 +1100
commitcd70e1b8137023539df57b175b733341d8f4d776 (patch)
tree03efa18fa906f725b07eee451fe96ec9117a3138 /sshd.c
parentac0c4c9c1d511839b2c86ebe5994298b524ceffd (diff)
- dtucker@cvs.openbsd.org 2010/03/07 11:57:13
[auth-rhosts.c monitor.c monitor_wrap.c session.c auth-options.c sshd.c] 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 'sshd.c')
-rw-r--r--sshd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sshd.c b/sshd.c
index 0c3c04e4e..bc0d2753f 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshd.c,v 1.373 2010/02/26 20:29:54 djm Exp $ */ 1/* $OpenBSD: sshd.c,v 1.374 2010/03/07 11:57:13 dtucker Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1939,6 +1939,7 @@ main(int ac, char **av)
1939 1939
1940 /* prepare buffer to collect messages to display to user after login */ 1940 /* prepare buffer to collect messages to display to user after login */
1941 buffer_init(&loginmsg); 1941 buffer_init(&loginmsg);
1942 auth_debug_reset();
1942 1943
1943 if (use_privsep) 1944 if (use_privsep)
1944 if (privsep_preauth(authctxt) == 1) 1945 if (privsep_preauth(authctxt) == 1)