(process_flags): prefer fail_exit to exit. This avoid
an explicit call to audit_logger().
This commit is contained in:
parent
da37da30e1
commit
ffa34c5afd
@ -6,6 +6,8 @@
|
|||||||
Use (!gflg), which is clearer than (!gflg || !oflg).
|
Use (!gflg), which is clearer than (!gflg || !oflg).
|
||||||
* src/groupadd.c (find_new_gid): find_new_gid is never called when an
|
* src/groupadd.c (find_new_gid): find_new_gid is never called when an
|
||||||
GID is specified with -g. Simplify find_new_gid accordingly.
|
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 <nicolas.francois@centraliens.net>
|
2007-12-28 Nicolas François <nicolas.francois@centraliens.net>
|
||||||
|
|
||||||
|
@ -453,14 +453,10 @@ static void process_flags (int argc, char **argv)
|
|||||||
/* The group already exist */
|
/* The group already exist */
|
||||||
if (fflg) {
|
if (fflg) {
|
||||||
/* OK, no need to do anything */
|
/* OK, no need to do anything */
|
||||||
exit (E_SUCCESS);
|
fail_exit (E_SUCCESS);
|
||||||
}
|
}
|
||||||
fprintf (stderr, _("%s: group %s exists\n"), Prog, group_name);
|
fprintf (stderr, _("%s: group %s exists\n"), Prog, group_name);
|
||||||
#ifdef WITH_AUDIT
|
fail_exit (E_NAME_IN_USE);
|
||||||
audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
|
|
||||||
"adding group", group_name, -1, 0);
|
|
||||||
#endif
|
|
||||||
exit (E_NAME_IN_USE);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (gflg && (getgrgid (group_id) != NULL)) {
|
if (gflg && (getgrgid (group_id) != NULL)) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user