diff options
Diffstat (limited to 'auth1.c')
-rw-r--r-- | auth1.c | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth1.c,v 1.75 2010/08/31 09:58:37 djm Exp $ */ | 1 | /* $OpenBSD: auth1.c,v 1.77 2012/12/02 20:34:09 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
4 | * All rights reserved | 4 | * All rights reserved |
@@ -253,7 +253,8 @@ do_authloop(Authctxt *authctxt) | |||
253 | if (options.use_pam && (PRIVSEP(do_pam_account()))) | 253 | if (options.use_pam && (PRIVSEP(do_pam_account()))) |
254 | #endif | 254 | #endif |
255 | { | 255 | { |
256 | auth_log(authctxt, 1, "without authentication", ""); | 256 | auth_log(authctxt, 1, 0, "without authentication", |
257 | NULL, ""); | ||
257 | return; | 258 | return; |
258 | } | 259 | } |
259 | } | 260 | } |
@@ -352,7 +353,8 @@ do_authloop(Authctxt *authctxt) | |||
352 | 353 | ||
353 | skip: | 354 | skip: |
354 | /* Log before sending the reply */ | 355 | /* Log before sending the reply */ |
355 | auth_log(authctxt, authenticated, get_authname(type), info); | 356 | auth_log(authctxt, authenticated, 0, get_authname(type), |
357 | NULL, info); | ||
356 | 358 | ||
357 | if (client_user != NULL) { | 359 | if (client_user != NULL) { |
358 | xfree(client_user); | 360 | xfree(client_user); |
@@ -412,6 +414,11 @@ do_authentication(Authctxt *authctxt) | |||
412 | authctxt->pw = fakepw(); | 414 | authctxt->pw = fakepw(); |
413 | } | 415 | } |
414 | 416 | ||
417 | /* Configuration may have changed as a result of Match */ | ||
418 | if (options.num_auth_methods != 0) | ||
419 | fatal("AuthenticationMethods is not supported with SSH " | ||
420 | "protocol 1"); | ||
421 | |||
415 | setproctitle("%s%s", authctxt->valid ? user : "unknown", | 422 | setproctitle("%s%s", authctxt->valid ? user : "unknown", |
416 | use_privsep ? " [net]" : ""); | 423 | use_privsep ? " [net]" : ""); |
417 | 424 | ||