diff options
author | Darren Tucker <dtucker@zip.com.au> | 2005-09-24 12:43:51 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2005-09-24 12:43:51 +1000 |
commit | d3eff2bfa56dbb37dbb2ea25cf4804193411ba4f (patch) | |
tree | 91bd402b9d31dda195482a332816b2686be82ee9 | |
parent | 82171c66075254a6aedc0bde704b604da32c2ba4 (diff) |
- (dtucker) [auth2.c] Move start_pam() calls out of if-else block to remove
duplicate call. ok djm@
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | auth2.c | 12 |
2 files changed, 9 insertions, 9 deletions
@@ -1,3 +1,7 @@ +20050924 + - (dtucker) [auth2.c] Move start_pam() calls out of if-else block to remove + duplicate call. ok djm@ + 20050922 - (dtucker) [configure.ac] Use -R linker flag for libedit too; patch from skeleten at shillest.net. @@ -3009,4 +3013,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3893 2005/09/22 10:19:54 dtucker Exp $ +$Id: ChangeLog,v 1.3894 2005/09/24 02:43:51 dtucker Exp $ @@ -156,21 +156,17 @@ input_userauth_request(int type, u_int32_t seq, void *ctxt) if (authctxt->pw && strcmp(service, "ssh-connection")==0) { authctxt->valid = 1; debug2("input_userauth_request: setting up authctxt for %s", user); -#ifdef USE_PAM - if (options.use_pam) - PRIVSEP(start_pam(authctxt)); -#endif } else { logit("input_userauth_request: invalid user %s", user); authctxt->pw = fakepw(); -#ifdef USE_PAM - if (options.use_pam) - PRIVSEP(start_pam(authctxt)); -#endif #ifdef SSH_AUDIT_EVENTS PRIVSEP(audit_event(SSH_INVALID_USER)); #endif } +#ifdef USE_PAM + if (options.use_pam) + PRIVSEP(start_pam(authctxt)); +#endif setproctitle("%s%s", authctxt->valid ? user : "unknown", use_privsep ? " [net]" : ""); authctxt->service = xstrdup(service); |