diff options
| author | des <des@FreeBSD.org> | 2015-09-21 17:26:35 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2015-09-21 17:26:35 +0000 |
| commit | ea85485818843faacde44e40da05823ce03c94f0 (patch) | |
| tree | 6a0a95595d8d4f61f96b42277b0a1dd533818116 | |
| parent | 7504a922006cc2270bb780225deb7bb8f633fd17 (diff) | |
| download | FreeBSD-src-ea85485818843faacde44e40da05823ce03c94f0.zip FreeBSD-src-ea85485818843faacde44e40da05823ce03c94f0.tar.gz | |
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
| -rw-r--r-- | contrib/openpam/lib/libpam/openpam_constants.c | 3 | ||||
| -rw-r--r-- | lib/libpam/Makefile.inc | 1 | ||||
| -rw-r--r-- | lib/libpam/libpam/Makefile | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/contrib/openpam/lib/libpam/openpam_constants.c b/contrib/openpam/lib/libpam/openpam_constants.c index 1cdd810..b718af9 100644 --- a/contrib/openpam/lib/libpam/openpam_constants.c +++ b/contrib/openpam/lib/libpam/openpam_constants.c @@ -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", diff --git a/lib/libpam/Makefile.inc b/lib/libpam/Makefile.inc index d2d1d42..59a8ced 100644 --- a/lib/libpam/Makefile.inc +++ b/lib/libpam/Makefile.inc @@ -27,7 +27,6 @@ CFLAGS+= -DOPENPAM_DEBUG SHLIB_MAJOR= 5 -PAM_MOD_DIR= ${LIBDIR} STATIC_CFLAGS+= -DOPENPAM_STATIC_MODULES diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile index c8f13c4..1dc977f 100644 --- a/lib/libpam/libpam/Makefile +++ b/lib/libpam/libpam/Makefile @@ -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 |
