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

* src/login.c: Copy the name of the user authenticated by PAM to

Browse Source 
username. This simplify later logging (avoid USE_PAM
	conditional).
This commit is contained in:
nekral-guest
2008-09-20 19:54:35 +00:00
parent 65e32d850c
commit c813e692a2
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -1,6 +1,9 @@
2008-09-20 Nicolas François <nicolas.francois@centraliens.net> 2008-09-20 Nicolas François <nicolas.francois@centraliens.net>
* src/login.c: Use a dynamic buffer for usernames. * src/login.c: Use a dynamic buffer for usernames.
* src/login.c: Copy the name of the user authenticated by PAM to
username. This simplify later logging (avoid USE_PAM
conditional).
2008-09-20 Nicolas François <nicolas.francois@centraliens.net> 2008-09-20 Nicolas François <nicolas.francois@centraliens.net>

17
src/login.c
View File

@@ -787,11 +787,16 @@ int main (int argc, char **argv)
First get the username that we are actually using, though. First get the username that we are actually using, though.
*/ */
retcode = pam_get_item (pamh, PAM_USER, (const void **)ptr_pam_user); retcode = pam_get_item (pamh, PAM_USER, (const void **)ptr_pam_user);
pwd = xgetpwnam (pam_user); if (NULL != username) {
free (username);
}
username = xstrdup (pam_user);
pwd = xgetpwnam (username);
if (NULL == pwd) { if (NULL == pwd) {
SYSLOG ((LOG_ERR, "xgetpwnam(%s) failed", SYSLOG ((LOG_ERR, "xgetpwnam(%s) failed",
getdef_bool ("LOG_UNKFAIL_ENAB") ? getdef_bool ("LOG_UNKFAIL_ENAB") ?
pam_user : "UNKNOWN")); username : "UNKNOWN"));
exit (1); exit (1);
} }
@@ -1023,11 +1028,7 @@ int main (int argc, char **argv)
addenv ("IFS= \t\n", NULL); /* ... instead, set a safe IFS */ addenv ("IFS= \t\n", NULL); /* ... instead, set a safe IFS */
} }
#ifdef USE_PAM
setutmp (pam_user, tty, hostname); /* make entry in utmp & wtmp files */
#else
setutmp (username, tty, hostname); /* make entry in utmp & wtmp files */ setutmp (username, tty, hostname); /* make entry in utmp & wtmp files */
#endif
if (pwent.pw_shell[0] == '*') { /* subsystem root */ if (pwent.pw_shell[0] == '*') { /* subsystem root */
pwent.pw_shell++; /* skip the '*' */ pwent.pw_shell++; /* skip the '*' */
subsystem (&pwent); /* figure out what to execute */ subsystem (&pwent); /* figure out what to execute */
@@ -1216,11 +1217,7 @@ int main (int argc, char **argv)
if (0 == pwent.pw_uid) { if (0 == pwent.pw_uid) {
SYSLOG ((LOG_NOTICE, "ROOT LOGIN %s", fromhost)); SYSLOG ((LOG_NOTICE, "ROOT LOGIN %s", fromhost));
} else if (getdef_bool ("LOG_OK_LOGINS")) { } else if (getdef_bool ("LOG_OK_LOGINS")) {
#ifdef USE_PAM
SYSLOG ((LOG_INFO, "'%s' logged in %s", pam_user, fromhost));
#else
SYSLOG ((LOG_INFO, "'%s' logged in %s", username, fromhost)); SYSLOG ((LOG_INFO, "'%s' logged in %s", username, fromhost));
#endif
} }
closelog (); closelog ();
tmp = getdef_str ("FAKE_SHELL"); tmp = getdef_str ("FAKE_SHELL");