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

* src/pwconv.c: Report failure to unlock the passwd or shadow file

Browse Source 
to stderr and syslog.
	* src/pwconv.c: Report failure to chmod the backup file.
This commit is contained in:
nekral-guest 2008-08-07 08:02:34 +00:00
parent 93ccc35ff0
commit fd4b6cc52a
2 changed files with 48 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-08-06 Nicolas François <nicolas.francois@centraliens.net>
* src/pwconv.c: Report failure to unlock the passwd or shadow file
to stderr and syslog.
* src/pwconv.c: Report failure to chmod the backup file.
2008-08-06 Nicolas François <nicolas.francois@centraliens.net> 2008-08-06 Nicolas François <nicolas.francois@centraliens.net>
* src/grpunconv.c: Report failure to unlock the group or gshadow * src/grpunconv.c: Report failure to unlock the group or gshadow

50
src/pwconv.c
View File

@ -87,16 +87,26 @@ static bool shadow_locked = false;
static bool passwd_locked = false; static bool passwd_locked = false;
/* local function prototypes */ /* local function prototypes */
static void fail_exit (int); static void fail_exit (int status);
static void fail_exit (int status) static void fail_exit (int status)
{ {
if (shadow_locked) {
spw_unlock ();
}
if (passwd_locked) { if (passwd_locked) {
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 */
}
} }
if (shadow_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);
} }
@ -207,17 +217,41 @@ int main (int argc, char **argv)
fprintf (stderr, fprintf (stderr,
_("%s: failure while writing changes to %s\n"), _("%s: failure while writing changes to %s\n"),
Prog, spw_dbname ()); Prog, spw_dbname ());
SYSLOG ((LOG_ERR, "failure while writing changes to %s", spw_dbname ()));
fail_exit (E_FAILURE); fail_exit (E_FAILURE);
} }
if (pw_close () == 0) { if (pw_close () == 0) {
fprintf (stderr, fprintf (stderr,
_("%s: failure while writing changes to %s\n"), _("%s: failure while writing changes to %s\n"),
Prog, pw_dbname ()); Prog, pw_dbname ());
SYSLOG ((LOG_ERR, "failure while writing changes to %s", pw_dbname ()));
fail_exit (E_FAILURE); fail_exit (E_FAILURE);
} }
chmod (PASSWD_FILE "-", 0600); /* /etc/passwd- (backup file) */
spw_unlock (); /* /etc/passwd- (backup file) */
pw_unlock (); if (chmod (PASSWD_FILE "-", 0600) != 0) {
fprintf (stderr,
_("%s: failed to change the mode of %s to 0600\n"),
Prog, PASSWD_FILE "-");
SYSLOG ((LOG_ERR, "failed to change the mode of %s to 0600", PASSWD_FILE "-"));
/* continue */
}
if (passwd_locked) {
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 (shadow_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 */
}
}
nscd_flush_cache ("passwd"); nscd_flush_cache ("passwd");