Adding tty logging to the useradd command

This commit adds a from= field to the end of the useradd log entry.
Casting user_name to tallylog_reset to silence a compiler warning.

Changelog: Fixing tabs
Changelog: Changing function prototype to const char* to match user_name declaration.
This commit is contained in:
ed 2019-12-18 20:53:58 +00:00 committed by Serge Hallyn
parent 51d65f37e5
commit f32d4a359b

View File

@ -223,7 +223,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 tallylog_reset (const 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);
@ -1912,7 +1912,7 @@ static void lastlog_reset (uid_t uid)
} }
} }
static void tallylog_reset (char *user_name) static void tallylog_reset (const char *user_name)
{ {
const char pam_tally2[] = "/sbin/pam_tally2"; const char pam_tally2[] = "/sbin/pam_tally2";
const char *pname; const char *pname;
@ -1968,6 +1968,7 @@ static void usr_update (void)
{ {
struct passwd pwent; struct passwd pwent;
struct spwd spent; struct spwd spent;
char *tty;
/* /*
* Fill in the password structure with any new fields, making * Fill in the password structure with any new fields, making
@ -1980,10 +1981,12 @@ static void usr_update (void)
* Create a syslog entry. We need to do this now in case anything * Create a syslog entry. We need to do this now in case anything
* happens so we know what we were trying to accomplish. * happens so we know what we were trying to accomplish.
*/ */
tty=ttyname (STDIN_FILENO);
SYSLOG ((LOG_INFO, SYSLOG ((LOG_INFO,
"new user: name=%s, UID=%u, GID=%u, home=%s, shell=%s", "new user: name=%s, UID=%u, GID=%u, home=%s, shell=%s, from=%s",
user_name, (unsigned int) user_id, user_name, (unsigned int) user_id,
(unsigned int) user_gid, user_home, user_shell)); (unsigned int) user_gid, user_home, user_shell,
tty ? tty : "none" ));
/* /*
* Initialize faillog and lastlog entries for this UID in case * Initialize faillog and lastlog entries for this UID in case