* src/chage.c, src/chgpasswd.c, src/chpasswd.c, src/chsh.c,
src/gpasswd.c, src/groupadd.c, src/groupdel.c, src/groupmems.c, src/groupmod.c, src/grpck.c, src/grpconv.c, src/grpunconv.c, src/newusers.c, src/passwd.c, src/pwck.c, src/pwconv.c, src/pwunconv.c, src/useradd.c, src/userdel.c, src/usermod.c: In case of a lock failure, indicate to the user that she can try again later. Do not log to syslog.
This commit is contained in:
+8
-4
@@ -1327,7 +1327,9 @@ static void close_files (void)
|
||||
static void open_files (void)
|
||||
{
|
||||
if (pw_lock () == 0) {
|
||||
fprintf (stderr, _("%s: cannot lock %s\n"), Prog, pw_dbname ());
|
||||
fprintf (stderr,
|
||||
_("%s: cannot lock %s; try again later.\n"),
|
||||
Prog, pw_dbname ());
|
||||
exit (E_PW_UPDATE);
|
||||
}
|
||||
passwd_locked = true;
|
||||
@@ -1338,7 +1340,7 @@ static void open_files (void)
|
||||
if (is_shadow_pwd) {
|
||||
if (spw_lock () == 0) {
|
||||
fprintf (stderr,
|
||||
_("%s: cannot lock %s\n"),
|
||||
_("%s: cannot lock %s; try again later.\n"),
|
||||
Prog, spw_dbname ());
|
||||
fail_exit (E_PW_UPDATE);
|
||||
}
|
||||
@@ -1355,7 +1357,9 @@ static void open_files (void)
|
||||
* Lock and open the group file.
|
||||
*/
|
||||
if (gr_lock () == 0) {
|
||||
fprintf (stderr, _("%s: cannot lock %s\n"), Prog, gr_dbname ());
|
||||
fprintf (stderr,
|
||||
_("%s: cannot lock %s; try again later.\n"),
|
||||
Prog, gr_dbname ());
|
||||
fail_exit (E_GRP_UPDATE);
|
||||
}
|
||||
group_locked = true;
|
||||
@@ -1367,7 +1371,7 @@ static void open_files (void)
|
||||
if (is_shadow_grp) {
|
||||
if (sgr_lock () == 0) {
|
||||
fprintf (stderr,
|
||||
_("%s: cannot lock %s\n"),
|
||||
_("%s: cannot lock %s; try again later.\n"),
|
||||
Prog, sgr_dbname ());
|
||||
fail_exit (E_GRP_UPDATE);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user