[Pkg-shadow-commits] r2427 - in upstream/trunk: . src

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-09-20 16:23:04 +0000 (Sat, 20 Sep 2008)
New Revision: 2427

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/login.c
Log:
	* src/login.c: Existence of pam_user was already checked. pwd was
	already copied to pwent. Remove duplicated code.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-09-20 16:21:46 UTC (rev 2426)
+++ upstream/trunk/ChangeLog	2008-09-20 16:23:04 UTC (rev 2427)
@@ -1,5 +1,10 @@
 2008-09-20  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* 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  <nicolas.francois at centraliens.net>
+
 	* src/login.c: check_flags() renamed process_flags(). All flag
 	processing blocs moved to process_flags().
 

Modified: upstream/trunk/src/login.c
===================================================================
--- upstream/trunk/src/login.c	2008-09-20 16:21:46 UTC (rev 2426)
+++ upstream/trunk/src/login.c	2008-09-20 16:23:04 UTC (rev 2427)
@@ -810,19 +810,6 @@
 	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 */