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_access | |
| parent | 627a0401899af257f0fb711ad54194e14a75c530 (diff) | |
Relevant BUGIDs:
Purpose of commit: new feature
Commit summary:
---------------
Moved functions from pammodutil to libpam.
Diffstat (limited to 'modules/pam_access')
| -rw-r--r-- | modules/pam_access/Makefile.am | 2 | ||||
| -rw-r--r-- | modules/pam_access/pam_access.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/modules/pam_access/Makefile.am b/modules/pam_access/Makefile.am index 36d060a4..94f7048b 100644 --- a/modules/pam_access/Makefile.am +++ b/modules/pam_access/Makefile.am @@ -10,10 +10,8 @@ securelibdir = $(SECUREDIR) secureconfdir = $(SCONFIGDIR) AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ - -I$(top_srcdir)/modules/pammodutil/include/ \ -DPAM_ACCESS_CONFIG=\"$(SCONFIGDIR)/access.conf\" AM_LDFLAGS = -no-undefined -avoid-version -module \ - $(top_builddir)/modules/pammodutil/libpammodutil.la \ -L$(top_builddir)/libpam -lpam @LIBNSL@ if HAVE_VERSIONING AM_LDFLAGS += -Wl,--version-script=../modules.map diff --git a/modules/pam_access/pam_access.c b/modules/pam_access/pam_access.c index 55feaeff..55b7818d 100644 --- a/modules/pam_access/pam_access.c +++ b/modules/pam_access/pam_access.c @@ -59,7 +59,7 @@ #include <security/_pam_macros.h> #include <security/pam_modules.h> -#include <security/_pam_modutil.h> +#include <security/pam_modutil.h> #include <security/pam_ext.h> /* login_access.c from logdaemon-5.6 with several changes by A.Nogin: */ @@ -291,7 +291,7 @@ static int user_match(pam_handle_t *pamh, char *tok, struct login_info *item) return (netgroup_match(tok + 1, (char *) 0, string)); else if (string_match (tok, string)) /* ALL or exact match */ return YES; - else if (_pammodutil_user_in_group_nam_nam (pamh, item->user->pw_name, tok)) + else if (pam_modutil_user_in_group_nam_nam (pamh, item->user->pw_name, tok)) /* try group membership */ return YES; @@ -437,7 +437,7 @@ pam_sm_acct_mgmt (pam_handle_t *pamh, int flags UNUSED, } } - if ((user_pw=_pammodutil_getpwnam(pamh, user))==NULL) return (PAM_USER_UNKNOWN); + if ((user_pw=pam_modutil_getpwnam(pamh, user))==NULL) return (PAM_USER_UNKNOWN); /* * Bundle up the arguments to avoid unnecessary clumsiness later on. |