From f7ed12f1a78da4da6845811104ba5a3defe15451 Mon Sep 17 00:00:00 2001
From: stevesk <stevesk>
Date: Fri, 22 Mar 2002 20:43:05 +0000
Subject: [PATCH]  - (stevesk) [auth2.c] merge cleanup/sync

---
 ChangeLog | 1 +
 auth2.c   | 8 +++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d5ff1c81..693a5257 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
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);
-- 
2.45.2