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_listfile | |
| 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_listfile')
| -rw-r--r-- | modules/pam_listfile/Makefile.am | 4 | ||||
| -rw-r--r-- | modules/pam_listfile/pam_listfile.c | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/modules/pam_listfile/Makefile.am b/modules/pam_listfile/Makefile.am index ad38ccb7..d622d7b6 100644 --- a/modules/pam_listfile/Makefile.am +++ b/modules/pam_listfile/Makefile.am @@ -9,10 +9,8 @@ EXTRA_DIST = README 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_listfile/pam_listfile.c b/modules/pam_listfile/pam_listfile.c index e9d921dd..c19cfc1a 100644 --- a/modules/pam_listfile/pam_listfile.c +++ b/modules/pam_listfile/pam_listfile.c @@ -39,7 +39,7 @@ #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> /* some syslogging */ @@ -218,7 +218,7 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, return PAM_IGNORE; } } else if(apply_type==APPLY_TYPE_GROUP) { - if(!_pammodutil_user_in_group_nam_nam(pamh,user_name,apply_val)) { + if(!pam_modutil_user_in_group_nam_nam(pamh,user_name,apply_val)) { /* Not a member of apply= group */ #ifdef DEBUG pam_syslog(pamh,LOG_DEBUG, @@ -261,14 +261,14 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, if(extitem) { switch(extitem) { case EI_GROUP: - userinfo = _pammodutil_getpwnam(pamh, citemp); + userinfo = pam_modutil_getpwnam(pamh, citemp); if (userinfo == NULL) { pam_syslog(pamh,LOG_ERR, "getpwnam(%s) failed", citemp); free(ifname); return onerr; } - grpinfo = _pammodutil_getgrgid(pamh, userinfo->pw_gid); + grpinfo = pam_modutil_getgrgid(pamh, userinfo->pw_gid); if (grpinfo == NULL) { pam_syslog(pamh,LOG_ERR, "getgrgid(%d) failed", (int)userinfo->pw_gid); @@ -290,7 +290,7 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, /* Assume that we have already gotten PAM_USER in pam_get_item() - a valid assumption since citem gets set to PAM_USER in the extitem switch */ - userinfo = _pammodutil_getpwnam(pamh, citemp); + userinfo = pam_modutil_getpwnam(pamh, citemp); if (userinfo == NULL) { pam_syslog(pamh,LOG_ERR, "getpwnam(%s) failed", citemp); |