diff options
author | Darren Tucker <dtucker@zip.com.au> | 2010-03-07 23:05:17 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2010-03-07 23:05:17 +1100 |
commit | cd70e1b8137023539df57b175b733341d8f4d776 (patch) | |
tree | 03efa18fa906f725b07eee451fe96ec9117a3138 /auth-rhosts.c | |
parent | ac0c4c9c1d511839b2c86ebe5994298b524ceffd (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-rhosts.c')
-rw-r--r-- | auth-rhosts.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/auth-rhosts.c b/auth-rhosts.c index 5c1296701..06ae7f0b9 100644 --- a/auth-rhosts.c +++ b/auth-rhosts.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth-rhosts.c,v 1.43 2008/06/13 14:18:51 dtucker Exp $ */ | 1 | /* $OpenBSD: auth-rhosts.c,v 1.44 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 |
@@ -317,11 +317,5 @@ int | |||
317 | auth_rhosts2(struct passwd *pw, const char *client_user, const char *hostname, | 317 | auth_rhosts2(struct passwd *pw, const char *client_user, const char *hostname, |
318 | const char *ipaddr) | 318 | const char *ipaddr) |
319 | { | 319 | { |
320 | int ret; | 320 | return auth_rhosts2_raw(pw, client_user, hostname, ipaddr); |
321 | |||
322 | auth_debug_reset(); | ||
323 | ret = auth_rhosts2_raw(pw, client_user, hostname, ipaddr); | ||
324 | if (!use_privsep) | ||
325 | auth_debug_send(); | ||
326 | return ret; | ||
327 | } | 321 | } |