From be70578239a37bd877cdb9c09c3a237246b0ef6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
Date: Mon, 21 Sep 2015 17:26:35 +0000
Subject: [PATCH] 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
---
 contrib/openpam/lib/libpam/openpam_constants.c | 3 +++
 lib/libpam/Makefile.inc                        | 1 -
 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 1cdd8101a88a..b718af90f8a5 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 d2d1d426360d..59a8ced858be 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 c8f13c465393..1dc977f610d3 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