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_nologin | |
| parent | 627a0401899af257f0fb711ad54194e14a75c530 (diff) | |
Relevant BUGIDs:
Purpose of commit: new feature
Commit summary:
---------------
Moved functions from pammodutil to libpam.
Diffstat (limited to 'modules/pam_nologin')
| -rw-r--r-- | modules/pam_nologin/Makefile.am | 4 | ||||
| -rw-r--r-- | modules/pam_nologin/pam_nologin.c | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/modules/pam_nologin/Makefile.am b/modules/pam_nologin/Makefile.am index 0a6181c2..8c483f9a 100644 --- a/modules/pam_nologin/Makefile.am +++ b/modules/pam_nologin/Makefile.am @@ -11,10 +11,8 @@ man_MANS = pam_nologin.8 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_nologin/pam_nologin.c b/modules/pam_nologin/pam_nologin.c index d9da7bcd..1b6c0bee 100644 --- a/modules/pam_nologin/pam_nologin.c +++ b/modules/pam_nologin/pam_nologin.c @@ -29,7 +29,7 @@ #define PAM_SM_ACCOUNT #include <security/pam_modules.h> -#include <security/_pam_modutil.h> +#include <security/pam_modutil.h> #include <security/pam_ext.h> /* @@ -85,7 +85,7 @@ static int perform_check(pam_handle_t *pamh, struct opt_s *opts) struct passwd *user_pwd; struct stat st; - user_pwd = _pammodutil_getpwnam(pamh, username); + user_pwd = pam_modutil_getpwnam(pamh, username); if (user_pwd == NULL) { retval = PAM_USER_UNKNOWN; @@ -111,7 +111,7 @@ static int perform_check(pam_handle_t *pamh, struct opt_s *opts) goto clean_up_fd; } - if (_pammodutil_read(fd, mtmp, st.st_size) == st.st_size) { + if (pam_modutil_read(fd, mtmp, st.st_size) == st.st_size) { mtmp[st.st_size] = '\000'; pam_prompt (pamh, msg_style, NULL, "%s", mtmp); |