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

* src/chage.c, src/chgpasswd.c, src/chpasswd.c, src/chsh.c,

Browse Source 
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:
nekral-guest
2008-08-22 02:20:53 +00:00
parent 130553a578
commit 82ed690817
21 changed files with 111 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/chage.c
View File

@@ -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) {