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

Reset user in tallylog

Browse Source 
The useradd application resets the user data in /var/log/faillog, if it
exists and a new user is created.

pam_tally2 is used in many distributions.

Check for /var/log/tallylog and reset the user there.

Patch was written by Josef Moellers <jmoellers@suse.de>.

https://bugzilla.suse.com/show_bug.cgi?id=980486
This commit is contained in:
Michael Vetter 2016-10-19 14:40:59 +02:00 committed by Serge Hallyn
parent 9e93c984f7
commit b2bd56a012
1 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/useradd.c
View File

@ -51,7 +51,9 @@
#include <string.h> #include <string.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h>
#include <time.h> #include <time.h>
#include <unistd.h>
#include "chkname.h" #include "chkname.h"
#include "defines.h" #include "defines.h"
#include "faillog.h" #include "faillog.h"
@ -213,6 +215,7 @@ static void open_files (void);
static void open_shadow (void); static void open_shadow (void);
static void faillog_reset (uid_t); static void faillog_reset (uid_t);
static void lastlog_reset (uid_t); static void lastlog_reset (uid_t);
static void tallylog_reset (char *);
static void usr_update (void); static void usr_update (void);
static void create_home (void); static void create_home (void);
static void create_mail (void); static void create_mail (void);
@ -1789,6 +1792,50 @@ static void lastlog_reset (uid_t uid)
} }
} }
static void tallylog_reset (char *user_name)
{
static const char pam_tally2[] = "/sbin/pam_tally2";
const char *pname;
pid_t childpid;
int failed;
int status;
if (access(pam_tally2, X_OK) == -1)
return;
failed = 0;
switch (childpid = fork())
{
case -1: /* error */
failed = 1;
break;
case 0: /* child */
pname = strrchr(pam_tally2, '/');
if (pname == NULL)
pname = pam_tally2;
else
pname++; /* Skip the '/' */
execl(pam_tally2, pname, "--user", user_name, "--reset", "--quiet", NULL);
/* If we come here, something has gone terribly wrong */
failed = 1;
break;
default: /* parent */
if (waitpid(childpid, &status, 0) == -1 || !WIFEXITED(status) || WEXITSTATUS(status) != 0)
failed = 1;
break;
}
if (failed);
{
fprintf (stderr,
_("%s: failed to reset the tallylog entry of user \"%s\"\n"),
Prog, user_name);
SYSLOG ((LOG_WARN, "failed to reset the tallylog entry of user \"%s\"", user_name));
}
return;
}
/* /*
* usr_update - create the user entries * usr_update - create the user entries
* *
@ -2231,6 +2278,15 @@ int main (int argc, char **argv)
close_files (); close_files ();
/*
* tallylog_reset needs to be able to lookup
* a valid existing user name,
* so we canot call it before close_files()
*/
if ((!lflg) && (getpwuid (user_id) != NULL)) {
tallylog_reset (user_name);
}
#ifdef WITH_SELINUX #ifdef WITH_SELINUX
if (Zflg) { if (Zflg) {
if (set_seuser (user_name, user_selinux) != 0) { if (set_seuser (user_name, user_selinux) != 0) {