Date: Mon, 21 Sep 2015 17:26:35 +0000 (UTC) From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= <des@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r288070 - in head: contrib/openpam/lib/libpam lib/libpam lib/libpam/libpam Message-ID: <201509211726.t8LHQZI0032196@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: des Date: Mon Sep 21 17:26:35 2015 New Revision: 288070 URL: https://svnweb.freebsd.org/changeset/base/288070 Log: Restore the upstream (and documented) behavior of searching for modules both in /usr/lib and /usr/local/lib, thus simplifying the use of modules from ports, without breaking the compat32 case again. PR: 191151 MFC after: 3 weeks Modified: head/contrib/openpam/lib/libpam/openpam_constants.c head/lib/libpam/Makefile.inc head/lib/libpam/libpam/Makefile Modified: head/contrib/openpam/lib/libpam/openpam_constants.c ============================================================================== --- head/contrib/openpam/lib/libpam/openpam_constants.c Mon Sep 21 16:07:22 2015 (r288069) +++ head/contrib/openpam/lib/libpam/openpam_constants.c Mon Sep 21 17:26:35 2015 (r288070) @@ -137,6 +137,9 @@ const char *openpam_policy_path[] = { const char *openpam_module_path[] = { #ifdef OPENPAM_MODULES_DIRECTORY OPENPAM_MODULES_DIRECTORY, +#elif COMPAT_32BIT + "/usr/lib32", + "/usr/local/lib32", #else "/usr/lib", "/usr/local/lib", Modified: head/lib/libpam/Makefile.inc ============================================================================== --- head/lib/libpam/Makefile.inc Mon Sep 21 16:07:22 2015 (r288069) +++ head/lib/libpam/Makefile.inc Mon Sep 21 17:26:35 2015 (r288070) @@ -27,7 +27,6 @@ CFLAGS+= -DOPENPAM_DEBUG SHLIB_MAJOR= 5 -PAM_MOD_DIR= ${LIBDIR} STATIC_CFLAGS+= -DOPENPAM_STATIC_MODULES Modified: head/lib/libpam/libpam/Makefile ============================================================================== --- head/lib/libpam/libpam/Makefile Mon Sep 21 16:07:22 2015 (r288069) +++ head/lib/libpam/libpam/Makefile Mon Sep 21 17:26:35 2015 (r288070) @@ -155,7 +155,6 @@ MLINKS= pam.conf.5 pam.d.5 CSTD?= c99 CFLAGS+= -I${.CURDIR} -I${OPENPAM}/include CFLAGS+= -DLIB_MAJ=${SHLIB_MAJOR} -CFLAGS+= -DOPENPAM_MODULES_DIRECTORY='"${PAM_MOD_DIR:C/\/*$//}/"' CFLAGS+= -DHAVE_DLFUNC=1 CFLAGS+= -DHAVE_FDLOPEN=1 CFLAGS+= -DHAVE_FPURGE=1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509211726.t8LHQZI0032196>