- (stevesk) [auth2.c] merge cleanup/sync

2 files changed, 5 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 236b0075..acd6306f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
  - (stevesk) configure and cpp __FUNCTION__ gymnastics to handle nielsisms
  - (stevesk) [monitor_fdpass.c] support for access rights style file
    descriptor passing
+ - (stevesk) [auth2.c] merge cleanup/sync
 
 20020321
  - (bal) OpenBSD CVS Sync
@@ -7998,4 +7999,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1970 2002/03/22 19:32:53 stevesk Exp $
+$Id: ChangeLog,v 1.1971 2002/03/22 20:43:05 stevesk Exp $
diff --git a/auth2.c b/auth2.c
index 98e1eda1..3377fde8 100644
--- a/auth2.c
+++ b/auth2.c
@@ -184,14 +184,12 @@ input_userauth_request(int type, u_int32_t seq, void *ctxt)
 
 	if (authctxt->attempt++ == 0) {
 		/* setup auth context */
-		struct passwd *pw = NULL;
-		pw = PRIVSEP(getpwnamallow(user));
-		if (pw && strcmp(service, "ssh-connection")==0) {
-			authctxt->pw = pwcopy(pw);
+		authctxt->pw = PRIVSEP(getpwnamallow(user));
+		if (authctxt->pw && strcmp(service, "ssh-connection")==0) {
 			authctxt->valid = 1;
 			debug2("input_userauth_request: setting up authctxt for %s", user);
 #ifdef USE_PAM
-			start_pam(pw->pw_name);
+			start_pam(authctxt->pw->pw_name);
 #endif
 		} else {
 			log("input_userauth_request: illegal user %s", user);