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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2007-12-28 21:29:06 +0000 (Fri, 28 Dec 2007)
New Revision: 1538

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/chpasswd.c
Log:
Before pam_end(), the return value of the previous
pam API was already checked. No need to validate it again.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2007-12-28 21:04:04 UTC (rev 1537)
+++ upstream/trunk/ChangeLog	2007-12-28 21:29:06 UTC (rev 1538)
@@ -1,5 +1,10 @@
 2007-12-28  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/chpasswd.c: Before pam_end(), the return value of the previous
+	pam API was already checked. No need to validate it again.
+
+2007-12-28  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* src/groupadd.c (find_new_gid): A group with the specified name
 	cannot exist at that time. Remove the check.
 	* src/groupadd.c (find_new_gid): If oflg is set, gflg is also set.

Modified: upstream/trunk/src/chpasswd.c
===================================================================
--- upstream/trunk/src/chpasswd.c	2007-12-28 21:04:04 UTC (rev 1537)
+++ upstream/trunk/src/chpasswd.c	2007-12-28 21:29:06 UTC (rev 1538)
@@ -411,8 +411,7 @@
 	pw_unlock ();
 
 #ifdef USE_PAM
-	if (retval == PAM_SUCCESS)
-		pam_end (pamh, PAM_SUCCESS);
+	pam_end (pamh, PAM_SUCCESS);
 #endif				/* USE_PAM */
 
 	return (0);