summaryrefslogtreecommitdiffstats
path: root/auth-options.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 /auth-options.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 'auth-options.c')
-rw-r--r--auth-options.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/auth-options.c b/auth-options.c
index bcf5589d..12930176 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-options.c,v 1.47 2010/03/04 23:27:25 djm Exp $ */
+/* $OpenBSD: auth-options.c,v 1.48 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
@@ -78,7 +78,6 @@ auth_clear_options(void)
}
forced_tun_device = -1;
channel_clear_permitted_opens();
- auth_debug_reset();
}
/*
@@ -364,9 +363,6 @@ next_option:
/* Process the next option. */
}
- if (!use_privsep)
- auth_debug_send();
-
/* grant access */
return 1;
@@ -376,9 +372,6 @@ bad_option:
auth_debug_add("Bad options in %.100s file, line %lu: %.50s",
file, linenum, opts);
- if (!use_privsep)
- auth_debug_send();
-
/* deny access */
return 0;
}