diff options
author | dtucker <dtucker> | 2005-09-24 02:43:51 +0000 |
---|---|---|
committer | dtucker <dtucker> | 2005-09-24 02:43:51 +0000 |
commit | 0186c159a3dad747240dc36ec8ce30420d94beef (patch) | |
tree | 15295377ccd65dbbd91c464a1ab9085756f5e108 /auth2.c | |
parent | a6d6a49b24c4e9a0dd3128118ceb44cdc51fbbae (diff) | |
download | openssh-0186c159a3dad747240dc36ec8ce30420d94beef.tar.gz |
- (dtucker) [auth2.c] Move start_pam() calls out of if-else block to remove
duplicate call. ok djm@
Diffstat (limited to 'auth2.c')
-rw-r--r-- | auth2.c | 12 |
1 files changed, 4 insertions, 8 deletions
@@ -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); |