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

Merge pull request #67 from AdamMajer/upstream

Browse Source 
Print error on exec failure + cosmetic changes
This commit is contained in:
Serge Hallyn 2017-02-21 14:37:42 -06:00 committed by GitHub
commit 24130c882d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/useradd.c
View File

@ -1794,7 +1794,7 @@ static void lastlog_reset (uid_t uid)
static void tallylog_reset (char *user_name) static void tallylog_reset (char *user_name)
{ {
static const char pam_tally2[] = "/sbin/pam_tally2"; const char pam_tally2[] = "/sbin/pam_tally2";
const char *pname; const char *pname;
pid_t childpid; pid_t childpid;
int failed; int failed;
@ -1817,7 +1817,9 @@ static void tallylog_reset (char *user_name)
pname++; /* Skip the '/' */ pname++; /* Skip the '/' */
execl(pam_tally2, pname, "--user", user_name, "--reset", "--quiet", NULL); execl(pam_tally2, pname, "--user", user_name, "--reset", "--quiet", NULL);
/* If we come here, something has gone terribly wrong */ /* If we come here, something has gone terribly wrong */
failed = 1; perror(pam_tally2);
exit(42); /* don't continue, we now have 2 processes running! */
/* NOTREACHED */
break; break;
default: /* parent */ default: /* parent */
if (waitpid(childpid, &status, 0) == -1 || !WIFEXITED(status) || WEXITSTATUS(status) != 0) if (waitpid(childpid, &status, 0) == -1 || !WIFEXITED(status) || WEXITSTATUS(status) != 0)
@ -2285,7 +2287,7 @@ int main (int argc, char **argv)
* a valid existing user name, * a valid existing user name,
* so we canot call it before close_files() * so we canot call it before close_files()
*/ */
if ((!lflg) && (getpwuid (user_id) != NULL)) { if (!lflg && getpwuid (user_id) != NULL) {
tallylog_reset (user_name); tallylog_reset (user_name);
} }