From ffa34c5afd559fc9b1de2072ac77d89d69afc03e Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Fri, 28 Dec 2007 19:15:14 +0000 Subject: [PATCH] (process_flags): prefer fail_exit to exit. This avoid an explicit call to audit_logger(). --- ChangeLog | 2 ++ src/groupadd.c | 8 ++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3401ed8b..7b323d44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ Use (!gflg), which is clearer than (!gflg || !oflg). * src/groupadd.c (find_new_gid): find_new_gid is never called when an 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(). 2007-12-28 Nicolas François diff --git a/src/groupadd.c b/src/groupadd.c index 4a21dccc..0c6819da 100644 --- a/src/groupadd.c +++ b/src/groupadd.c @@ -453,14 +453,10 @@ static void process_flags (int argc, char **argv) /* The group already exist */ if (fflg) { /* OK, no need to do anything */ - exit (E_SUCCESS); + fail_exit (E_SUCCESS); } fprintf (stderr, _("%s: group %s exists\n"), Prog, group_name); -#ifdef WITH_AUDIT - audit_logger (AUDIT_USER_CHAUTHTOK, Prog, - "adding group", group_name, -1, 0); -#endif - exit (E_NAME_IN_USE); + fail_exit (E_NAME_IN_USE); } if (gflg && (getgrgid (group_id) != NULL)) {