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

diff --git a/ChangeLog b/ChangeLog
index d5ff1c81f1f6b30be4232de02cf73cea7bfa27ac..693a525714377ba450f32c43ceb5876882a70449 100644 (file)
--- 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 98e1eda1a067ed14e9ff7b2afa2d4d3ef04ea3c6..3377fde8b1b7c2924f2012ea1c65f5ee2eccc081 100644 (file)
--- 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);