emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

* src/groupmod.c: Harmonize error & syslog messages.

Browse Source
This commit is contained in:
nekral-guest 2008-08-06 15:53:50 +00:00
parent 7eab6d9958
commit bc8456425d
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -2,6 +2,7 @@
* src/groupadd.c: Harmonize error & syslog messages. * src/groupadd.c: Harmonize error & syslog messages.
* src/groupadd.c: Add logging to syslog in some error cases. * src/groupadd.c: Add logging to syslog in some error cases.
* src/groupmod.c: Harmonize error & syslog messages.
2008-08-01 Nicolas François <nicolas.francois@centraliens.net> 2008-08-01 Nicolas François <nicolas.francois@centraliens.net>

28
src/groupmod.c
View File

@ -193,7 +193,7 @@ static void grp_update (void)
ogrp = gr_locate (group_name); ogrp = gr_locate (group_name);
if (!ogrp) { if (!ogrp) {
fprintf (stderr, fprintf (stderr,
_("%s: %s not found in /etc/group\n"), _("%s: group '%s' does not exist in the group file\n"),
Prog, group_name); Prog, group_name);
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
@ -225,7 +225,7 @@ static void grp_update (void)
* Write out the new group file entry. * Write out the new group file entry.
*/ */
if (gr_update (&grp) == 0) { if (gr_update (&grp) == 0) {
fprintf (stderr, _("%s: error adding new group entry\n"), Prog); fprintf (stderr, _("%s: cannot add entry '%s' to the group database\n"), Prog, grp.gr_name);
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
"adding group", "adding group",
@ -234,7 +234,7 @@ static void grp_update (void)
fail_exit (E_GRP_UPDATE); fail_exit (E_GRP_UPDATE);
} }
if (nflg && (gr_remove (group_name) == 0)) { if (nflg && (gr_remove (group_name) == 0)) {
fprintf (stderr, _("%s: error removing group entry\n"), Prog); fprintf (stderr, _("%s: cannot remove the entry of '%s' from the group database\n"), Prog, grp.gr_name);
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
"deleting group", "deleting group",
@ -256,7 +256,7 @@ static void grp_update (void)
* Write out the new shadow group entries as well. * Write out the new shadow group entries as well.
*/ */
if (is_shadow_grp && (sgr_update (&sgrp) == 0)) { if (is_shadow_grp && (sgr_update (&sgrp) == 0)) {
fprintf (stderr, _("%s: error adding new group entry\n"), Prog); fprintf (stderr, _("%s: cannot add entry '%s' to the shadow group database\n"), Prog, sgrp.sg_name);
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
"adding group", "adding group",
@ -265,7 +265,7 @@ static void grp_update (void)
fail_exit (E_GRP_UPDATE); fail_exit (E_GRP_UPDATE);
} }
if (is_shadow_grp && nflg && (sgr_remove (group_name) == 0)) { if (is_shadow_grp && nflg && (sgr_remove (group_name) == 0)) {
fprintf (stderr, _("%s: error removing group entry\n"), Prog); fprintf (stderr, _("%s: cannot remove the entry of '%s' from the shadow group database\n"), Prog);
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
"deleting group", "deleting group",
@ -319,7 +319,7 @@ static void check_new_gid (void)
/* /*
* Tell the user what they did wrong. * Tell the user what they did wrong.
*/ */
fprintf (stderr, _("%s: %lu is not a unique GID\n"), fprintf (stderr, _("%s: GID '%lu' already exists\n"),
Prog, (unsigned long int) group_newid); Prog, (unsigned long int) group_newid);
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
@ -353,7 +353,7 @@ static void check_new_name (void)
/* local, no need for xgetgrnam */ /* local, no need for xgetgrnam */
if (getgrnam (group_newname) != NULL) { if (getgrnam (group_newname) != NULL) {
fprintf (stderr, fprintf (stderr,
_("%s: %s is not a unique name\n"), Prog, _("%s: group '%s' already exists\n"), Prog,
group_newname); group_newname);
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
@ -369,7 +369,7 @@ static void check_new_name (void)
* All invalid group names land here. * All invalid group names land here.
*/ */
fprintf (stderr, _("%s: %s is not a valid group name\n"), fprintf (stderr, _("%s: invalid group name '%s'\n"),
Prog, group_newname); Prog, group_newname);
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
@ -502,26 +502,26 @@ static void close_files (void)
static void open_files (void) static void open_files (void)
{ {
if (gr_lock () == 0) { if (gr_lock () == 0) {
fprintf (stderr, _("%s: unable to lock group file\n"), Prog); fprintf (stderr, _("%s: cannot lock the group file\n"), Prog);
fail_exit (E_GRP_UPDATE); fail_exit (E_GRP_UPDATE);
} }
group_locked = true; group_locked = true;
if (gr_open (O_RDWR) == 0) { if (gr_open (O_RDWR) == 0) {
fprintf (stderr, _("%s: unable to open group file\n"), Prog); fprintf (stderr, _("%s: cannot open the group file\n"), Prog);
fail_exit (E_GRP_UPDATE); fail_exit (E_GRP_UPDATE);
} }
#ifdef SHADOWGRP #ifdef SHADOWGRP
if (is_shadow_grp) { if (is_shadow_grp) {
if (sgr_lock () == 0) { if (sgr_lock () == 0) {
fprintf (stderr, fprintf (stderr,
_("%s: unable to lock shadow group file\n"), _("%s: cannot lock the shadow group file\n"),
Prog); Prog);
fail_exit (E_GRP_UPDATE); fail_exit (E_GRP_UPDATE);
} }
gshadow_locked = true; gshadow_locked = true;
if (sgr_open (O_RDWR) == 0) { if (sgr_open (O_RDWR) == 0) {
fprintf (stderr, fprintf (stderr,
_("%s: unable to open shadow group file\n"), _("%s: cannot open the shadow group file\n"),
Prog); Prog);
fail_exit (E_GRP_UPDATE); fail_exit (E_GRP_UPDATE);
} }
@ -530,14 +530,14 @@ static void open_files (void)
if (gflg) { if (gflg) {
if (pw_lock () == 0) { if (pw_lock () == 0) {
fprintf (stderr, fprintf (stderr,
_("%s: unable to lock password file\n"), _("%s: cannot lock the passwd file\n"),
Prog); Prog);
fail_exit (E_GRP_UPDATE); fail_exit (E_GRP_UPDATE);
} }
passwd_locked = true; passwd_locked = true;
if (pw_open (O_RDWR) == 0) { if (pw_open (O_RDWR) == 0) {
fprintf (stderr, fprintf (stderr,
_("%s: unable to open password file\n"), _("%s: cannot open the passwd file\n"),
Prog); Prog);
fail_exit (E_GRP_UPDATE); fail_exit (E_GRP_UPDATE);
} }