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_succeed_if | |
| 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_succeed_if')
| -rw-r--r-- | modules/pam_succeed_if/Makefile.am | 4 | ||||
| -rw-r--r-- | modules/pam_succeed_if/pam_succeed_if.c | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/modules/pam_succeed_if/Makefile.am b/modules/pam_succeed_if/Makefile.am index 4ed10b72..71a63dc1 100644 --- a/modules/pam_succeed_if/Makefile.am +++ b/modules/pam_succeed_if/Makefile.am @@ -11,10 +11,8 @@ man_MANS = pam_succeed_if.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_succeed_if/pam_succeed_if.c b/modules/pam_succeed_if/pam_succeed_if.c index 2f5e6294..9e3046f3 100644 --- a/modules/pam_succeed_if/pam_succeed_if.c +++ b/modules/pam_succeed_if/pam_succeed_if.c @@ -53,7 +53,7 @@ #include <pwd.h> #include <grp.h> #include <security/pam_modules.h> -#include <security/_pam_modutil.h> +#include <security/pam_modutil.h> #include <security/pam_ext.h> /* Basically, run cmp(atol(left), atol(right)), returning PAM_SUCCESS if @@ -184,7 +184,7 @@ static int evaluate_ingroup(pam_handle_t *pamh, const char *user, const char *group) { int ret; - ret = _pammodutil_user_in_group_nam_nam(pamh, user, group); + ret = pam_modutil_user_in_group_nam_nam(pamh, user, group); switch (ret) { case 1: return PAM_SUCCESS; @@ -199,7 +199,7 @@ static int evaluate_notingroup(pam_handle_t *pamh, const char *user, const char *group) { int ret; - ret = _pammodutil_user_in_group_nam_nam(pamh, user, group); + ret = pam_modutil_user_in_group_nam_nam(pamh, user, group); switch (ret) { case 0: return PAM_SUCCESS; @@ -349,7 +349,7 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, if (use_uid) { /* Get information about the user. */ - pwd = _pammodutil_getpwuid(pamh, getuid()); + pwd = pam_modutil_getpwuid(pamh, getuid()); if (pwd == NULL) { pam_syslog(pamh,LOG_CRIT, "error retrieving information about user %ld", @@ -367,7 +367,7 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, } /* Get information about the user. */ - pwd = _pammodutil_getpwnam(pamh, user); + pwd = pam_modutil_getpwnam(pamh, user); if (pwd == NULL) { pam_syslog(pamh,LOG_CRIT, "error retrieving information about user %s", |