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

16
src/userdel.c
View File

@ -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",