Let pam_lastlog use utmpx instead of libulog's utmpx interface.

It will still use ulog_login(3) and ulog_logout(3), which will remain
present.
This commit is contained in:
Ed Schouten 2010-01-13 18:32:31 +00:00
parent 006ab5b3e7
commit 2957240805
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=202211

View File

@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$");
#include <pwd.h> #include <pwd.h>
#include <time.h> #include <time.h>
#include <ulog.h> #include <ulog.h>
#include <utmpx.h>
#define PAM_SM_SESSION #define PAM_SM_SESSION
@ -61,7 +62,7 @@ pam_sm_open_session(pam_handle_t *pamh, int flags,
int argc __unused, const char *argv[] __unused) int argc __unused, const char *argv[] __unused)
{ {
struct passwd *pwd; struct passwd *pwd;
struct ulog_utmpx *utx; struct utmpx *utx;
time_t t; time_t t;
const char *user; const char *user;
const void *rhost, *tty; const void *rhost, *tty;
@ -91,10 +92,10 @@ pam_sm_open_session(pam_handle_t *pamh, int flags,
} }
if ((flags & PAM_SILENT) == 0) { if ((flags & PAM_SILENT) == 0) {
if (ulog_setutxfile(UTXI_USER, NULL) != 0) { if (setutxdb(UTXDB_LASTLOGIN, NULL) != 0) {
PAM_LOG("Failed to open lastlog database"); PAM_LOG("Failed to open lastlogin database");
} else { } else {
utx = ulog_getutxuser(user); utx = getutxuser(user);
if (utx != NULL && utx->ut_type == USER_PROCESS) { if (utx != NULL && utx->ut_type == USER_PROCESS) {
t = utx->ut_tv.tv_sec; t = utx->ut_tv.tv_sec;
if (*utx->ut_host != '\0') if (*utx->ut_host != '\0')
@ -104,7 +105,7 @@ pam_sm_open_session(pam_handle_t *pamh, int flags,
pam_info(pamh, "Last login: %.*s on %s", pam_info(pamh, "Last login: %.*s on %s",
24 - 5, ctime(&t), utx->ut_line); 24 - 5, ctime(&t), utx->ut_line);
} }
ulog_endutxent(); endutxent();
} }
} }