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

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2011-06-13 18:25:40 +0000 (Mon, 13 Jun 2011)
New Revision: 3340

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/su.c
Log:
	* src/su.c: No need to call expire() if there are no shadow entry.
	No need to convert a passwd entry into an spwd entry in that case.

Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2011-06-13 18:25:34 UTC (rev 3339)
+++ upstream/trunk/ChangeLog	2011-06-13 18:25:40 UTC (rev 3340)
@@ -1,13 +1,15 @@
-2011-06-12  Thomas Blein  <tblein at tblein.eu>
+2011-06-10  Nicolas François  <nicolas.francois at centraliens.net>
 
-	* man/po/fr.po: French manpages translation
-
-2011-06-05  Nicolas François  <nicolas.francois at centraliens.net>
-
 	* src/su.c: Updating pwent after expire() is not useful. Only the
 	password information may have changed and they are not used
 	anymore afterwards.
+	* src/su.c: No need to call expire() if there are no shadow entry.
+	No need to convert a passwd entry into an spwd entry in that case.
 
+2011-06-12  Thomas Blein  <tblein at tblein.eu>
+
+	* man/po/fr.po: French manpages translation
+
 2011-06-05  Nicolas François  <nicolas.francois at centraliens.net>
 
 	* NEWS, src/su.c: Do not forward the controlling terminal to

Modified: upstream/trunk/src/su.c
===================================================================
--- upstream/trunk/src/su.c	2011-06-13 18:25:34 UTC (rev 3339)
+++ upstream/trunk/src/su.c	2011-06-13 18:25:40 UTC (rev 3340)
@@ -863,11 +863,7 @@
 	 * expired accounts, but normal users can't become a user with an
 	 * expired password.
 	 */
-	if (!amroot) {
-		if (NULL == spwd) {
-			spwd = pwd_to_spwd (&pwent);
-		}
-
+	if ((!amroot) && (NULL != spwd)) {
 		(void) expire (&pwent, spwd);
 	}