From nobody Sat May 31 14:27:24 2025 X-Original-To: dev-commits-src-main@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 4b8j9m4jf3z5x6Gm; Sat, 31 May 2025 14:27:24 +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 4b8j9m4CXxz4101; Sat, 31 May 2025 14:27:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748701644; 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=D2GvnSZ1wymcgwKHcUCW3dmpCIS1/vyeVX2ygEgBu/I=; b=jhZOZf48OWMO5L6d3eFCCZOmCUwntbbawIr2bZ/lpbVsHP1XrX+k5qw0uJmiZ/SCfQFvLo gm87TEgCkx78uzepLTCmjxQQZpu+JNL8Boy6FYGuDqJscSIR4Vhuzz/k6wW8RtD7BN46GM a831cdR+nbz2dbWiY1bAUjLJwPnmv1R+/0UfQdvlZVkJsyEq0NKb8oF1Dc00NBBIPEJGs0 b75kVbbtSUdHHFDkRk/n0YBQFnQInEVPn6ZOyFEq7Qf/FW0fEdaQbYQFNv358gmWP5+eq1 2b0bYI4DSb9yAv38ygHyrPYohe+n8jpSMJ9GYMPXAYT5UJ7EW9L2zTsFA8PubA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748701644; 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=D2GvnSZ1wymcgwKHcUCW3dmpCIS1/vyeVX2ygEgBu/I=; b=LQezz9KMVnY9t4NkZPUqtUFyvRgPgF0SDmF2ZIYAB1vtXYjZkACPwdQiyjBuU40BxbE8wS T/ZH0fhUf0v3nXnjV3Yjue375AIc+ibdHjMp2L8O79sqYY2gs7k1WgCy7+SMQIRXfMWAWl srVciSE1dGtRdXkiw3QQW6bGKfhpTaLZSLT7q1hbWHeqRaZ/sxtLmGpe/x/DDMnz8IFdbH nURBMGyp/gFVUVvGdmiFI/Ni1M4BQC1UsksfCSuPiSnXbvGrV8KUuy62tdNEtjpkEuWTTp 3AIEJzPzFLWtwOpiEJpp/tyXQsYPWPEp/Om1fpXxpJ6qdDJ99hZ2OPeqqWFhrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748701644; a=rsa-sha256; cv=none; b=ddBZHTpXK2son3Qfp7XuOwXpxvX1eO0EaQ1CW5YHmM062CJYn/WqhmUrtemDuwVfWUfEHw NmNBKZmZzHRaSNMY+ZsaIuiqGpkIejcHmmKN9J5yfS8W3/86kzXe3Q61jUd3T9QF+MUiQ/ at2LiS/V+IrcEkZ8ZCe90eUQhycbLaFy6BkIWoTzMsJ+n4QfeOcrh9Fh96aoSYnpKke7dW WqU5UTsxFKpsckLudM+0IH2Y1WmOYPt39fxlrao/tXWesNYgLbPGDJR1UVKEDHheOudrDA jNuRi7lNJ7rMLylnlPmYNWN5cDOFua/Zc8u6F6QbpAnMivuULI1AVA3zHBM78A== 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 4b8j9m3mwnzj14; Sat, 31 May 2025 14:27:24 +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 54VEROc4011290; Sat, 31 May 2025 14:27:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VEROih011287; Sat, 31 May 2025 14:27:24 GMT (envelope-from git) Date: Sat, 31 May 2025 14:27:24 GMT Message-Id: <202505311427.54VEROih011287@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: bb625fc2ac80 - main - libpam: Additional module directory. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: bb625fc2ac801d0a06ef0edab37a9bdaf209f008 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=bb625fc2ac801d0a06ef0edab37a9bdaf209f008 commit bb625fc2ac801d0a06ef0edab37a9bdaf209f008 Author: Dag-Erling Smørgrav AuthorDate: 2025-05-31 14:26:50 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-05-31 14:27:17 +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 --- 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 a608cf87c7eb..b34364b13888 100644 --- a/contrib/openpam/lib/libpam/openpam_constants.c +++ b/contrib/openpam/lib/libpam/openpam_constants.c @@ -181,11 +181,13 @@ const char *openpam_module_path[] = { "/usr/lib" COMPAT_libcompat, #ifdef LOCALBASE LOCALBASE "/lib" COMPAT_libcompat, + LOCALBASE "/lib" COMPAT_libcompat "/security", #endif #else "/usr/lib", #ifdef LOCALBASE LOCALBASE "/lib", + LOCALBASE "/lib/security", #endif #endif NULL