From nobody Mon Jun 9 10:58:54 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bG8732Ngkz5xxVt; Mon, 09 Jun 2025 10:58:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bG8731BlNz4Hqp; Mon, 09 Jun 2025 10:58:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749466735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/u2zPxEHNUqgDJhBY4CZ2fDjAHVX4vOP9LgIKq3ffhw=; b=vp9dsQA23RMFgiUy+0CJNmLkrJQFz/eudK7kBpX12xaIjcCX14KMKLHZ2IwbtulZcrEKKn yh8SDk2QyTjQuOMBS7YagvPbdyzgedBSZmMS93RfMLqeKKkgb280JM5mWNS2ROa4d0EQRC FUu7ZbfFq7ulZlhAz81ijoIKwqWHE8z0QHPQWo8/S7L6pMgUwliCLwpqCgIvZrKBL4VTrc qeTiUyBq2REaYyQfp0FVcYnAaAOuTYMUv13jbgsSREwWS8OGyEPKeAvk0xy0fO691T3j9B 5xEz2SmZ4sOmuxp58X6n/oT2G1UtrsStaA5TeD+kWtXZfC/r8O0hedZKEtgw8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749466735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/u2zPxEHNUqgDJhBY4CZ2fDjAHVX4vOP9LgIKq3ffhw=; b=r8aI7bpIHdG5ygvIZnvsXS/kCz7Bma7Xi4h1Q3E5Ox7sascHIAOu7rx7uX30AEbEseYWm+ NjWqWh+HwCQPOyM/+LIVXHz6wXI2rgM9Ti67gvuHUjrd2BfmlPSoPZITMlCR4iQErsXJGu CL1gZX4Hxg3+KwIvHU2QdmLTSSPih7c+zplLxVa990NyH1/ySaWI/q/gaad1MARvOcDi43 9kx94gFFibJ0wTVNJ1NmA27YCgPkz3L6SD70BiZOJX/z38N4dmyuqCUzdK41sn0qrUw8NE cou98mErMC234G5jut8A8uhSsuNa6vb4q6M3LWjJV3DT5nXsLIAL4mJkIXir8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749466735; a=rsa-sha256; cv=none; b=w7qdEOET+Wq/hfrF+5GiC6xvsj7uN7HglBqjc4sllDLQoa92V0Ct1NRkrhR+0LbRHLQU2B oRK4LDFHfGVmBEjDVrEnNLFCFXaUKlcpWTJm75t7dUTnNH3H2U0r4tpyorNUwIts3yVYXU /xp6Ru2JVV2HTazXjlaJ92oo02teylkQtn1Qa9lAJhw/Im7eYJKxGdroBMUdqN/chiORJj TzOQF4CIOyCQ4iXMn7ME71R2ANFbwJn1xEhfxAB/Ulr91Bmaqc36fjIb6S2XNLkSLOvseS LNC1msJmm7W4cs21W2tSsnGaB83ib1Q5Q8LJAmcW73+DO+dTyWaCtZm0ioT5xw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bG8730XsXzsxT; Mon, 09 Jun 2025 10:58:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 559AwsqH045115; Mon, 9 Jun 2025 10:58:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 559AwsV4045112; Mon, 9 Jun 2025 10:58:54 GMT (envelope-from git) Date: Mon, 9 Jun 2025 10:58:54 GMT Message-Id: <202506091058.559AwsV4045112@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 39f039512f8b - stable/13 - libpam: Additional module directory. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 39f039512f8bad0401481eacaf285b77ec5dbb70 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=39f039512f8bad0401481eacaf285b77ec5dbb70 commit 39f039512f8bad0401481eacaf285b77ec5dbb70 Author: Dag-Erling Smørgrav AuthorDate: 2025-05-31 14:26:50 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-06-07 06:50:38 +0000 libpam: Additional module directory. Many if not most ports that install PAM modules install them into ${LOCALBASE}/lib/security instead of just ${LOCALBASE}/lib, because all the world is Linux. Rather than try to fix the ports, add that directory to the search path. MFC after: 1 week Relnotes: yes Reviewed by: delphij Differential Revision: https://reviews.freebsd.org/D50626 (cherry picked from commit bb625fc2ac801d0a06ef0edab37a9bdaf209f008) --- contrib/openpam/lib/libpam/openpam_constants.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/openpam/lib/libpam/openpam_constants.c b/contrib/openpam/lib/libpam/openpam_constants.c index 52f353570c40..19179a44184a 100644 --- a/contrib/openpam/lib/libpam/openpam_constants.c +++ b/contrib/openpam/lib/libpam/openpam_constants.c @@ -178,9 +178,11 @@ const char *openpam_module_path[] = { #elif COMPAT_32BIT "/usr/lib32", "/usr/local/lib32", + "/usr/local/lib32/security", #else "/usr/lib", "/usr/local/lib", + "/usr/local/lib/security", #endif NULL };