Before pam_end(), the return value of the previous

pam API was already checked. No need to validate it again.

diff --git a/ChangeLog b/ChangeLog
index 191ed849f76d3b5951d686370929c064210a4a1c..c6cb89afb0f37d416824339c7931a5729a7a2342 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-28  Nicolas François  <nicolas.francois@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@centraliens.net>
 
        * src/groupadd.c (find_new_gid): A group with the specified name

diff --git a/src/chpasswd.c b/src/chpasswd.c
index 0a170a8cce70c8f45ae2c9d096a15af686314f18..bd7d41e702cf1d6ee5cb3203993eefd9c14fa77a 100644 (file)
--- a/src/chpasswd.c
+++ b/src/chpasswd.c
@@ -411,8 +411,7 @@ int main (int argc, char **argv)
        pw_unlock ();
 
 #ifdef USE_PAM
-       if (retval == PAM_SUCCESS)
-               pam_end (pamh, PAM_SUCCESS);
+       pam_end (pamh, PAM_SUCCESS);
 #endif                         /* USE_PAM */
 
        return (0);