summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-09-24 12:43:51 +1000
committerDarren Tucker <dtucker@zip.com.au>2005-09-24 12:43:51 +1000
commitd3eff2bfa56dbb37dbb2ea25cf4804193411ba4f (patch)
tree91bd402b9d31dda195482a332816b2686be82ee9
parent82171c66075254a6aedc0bde704b604da32c2ba4 (diff)
- (dtucker) [auth2.c] Move start_pam() calls out of if-else block to remove
duplicate call. ok djm@
-rw-r--r--ChangeLog6
-rw-r--r--auth2.c12
2 files changed, 9 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index b721458ca..d3673b9ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120050924
2 - (dtucker) [auth2.c] Move start_pam() calls out of if-else block to remove
3 duplicate call. ok djm@
4
120050922 520050922
2 - (dtucker) [configure.ac] Use -R linker flag for libedit too; patch from 6 - (dtucker) [configure.ac] Use -R linker flag for libedit too; patch from
3 skeleten at shillest.net. 7 skeleten at shillest.net.
@@ -3009,4 +3013,4 @@
3009 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3013 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3010 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3014 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3011 3015
3012$Id: ChangeLog,v 1.3893 2005/09/22 10:19:54 dtucker Exp $ 3016$Id: ChangeLog,v 1.3894 2005/09/24 02:43:51 dtucker Exp $
diff --git a/auth2.c b/auth2.c
index 613b0e2bc..d255242ed 100644
--- a/auth2.c
+++ b/auth2.c
@@ -156,21 +156,17 @@ input_userauth_request(int type, u_int32_t seq, void *ctxt)
156 if (authctxt->pw && strcmp(service, "ssh-connection")==0) { 156 if (authctxt->pw && strcmp(service, "ssh-connection")==0) {
157 authctxt->valid = 1; 157 authctxt->valid = 1;
158 debug2("input_userauth_request: setting up authctxt for %s", user); 158 debug2("input_userauth_request: setting up authctxt for %s", user);
159#ifdef USE_PAM
160 if (options.use_pam)
161 PRIVSEP(start_pam(authctxt));
162#endif
163 } else { 159 } else {
164 logit("input_userauth_request: invalid user %s", user); 160 logit("input_userauth_request: invalid user %s", user);
165 authctxt->pw = fakepw(); 161 authctxt->pw = fakepw();
166#ifdef USE_PAM
167 if (options.use_pam)
168 PRIVSEP(start_pam(authctxt));
169#endif
170#ifdef SSH_AUDIT_EVENTS 162#ifdef SSH_AUDIT_EVENTS
171 PRIVSEP(audit_event(SSH_INVALID_USER)); 163 PRIVSEP(audit_event(SSH_INVALID_USER));
172#endif 164#endif
173 } 165 }
166#ifdef USE_PAM
167 if (options.use_pam)
168 PRIVSEP(start_pam(authctxt));
169#endif
174 setproctitle("%s%s", authctxt->valid ? user : "unknown", 170 setproctitle("%s%s", authctxt->valid ? user : "unknown",
175 use_privsep ? " [net]" : ""); 171 use_privsep ? " [net]" : "");
176 authctxt->service = xstrdup(service); 172 authctxt->service = xstrdup(service);