- Add 0001-Remove-YP-dependencies-from-pam_access-they-were-nev.patch
OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam?expand=0&rev=153
This commit is contained in:
parent
8bde79bedc
commit
c640f626d0
@ -0,0 +1,71 @@
|
||||
From a64de52d1621ac3d3dd03f66742b48bef0101043 Mon Sep 17 00:00:00 2001
|
||||
From: Thorsten Kukuk <kukuk@thkukuk.de>
|
||||
Date: Wed, 23 Mar 2016 11:16:55 +0100
|
||||
Subject: [PATCH] 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.
|
||||
---
|
||||
modules/pam_access/Makefile.am | 4 ++--
|
||||
modules/pam_access/pam_access.c | 8 --------
|
||||
2 files changed, 2 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/modules/pam_access/Makefile.am b/modules/pam_access/Makefile.am
|
||||
index 0527674..6c0f738 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 b32a966..d4c847a 100644
|
||||
--- a/modules/pam_access/pam_access.c
|
||||
+++ b/modules/pam_access/pam_access.c
|
||||
@@ -44,9 +44,6 @@
|
||||
#include <arpa/inet.h>
|
||||
#include <netdb.h>
|
||||
#include <sys/socket.h>
|
||||
-#ifdef HAVE_RPCSVC_YPCLNT_H
|
||||
-#include <rpcsvc/ypclnt.h>
|
||||
-#endif
|
||||
#ifdef HAVE_LIBAUDIT
|
||||
#include <libaudit.h>
|
||||
#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);
|
||||
--
|
||||
1.8.5.6
|
||||
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 23 11:21:16 CET 2016 - kukuk@suse.de
|
||||
|
||||
- Add 0001-Remove-YP-dependencies-from-pam_access-they-were-nev.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jul 25 16:03:33 UTC 2015 - joschibrauchle@gmx.de
|
||||
|
||||
|
4
pam.spec
4
pam.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package pam
|
||||
#
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -54,6 +54,7 @@ Source9: baselibs.conf
|
||||
Patch0: fix-man-links.dif
|
||||
Patch2: pam-limit-nproc.patch
|
||||
Patch3: encryption_method_nis.diff
|
||||
Patch4: 0001-Remove-YP-dependencies-from-pam_access-they-were-nev.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
# Remove with next version update:
|
||||
BuildRequires: autoconf
|
||||
@ -104,6 +105,7 @@ building both PAM-aware applications and modules for use with PAM.
|
||||
%patch0 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
|
||||
%build
|
||||
autoreconf -fiv
|
||||
|
Loading…
Reference in New Issue
Block a user