From 6d09b4ce4dbaf9ec2502fbdb0a3122d267d1fd9c Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Fri, 28 Dec 2007 20:40:59 +0000 Subject: [PATCH] (main): Before pam_end(), the return value of the previous pam API was already checked. No need to validate it again. --- ChangeLog | 2 ++ src/groupadd.c | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b323d44..d125fc0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,8 @@ GID is specified with -g. Simplify find_new_gid accordingly. * src/groupadd.c (process_flags): prefer fail_exit to exit. This avoid an explicit call to audit_logger(). + * src/groupadd.c (main): 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 diff --git a/src/groupadd.c b/src/groupadd.c index ae90d186..05e3ff52 100644 --- a/src/groupadd.c +++ b/src/groupadd.c @@ -564,10 +564,9 @@ int main (int argc, char **argv) nscd_flush_cache ("group"); #ifdef USE_PAM - if (retval == PAM_SUCCESS) { - pam_end (pamh, PAM_SUCCESS); - } + pam_end (pamh, PAM_SUCCESS); #endif /* USE_PAM */ + exit (E_SUCCESS); /* NOT REACHED */ }