* 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.

diff --git a/ChangeLog b/ChangeLog
index 19475c77aa0b39b031787f1f6e276536e9f44793..a80f612affe04cf15a9e1b0bed347514691cc2ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-08-17  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * 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.
+
 2008-08-17  Nicolas François  <nicolas.francois@centraliens.net>
 
        * NEWS, src/passwd.c: For compatibility with other passwd version,

diff --git a/src/chage.c b/src/chage.c
index 3f9e299eed14def138ca5165e2bd774060cc13b8..91a338ecfe3ae8bfcad835577cd71ad86381b565 100644 (file)
--- a/src/chage.c
+++ b/src/chage.c
@@ -561,13 +561,13 @@ static void open_files (bool readonly)
         * file entries into memory. Then we get a pointer to the password
         * file entry for the requested user.
         */
-       if (!readonly && (pw_lock () == 0)) {
-               fprintf (stderr,
-                        _("%s: cannot lock %s\n"), Prog, pw_dbname ());
-               SYSLOG ((LOG_ERR, "cannot lock %s", pw_dbname ()));
-               fail_exit (E_NOPERM);
-       }
        if (!readonly) {
+               if (pw_lock () == 0) {
+                       fprintf (stderr,
+                                _("%s: cannot lock %s; try again later.\n"),
+                                Prog, pw_dbname ());
+                       fail_exit (E_NOPERM);
+               }
                pw_locked = true;
        }
        if (pw_open (readonly ? O_RDONLY: O_RDWR) == 0) {
@@ -582,13 +582,13 @@ static void open_files (bool readonly)
         * does not have to exist in this case; a new entry will be created
         * for this user if one does not exist already.
         */
-       if (!readonly && (spw_lock () == 0)) {
-               fprintf (stderr,
-                        _("%s: cannot lock %s\n"), Prog, spw_dbname ());
-               SYSLOG ((LOG_ERR, "cannot lock %s", spw_dbname ()));
-               fail_exit (E_NOPERM);
-       }
        if (!readonly) {
+               if (spw_lock () == 0) {
+                       fprintf (stderr,
+                                _("%s: cannot lock %s; try again later.\n"),
+                                Prog, spw_dbname ());
+                       fail_exit (E_NOPERM);
+               }
                spw_locked = true;
        }
        if (spw_open (readonly ? O_RDONLY: O_RDWR) == 0) {

diff --git a/src/chgpasswd.c b/src/chgpasswd.c
index 1b4f237ec602e10efa643cd8732ab63d73b1135f..4fb02b0b8b2bbf7db0b1be4846b2de130d718fa2 100644 (file)
--- a/src/chgpasswd.c
+++ b/src/chgpasswd.c
@@ -290,7 +290,8 @@ static void open_files (void)
         */
        if (gr_lock () == 0) {
                fprintf (stderr,
-                        _("%s: cannot lock %s\n"), Prog, gr_dbname ());
+                        _("%s: cannot lock %s; try again later.\n"),
+                        Prog, gr_dbname ());
                fail_exit (1);
        }
        group_locked = true;
@@ -304,7 +305,8 @@ static void open_files (void)
        /* Do the same for the shadowed database, if it exist */
        if (is_shadow_grp) {
                if (sgr_lock () == 0) {
-                       fprintf (stderr, _("%s: cannot lock %s\n"),
+                       fprintf (stderr,
+                                _("%s: cannot lock %s; try again later.\n"),
                                 Prog, sgr_dbname ());
                        fail_exit (1);
                }

diff --git a/src/chpasswd.c b/src/chpasswd.c
index ace0ea60f46a69c30e124dd85d65dbe373d5d1d9..136bf6b68623ad6d109a2a5b33a944070e3161c0 100644 (file)
--- a/src/chpasswd.c
+++ b/src/chpasswd.c
@@ -284,7 +284,8 @@ static void open_files (void)
         */
        if (pw_lock () == 0) {
                fprintf (stderr,
-                        _("%s: cannot lock %s\n"), Prog, pw_dbname ());
+                        _("%s: cannot lock %s; try again later.\n"),
+                        Prog, pw_dbname ());
                fail_exit (1);
        }
        passwd_locked = true;
@@ -298,7 +299,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 (1);
                }

diff --git a/src/chsh.c b/src/chsh.c
index 4f531f6120e45fdda70e3d20e48e1f0667964e10..e1c687095a2f2891810cd4f92650f367e45a260f 100644 (file)
--- a/src/chsh.c
+++ b/src/chsh.c
@@ -365,7 +365,6 @@ static void update_shell (const char *user, char *newshell)
        if (pw_lock () == 0) {
                fprintf (stderr, _("%s: cannot lock %s; try again later.\n"),
                         Prog, pw_dbname ());
-               SYSLOG ((LOG_WARN, "cannot lock %s", pw_dbname ()));
                fail_exit (1);
        }
        pw_locked = true;

diff --git a/src/gpasswd.c b/src/gpasswd.c
index d4dd16bcdf1695e52edc31240c544903851c983a..2a087488d0ed4182270c4233c07b431a6510821d 100644 (file)
--- a/src/gpasswd.c
+++ b/src/gpasswd.c
@@ -368,8 +368,9 @@ static void check_flags (int argc, int opt_index)
 static void open_files (void)
 {
        if (gr_lock () == 0) {
-               fprintf (stderr, _("%s: cannot lock %s\n"), Prog, gr_dbname ());
-               SYSLOG ((LOG_WARN, "cannot lock %s", gr_dbname ()));
+               fprintf (stderr,
+                        _("%s: cannot lock %s; try again later.\n"),
+                        Prog, gr_dbname ());
 #ifdef WITH_AUDIT
                audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
                              "locking /etc/group",
@@ -382,8 +383,8 @@ static void open_files (void)
        if (is_shadowgrp) {
                if (sgr_lock () == 0) {
                        fprintf (stderr,
-                                _("%s: cannot lock %s\n"), Prog, sgr_dbname ());
-                       SYSLOG ((LOG_WARN, "cannot lock %s", sgr_dbname ()));
+                                _("%s: cannot lock %s; try again later.\n"),
+                                Prog, sgr_dbname ());
 #ifdef WITH_AUDIT
                        audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
                                      "locking /etc/gshadow",

diff --git a/src/groupadd.c b/src/groupadd.c
index 4bc7b8107c023f8719be3dace075a1f96c18e23b..25e94009389f434c308000622ca46137eb678d1e 100644 (file)
--- a/src/groupadd.c
+++ b/src/groupadd.c
@@ -298,8 +298,9 @@ static void close_files (void)
 static void open_files (void)
 {
        if (gr_lock () == 0) {
-               fprintf (stderr, _("%s: cannot lock %s\n"), Prog, gr_dbname ());
-               SYSLOG ((LOG_WARN, "cannot lock %s", gr_dbname ()));
+               fprintf (stderr,
+                        _("%s: cannot lock %s; try again later.\n"),
+                        Prog, gr_dbname ());
 #ifdef WITH_AUDIT
                audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
                              "locking group file",
@@ -322,8 +323,8 @@ static void open_files (void)
        if (is_shadow_grp) {
                if (sgr_lock () == 0) {
                        fprintf (stderr,
-                                _("%s: cannot lock %s\n"), Prog, sgr_dbname ());
-                       SYSLOG ((LOG_WARN, "cannot lock %s", sgr_dbname ()));
+                                _("%s: cannot lock %s; try again later.\n"),
+                                Prog, sgr_dbname ());
 #ifdef WITH_AUDIT
                        audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
                                      "locking gshadow file",

diff --git a/src/groupdel.c b/src/groupdel.c
index 3866b40ada318a867295572be2ceb4f794d8151f..1d10aedd2bd2e9ec3a8e53270a6c865feb767521 100644 (file)
--- a/src/groupdel.c
+++ b/src/groupdel.c
@@ -222,8 +222,8 @@ static void open_files (void)
 {
        if (gr_lock () == 0) {
                fprintf (stderr,
-                        _("%s: cannot lock %s\n"), Prog, gr_dbname ());
-               SYSLOG ((LOG_WARN, "cannot lock %s",gr_dbname ()));
+                        _("%s: cannot lock %s; try again later.\n"),
+                        Prog, gr_dbname ());
                fail_exit (E_GRP_UPDATE);
        }
        group_locked = true;
@@ -237,9 +237,8 @@ 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 ());
-                       SYSLOG ((LOG_WARN, "cannot lock %s", sgr_dbname ()));
                        fail_exit (E_GRP_UPDATE);
                }
                gshadow_locked = true;

diff --git a/src/groupmems.c b/src/groupmems.c
index d3aa0da4901556b476193320f34c461c0492e062..5d26977a6e9e08beacf543c2c0903e0c9dbc3245 100644 (file)
--- a/src/groupmems.c
+++ b/src/groupmems.c
@@ -254,7 +254,7 @@ int main (int argc, char **argv)
 
                if (gr_lock () == 0) {
                        fprintf (stderr,
-                                _("%s: cannot lock %s\n"),
+                                _("%s: cannot lock %s; try again later.\n"),
                                 Prog, gr_dbname ());
                        fail_exit (EXIT_GROUP_FILE);
                }

diff --git a/src/groupmod.c b/src/groupmod.c
index 49ade1e8b37010ce525775dae394a946bfc68f2a..cc31a218cc728c58803963336c19ec2762d75ff6 100644 (file)
--- a/src/groupmod.c
+++ b/src/groupmod.c
@@ -586,8 +586,9 @@ static void close_files (void)
 static void open_files (void)
 {
        if (gr_lock () == 0) {
-               fprintf (stderr, _("%s: cannot lock %s\n"), Prog, gr_dbname ());
-               SYSLOG ((LOG_WARN, "cannot lock %s", gr_dbname ()));
+               fprintf (stderr,
+                        _("%s: cannot lock %s; try again later.\n"),
+                        Prog, gr_dbname ());
                fail_exit (E_GRP_UPDATE);
        }
        group_locked = true;
@@ -600,9 +601,8 @@ 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 ());
-                       SYSLOG ((LOG_WARN, "cannot lock %s", sgr_dbname ()));
                        fail_exit (E_GRP_UPDATE);
                }
                gshadow_locked = true;
@@ -618,9 +618,8 @@ static void open_files (void)
        if (gflg) {
                if (pw_lock () == 0) {
                        fprintf (stderr,
-                                _("%s: cannot lock %s\n"),
+                                _("%s: cannot lock %s; try again later.\n"),
                                 Prog, pw_dbname ());
-                       SYSLOG ((LOG_WARN, "cannot lock %s", pw_dbname ()));
                        fail_exit (E_GRP_UPDATE);
                }
                passwd_locked = true;

diff --git a/src/grpck.c b/src/grpck.c
index d0619108a4a2ebc5211cf02f69442ba927354bbd..6f73444035356d18a78f968a9310d57d9ac69f16 100644 (file)
--- a/src/grpck.c
+++ b/src/grpck.c
@@ -211,21 +211,17 @@ static void open_files (void)
         */
        if (!read_only) {
                if (gr_lock () == 0) {
-                       fprintf (stderr, _("%s: cannot lock %s\n"),
+                       fprintf (stderr,
+                                _("%s: cannot lock %s; try again later.\n"),
                                 Prog, grp_file);
-                       if (use_system_grp_file) {
-                               SYSLOG ((LOG_WARN, "cannot lock %s", grp_file));
-                       }
                        closelog ();
                        exit (E_CANT_LOCK);
                }
 #ifdef SHADOWGRP
                if (is_shadow && (sgr_lock () == 0)) {
-                       fprintf (stderr, _("%s: cannot lock %s\n"),
+                       fprintf (stderr,
+                                _("%s: cannot lock %s; try again later.\n"),
                                 Prog, sgr_file);
-                       if (use_system_sgr_file) {
-                               SYSLOG ((LOG_WARN, "cannot lock %s", sgr_file));
-                       }
                        closelog ();
                        exit (E_CANT_LOCK);
                }

diff --git a/src/grpconv.c b/src/grpconv.c
index 5b7ef05614b6d23e15ab7126216ddb0885ca041c..beb31574c4ae6b31eed8196fce50937a3b970563 100644 (file)
--- a/src/grpconv.c
+++ b/src/grpconv.c
@@ -83,7 +83,9 @@ int main (int argc, char **argv)
        (void) textdomain (PACKAGE);
 
        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 (5);
        }
        group_locked = true;
@@ -93,7 +95,9 @@ int main (int argc, char **argv)
        }
 
        if (sgr_lock () == 0) {
-               fprintf (stderr, _("%s: cannot lock %s\n"), Prog, sgr_dbname ());
+               fprintf (stderr,
+                        _("%s: cannot lock %s; try again later.\n"),
+                        Prog, sgr_dbname ());
                fail_exit (5);
        }
        gshadow_locked = true;

diff --git a/src/grpunconv.c b/src/grpunconv.c
index 8cc1fdb6e42991394b60074f622c61bdcba26469..cb88f9d469395c1716a0e2246c4f6eb3a4f8a6ef 100644 (file)
--- a/src/grpunconv.c
+++ b/src/grpunconv.c
@@ -98,7 +98,8 @@ int main (int argc, char **argv)
 
        if (gr_lock () == 0) {
                fprintf (stderr,
-                        _("%s: cannot lock %s\n"), Prog, gr_dbname ());
+                        _("%s: cannot lock %s; try again later.\n"),
+                        Prog, gr_dbname ());
                fail_exit (5);
        }
        group_locked = true;
@@ -110,7 +111,8 @@ int main (int argc, char **argv)
 
        if (sgr_lock () == 0) {
                fprintf (stderr,
-                        _("%s: cannot lock %s\n"), Prog, sgr_dbname ());
+                        _("%s: cannot lock %s; try again later.\n"),
+                        Prog, sgr_dbname ());
                fail_exit (5);
        }
        gshadow_locked = true;

diff --git a/src/newusers.c b/src/newusers.c
index d6ba0fe2fb4cd5a817d27fa3b1adf5176b367eaa..eacfdfd614c3dc6e65bcce6cf06df6cefcf45759 100644 (file)
--- a/src/newusers.c
+++ b/src/newusers.c
@@ -608,23 +608,31 @@ static void open_files (void)
         * it gets locked, assume the others can be locked right away.
         */
        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 ());
                fail_exit (1);
        }
        passwd_locked = true;
        if (is_shadow && (spw_lock () == 0)) {
-               fprintf (stderr, _("%s: cannot lock %s\n"), Prog, spw_dbname ());
+               fprintf (stderr,
+                        _("%s: cannot lock %s; try again later.\n"),
+                        Prog, spw_dbname ());
                fail_exit (1);
        }
        shadow_locked = true;
        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 (1);
        }
        group_locked = true;
 #ifdef SHADOWGRP
        if (is_shadow_grp && (sgr_lock () == 0)) {
-               fprintf (stderr, _("%s: cannot lock %s\n"), Prog, sgr_dbname ());
+               fprintf (stderr,
+                        _("%s: cannot lock %s; try again later.\n"),
+                        Prog, sgr_dbname ());
                fail_exit (1);
        }
        gshadow_locked = true;

diff --git a/src/passwd.c b/src/passwd.c
index 938e3d51176b387336487d14d67b66e244f79d15..9d19cd46654228cb25fa943b6ceb486574dd0fc5 100644 (file)
--- a/src/passwd.c
+++ b/src/passwd.c
@@ -515,7 +515,6 @@ static void update_noshadow (void)
                fprintf (stderr,
                         _("%s: cannot lock %s; try again later.\n"),
                         Prog, pw_dbname ());
-               SYSLOG ((LOG_WARN, "cannot lock %s", pw_dbname ()));
                exit (E_PWDBUSY);
        }
        if (pw_open (O_RDWR) == 0) {
@@ -561,7 +560,6 @@ static void update_shadow (void)
                fprintf (stderr,
                         _("%s: cannot lock %s; try again later.\n"),
                         Prog, spw_dbname ());
-               SYSLOG ((LOG_WARN, "cannot lock %s", spw_dbname ()));
                exit (E_PWDBUSY);
        }
        if (spw_open (O_RDWR) == 0) {

diff --git a/src/pwck.c b/src/pwck.c
index 36ea23662f16211fec2784bd100d7bf55c44df0e..dac8555744bb23d4298aabe36df709c47f56fc9a 100644 (file)
--- a/src/pwck.c
+++ b/src/pwck.c
@@ -197,21 +197,17 @@ static void open_files (void)
         */
        if (!read_only) {
                if (pw_lock () == 0) {
-                       fprintf (stderr, _("%s: cannot lock %s\n"),
+                       fprintf (stderr,
+                                _("%s: cannot lock %s; try again later.\n"),
                                 Prog, pwd_file);
-                       if (use_system_pw_file) {
-                               SYSLOG ((LOG_WARN, "cannot lock %s", pwd_file));
-                       }
                        fail_exit (E_CANTLOCK);
                }
                pw_locked = true;
                if (is_shadow) {
                        if (spw_lock () == 0) {
-                               fprintf (stderr, _("%s: cannot lock %s\n"),
+                               fprintf (stderr,
+                                        _("%s: cannot lock %s; try again later.\n"),
                                         Prog, spw_file);
-                               if (use_system_spw_file) {
-                                       SYSLOG ((LOG_WARN, "cannot lock %s", spw_file));
-                               }
                                fail_exit (E_CANTLOCK);
                        }
                        spw_locked = true;

diff --git a/src/pwconv.c b/src/pwconv.c
index e0443d0ca091846126c05497cf317c0e8aaa373e..81478bdbcfc95fa0249e2502981a2aaeaa84be9a 100644 (file)
--- a/src/pwconv.c
+++ b/src/pwconv.c
@@ -127,7 +127,8 @@ int main (int argc, char **argv)
 
        if (pw_lock () == 0) {
                fprintf (stderr,
-                        _("%s: cannot lock %s\n"), Prog, pw_dbname ());
+                        _("%s: cannot lock %s; try again later.\n"),
+                        Prog, pw_dbname ());
                fail_exit (E_PWDBUSY);
        }
        passwd_locked = true;
@@ -139,7 +140,8 @@ int main (int argc, char **argv)
 
        if (spw_lock () == 0) {
                fprintf (stderr,
-                        _("%s: cannot lock %s\n"), Prog, spw_dbname ());
+                        _("%s: cannot lock %s; try again later.\n"),
+                        Prog, spw_dbname ());
                fail_exit (E_PWDBUSY);
        }
        shadow_locked = true;

diff --git a/src/pwunconv.c b/src/pwunconv.c
index fb6d2af81c0ba7008664f726d820ae2abb287ece..562c151a9661f15e3594007551dd455c7a2b7382 100644 (file)
--- a/src/pwunconv.c
+++ b/src/pwunconv.c
@@ -93,7 +93,7 @@ int main (int argc, char **argv)
 
        if (pw_lock () == 0) {
                fprintf (stderr,
-                        _("%s: cannot lock %s\n"),
+                        _("%s: cannot lock %s; try again later.\n"),
                         Prog, pw_dbname ());
                fail_exit (5);
        }
@@ -107,7 +107,7 @@ int main (int argc, char **argv)
 
        if (spw_lock () == 0) {
                fprintf (stderr,
-                        _("%s: cannot lock %s\n"),
+                        _("%s: cannot lock %s; try again later.\n"),
                         Prog, spw_dbname ());
                fail_exit (5);
        }

diff --git a/src/useradd.c b/src/useradd.c
index 4d81f6d48a572024557862e07a7932a5d4ae1376..83ef0769f20fafbe3051d10ac1920679f418062d 100644 (file)
--- a/src/useradd.c
+++ b/src/useradd.c
@@ -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);
                }

diff --git a/src/userdel.c b/src/userdel.c
index b64a1fb05d1bebe37965bc253eddce8a263962fb..1cb8ce5edcdb0858df0e9fa8d40a4f8c53f8d106 100644 (file)
--- a/src/userdel.c
+++ b/src/userdel.c
@@ -429,7 +429,9 @@ static void fail_exit (int code)
 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 ());
 #ifdef WITH_AUDIT
                audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
                              "locking password file",
@@ -451,7 +453,8 @@ static void open_files (void)
        if (is_shadow_pwd) {
                if (spw_lock () == 0) {
                        fprintf (stderr,
-                                _("%s: cannot lock %s\n"), Prog, spw_dbname ());
+                                _("%s: cannot lock %s; try again later.\n"),
+                                Prog, spw_dbname ());
 #ifdef WITH_AUDIT
                        audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
                                      "locking shadow password file",
@@ -462,7 +465,8 @@ static void open_files (void)
                shadow_locked = true;
                if (spw_open (O_RDWR) == 0) {
                        fprintf (stderr,
-                                _("%s: cannot open %s\n"), Prog, spw_dbname ());
+                                _("%s: cannot open %s\n"),
+                                Prog, spw_dbname ());
 #ifdef WITH_AUDIT
                        audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
                                      "opening shadow password file",
@@ -473,7 +477,8 @@ static void open_files (void)
        }
        if (gr_lock () == 0) {
                fprintf (stderr,
-                        _("%s: cannot lock %s\n"), Prog, gr_dbname ());
+                        _("%s: cannot lock %s; try again later.\n"),
+                        Prog, gr_dbname ());
 #ifdef WITH_AUDIT
                audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
                              "locking group file",
@@ -495,7 +500,8 @@ static void open_files (void)
        if (is_shadow_grp) {
                if (sgr_lock () == 0) {
                        fprintf (stderr,
-                                _("%s: cannot lock %s\n"), Prog, sgr_dbname ());
+                                _("%s: cannot lock %s; try again later.\n"),
+                                Prog, sgr_dbname ());
 #ifdef WITH_AUDIT
                        audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
                                      "locking shadow group file",

diff --git a/src/usermod.c b/src/usermod.c
index fe145f7356f908fe01ebc6f94871e3c493e65a15..99f53a5748d82adad32b453328fcbd2ecbfc6f19 100644 (file)
--- a/src/usermod.c
+++ b/src/usermod.c
@@ -1197,7 +1197,8 @@ static void open_files (void)
 {
        if (pw_lock () == 0) {
                fprintf (stderr,
-                        _("%s: cannot lock %s\n"), Prog, pw_dbname ());
+                        _("%s: cannot lock %s; try again later.\n"),
+                        Prog, pw_dbname ());
                fail_exit (E_PW_UPDATE);
        }
        pw_locked = true;
@@ -1208,7 +1209,8 @@ static void open_files (void)
        }
        if (is_shadow_pwd && (spw_lock () == 0)) {
                fprintf (stderr,
-                        _("%s: cannot lock %s\n"), Prog, spw_dbname ());
+                        _("%s: cannot lock %s; try again later.\n"),
+                        Prog, spw_dbname ());
                fail_exit (E_PW_UPDATE);
        }
        spw_locked = true;
@@ -1225,7 +1227,8 @@ static void open_files (void)
                 */
                if (gr_lock () == 0) {
                        fprintf (stderr,
-                                _("%s: cannot lock %s\n"), Prog, gr_dbname ());
+                                _("%s: cannot lock %s; try again later.\n"),
+                                Prog, gr_dbname ());
                        fail_exit (E_GRP_UPDATE);
                }
                gr_locked = true;
@@ -1237,7 +1240,8 @@ static void open_files (void)
 #ifdef SHADOWGRP
                if (is_shadow_grp && (sgr_lock () == 0)) {
                        fprintf (stderr,
-                                _("%s: cannot lock %s\n"), Prog, sgr_dbname ());
+                                _("%s: cannot lock %s; try again later.\n"),
+                                Prog, sgr_dbname ());
                        fail_exit (E_GRP_UPDATE);
                }
                sgr_locked = true;