diff options
| author | Tomas Mraz <tm@t8m.info> | 2005-09-21 10:00:58 +0000 |
|---|---|---|
| committer | Tomas Mraz <tm@t8m.info> | 2005-09-21 10:00:58 +0000 |
| commit | be09d6354efcb2571731bdffc47da86f22621ac8 (patch) | |
| tree | 82117bfbaadb46495a545ba4f567dc9bddd97c33 /modules/pam_lastlog | |
| parent | 627a0401899af257f0fb711ad54194e14a75c530 (diff) | |
| download | pam-be09d6354efcb2571731bdffc47da86f22621ac8.tar.gz pam-be09d6354efcb2571731bdffc47da86f22621ac8.tar.bz2 pam-be09d6354efcb2571731bdffc47da86f22621ac8.zip | |
Relevant BUGIDs:
Purpose of commit: new feature
Commit summary:
---------------
Moved functions from pammodutil to libpam.
Diffstat (limited to 'modules/pam_lastlog')
| -rw-r--r-- | modules/pam_lastlog/Makefile.am | 4 | ||||
| -rw-r--r-- | modules/pam_lastlog/pam_lastlog.c | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/modules/pam_lastlog/Makefile.am b/modules/pam_lastlog/Makefile.am index 8d7934c5..30b7bf1b 100644 --- a/modules/pam_lastlog/Makefile.am +++ b/modules/pam_lastlog/Makefile.am @@ -7,10 +7,8 @@ CLEANFILES = *~ securelibdir = $(SECUREDIR) secureconfdir = $(SCONFIGDIR) -AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ - -I$(top_srcdir)/modules/pammodutil/include/ +AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include AM_LDFLAGS = -no-undefined -avoid-version -module \ - $(top_builddir)/modules/pammodutil/libpammodutil.la \ -L$(top_builddir)/libpam -lpam if HAVE_VERSIONING AM_LDFLAGS += -Wl,--version-script=../modules.map diff --git a/modules/pam_lastlog/pam_lastlog.c b/modules/pam_lastlog/pam_lastlog.c index 0ed370a2..d0ad8216 100644 --- a/modules/pam_lastlog/pam_lastlog.c +++ b/modules/pam_lastlog/pam_lastlog.c @@ -79,7 +79,7 @@ struct lastlog { #include <security/pam_modules.h> #include <security/_pam_macros.h> -#include <security/_pam_modutil.h> +#include <security/pam_modutil.h> #include <security/pam_ext.h> /* argument parsing */ @@ -163,7 +163,7 @@ static int last_login_date(pam_handle_t *pamh, int announce, uid_t uid) sleep(LASTLOG_IGNORE_LOCK_TIME); } - win = (_pammodutil_read (last_fd, (char *) &last_login, + win = (pam_modutil_read (last_fd, (char *) &last_login, sizeof(last_login)) == sizeof(last_login)); last_lock.l_type = F_UNLCK; @@ -307,7 +307,7 @@ static int last_login_date(pam_handle_t *pamh, int announce, uid_t uid) } D(("writing to the last_log file")); - _pammodutil_write (last_fd, (char *) &last_login, + pam_modutil_write (last_fd, (char *) &last_login, sizeof (last_login)); last_lock.l_type = F_UNLCK; @@ -353,7 +353,7 @@ int pam_sm_open_session(pam_handle_t *pamh, int flags, int argc /* what uid? */ - pwd = _pammodutil_getpwnam (pamh, user); + pwd = pam_modutil_getpwnam (pamh, user); if (pwd == NULL) { D(("couldn't identify user %s", user)); return PAM_CRED_INSUFFICIENT; |