From owner-svn-src-head@freebsd.org Mon Sep 21 17:26:36 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D2580A06E35; Mon, 21 Sep 2015 17:26:36 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A87301D36; Mon, 21 Sep 2015 17:26:36 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8LHQatx032201; Mon, 21 Sep 2015 17:26:36 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8LHQZI0032196; Mon, 21 Sep 2015 17:26:35 GMT (envelope-from des@FreeBSD.org) Message-Id: <201509211726.t8LHQZI0032196@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Mon, 21 Sep 2015 17:26:35 +0000 (UTC) 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 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Sep 2015 17:26:36 -0000 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