From: nekral-guest Date: Sat, 20 Sep 2008 16:23:04 +0000 (+0000) Subject: * src/login.c: Existence of pam_user was already checked. pwd was X-Git-Tag: 4.1.3~158 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9f2ce12b28f9df5fbeb868b22e929fa69bc6373b;p=shadow * src/login.c: Existence of pam_user was already checked. pwd was already copied to pwent. Remove duplicated code. --- diff --git a/ChangeLog b/ChangeLog index 40d7cda9..13920a2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-09-20 Nicolas François + + * src/login.c: Existence of pam_user was already checked. pwd was + already copied to pwent. Remove duplicated code. + 2008-09-20 Nicolas François * src/login.c: check_flags() renamed process_flags(). All flag diff --git a/src/login.c b/src/login.c index 9f854eae..95233408 100644 --- a/src/login.c +++ b/src/login.c @@ -810,19 +810,6 @@ int main (int argc, char **argv) retcode = pam_open_session (pamh, hushed (&pwent) ? PAM_SILENT : 0); PAM_FAIL_CHECK; - pwd = xgetpwnam (pam_user); - if (NULL == pwd) { - pwent.pw_name = pam_user; - strcpy (temp_pw, "!"); - pwent.pw_passwd = temp_pw; - pwent.pw_shell = temp_shell; - - preauth_flag = false; - failed = true; - } else { - pwent = *pwd; - } - #else /* ! USE_PAM */ while (true) { /* repeatedly get login/password pairs */ failed = false; /* haven't failed authentication yet */