From: Thorsten Kukuk Date: Wed, 23 Mar 2016 10:16:55 +0000 (+0100) Subject: Remove YP dependencies from pam_access, they were never used X-Git-Tag: Linux-PAM-1.3.0~16 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a64de52d1621ac3d3dd03f66742b48bef0101043;p=linux-pam Remove YP dependencies from pam_access, they were never used and such not needed. * modules/pam_access/Makefile.am: Remove NIS_CFLAGS and NIS_LIBS * modules/pam_access/pam_access.c: Remove yp_get_default_domain case, it will never be used. --- diff --git a/modules/pam_access/Makefile.am b/modules/pam_access/Makefile.am index 05276747..6c0f738e 100644 --- a/modules/pam_access/Makefile.am +++ b/modules/pam_access/Makefile.am @@ -15,14 +15,14 @@ securelibdir = $(SECUREDIR) secureconfdir = $(SCONFIGDIR) AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ - -DPAM_ACCESS_CONFIG=\"$(SCONFIGDIR)/access.conf\" $(NIS_CFLAGS) + -DPAM_ACCESS_CONFIG=\"$(SCONFIGDIR)/access.conf\" AM_LDFLAGS = -no-undefined -avoid-version -module if HAVE_VERSIONING AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif securelib_LTLIBRARIES = pam_access.la -pam_access_la_LIBADD = $(top_builddir)/libpam/libpam.la $(NIS_LIBS) +pam_access_la_LIBADD = $(top_builddir)/libpam/libpam.la secureconf_DATA = access.conf diff --git a/modules/pam_access/pam_access.c b/modules/pam_access/pam_access.c index b32a966b..d4c847a0 100644 --- a/modules/pam_access/pam_access.c +++ b/modules/pam_access/pam_access.c @@ -44,9 +44,6 @@ #include #include #include -#ifdef HAVE_RPCSVC_YPCLNT_H -#include -#endif #ifdef HAVE_LIBAUDIT #include #endif @@ -470,8 +467,6 @@ netgroup_match (pam_handle_t *pamh, const char *netgroup, { int retval; char *mydomain = NULL; - -#if defined(HAVE_GETDOMAINNAME) char domainname_res[256]; if (getdomainname (domainname_res, sizeof (domainname_res)) == 0) @@ -481,9 +476,6 @@ netgroup_match (pam_handle_t *pamh, const char *netgroup, mydomain = domainname_res; } } -#elif defined(HAVE_YP_GET_DEFAULT_DOMAIN) - yp_get_default_domain(&mydomain); -#endif #ifdef HAVE_INNETGR retval = innetgr (netgroup, machine, user, mydomain);