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

* src/passwd.c: Check failure to unlock files. Report errors to

Browse Source 
stderr and syslog, but continue.
This commit is contained in:
nekral-guest 2008-08-22 02:24:29 +00:00
parent 82779cd336
commit 7ae6b8fc34
2 changed files with 45 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-08-18 Nicolas François <nicolas.francois@centraliens.net>
* src/passwd.c: Check failure to unlock files. Report errors to
stderr and syslog, but continue.
2008-08-17 Nicolas François <nicolas.francois@centraliens.net> 2008-08-17 Nicolas François <nicolas.francois@centraliens.net>
* src/chfn.c, src/chgpasswd.c, src/chpasswd.c, src/gpasswd.c, * src/chfn.c, src/chgpasswd.c, src/chpasswd.c, src/gpasswd.c,

46
src/passwd.c
View File

@ -100,6 +100,9 @@ static long inact = 0; /* Days without change before locked */
static bool do_update_age = false; static bool do_update_age = false;
static bool pw_locked = false;
static bool spw_locked = false;
#ifndef USE_PAM #ifndef USE_PAM
/* /*
* Size of the biggest passwd: * Size of the biggest passwd:
@ -461,8 +464,22 @@ static void print_status (const struct passwd *pw)
static void fail_exit (int status) static void fail_exit (int status)
{ {
pw_unlock (); if (pw_locked) {
spw_unlock (); if (pw_unlock () == 0) {
fprintf (stderr, _("%s: failed to unlock %s\n"), Prog, pw_dbname ());
SYSLOG ((LOG_ERR, "failed to unlock %s", pw_dbname ()));
/* continue */
}
}
if (spw_locked) {
if (spw_unlock () == 0) {
fprintf (stderr, _("%s: failed to unlock %s\n"), Prog, spw_dbname ());
SYSLOG ((LOG_ERR, "failed to unlock %s", spw_dbname ()));
/* continue */
}
}
exit (status); exit (status);
} }
@ -517,6 +534,7 @@ static void update_noshadow (void)
Prog, pw_dbname ()); Prog, pw_dbname ());
exit (E_PWDBUSY); exit (E_PWDBUSY);
} }
pw_locked = true;
if (pw_open (O_RDWR) == 0) { if (pw_open (O_RDWR) == 0) {
fprintf (stderr, fprintf (stderr,
_("%s: cannot open %s\n"), _("%s: cannot open %s\n"),
@ -548,7 +566,12 @@ static void update_noshadow (void)
SYSLOG ((LOG_ERR, "failure while writing changes to %s", pw_dbname ())); SYSLOG ((LOG_ERR, "failure while writing changes to %s", pw_dbname ()));
fail_exit (E_FAILURE); fail_exit (E_FAILURE);
} }
pw_unlock (); if (pw_unlock () == 0) {
fprintf (stderr, _("%s: failed to unlock %s\n"), Prog, pw_dbname ());
SYSLOG ((LOG_ERR, "failed to unlock %s", pw_dbname ()));
/* continue */
}
pw_locked = false;
} }
static void update_shadow (void) static void update_shadow (void)
@ -562,6 +585,7 @@ static void update_shadow (void)
Prog, spw_dbname ()); Prog, spw_dbname ());
exit (E_PWDBUSY); exit (E_PWDBUSY);
} }
spw_locked = true;
if (spw_open (O_RDWR) == 0) { if (spw_open (O_RDWR) == 0) {
fprintf (stderr, _("%s: cannot open %s\n"), Prog, spw_dbname ()); fprintf (stderr, _("%s: cannot open %s\n"), Prog, spw_dbname ());
SYSLOG ((LOG_ERR, "cannot open %s", spw_dbname ())); SYSLOG ((LOG_ERR, "cannot open %s", spw_dbname ()));
@ -570,9 +594,14 @@ static void update_shadow (void)
sp = spw_locate (name); sp = spw_locate (name);
if (NULL == sp) { if (NULL == sp) {
/* Try to update the password in /etc/passwd instead. */ /* Try to update the password in /etc/passwd instead. */
spw_close (); (void) spw_close ();
update_noshadow (); update_noshadow ();
spw_unlock (); if (spw_unlock () == 0) {
fprintf (stderr, _("%s: failed to unlock %s\n"), Prog, spw_dbname ());
SYSLOG ((LOG_ERR, "failed to unlock %s", spw_dbname ()));
/* continue */
}
spw_locked = false;
return; return;
} }
nsp = __spw_dup (sp); nsp = __spw_dup (sp);
@ -616,7 +645,12 @@ static void update_shadow (void)
SYSLOG ((LOG_ERR, "failure while writing changes to %s", spw_dbname ())); SYSLOG ((LOG_ERR, "failure while writing changes to %s", spw_dbname ()));
fail_exit (E_FAILURE); fail_exit (E_FAILURE);
} }
spw_unlock (); if (spw_unlock () == 0) {
fprintf (stderr, _("%s: failed to unlock %s\n"), Prog, spw_dbname ());
SYSLOG ((LOG_ERR, "failed to unlock %s", spw_dbname ()));
/* continue */
}
spw_locked = false;
} }
static long getnumber (const char *numstr) static long getnumber (const char *numstr)