From nobody Sat May 31 12:49:08 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 4b8g0N4TyNz5x034; Sat, 31 May 2025 12:49:08 +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 4b8g0N3tKvz3xTj; Sat, 31 May 2025 12:49:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748695748; 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=o+Cn5ViBeDbKCEBXFst6hovNDG1cXUb+TlZlkP4SNGc=; b=R+0cqLHUjWz/ZhZwy5kKAAjl4k4E2/edbO8B3sAbPH3x5j4qyeh13qHUMryL0jThVWl1Or 9zFWTKH3jv1OAKoDL3CQkfr9K9a//SkzHw/Z5opkBQGLxVznEhVbNn7i/UDzSbJuujfAnV /xuIZ5D11Ejc8yKhPZg7nhlosC9kONZdYJCamLJyt2jWJ3ZhzGPX8HOJh2rF4nz1jJG8vi aTLiUud7odhIRMNVbLBF/+Wv2sgMhCLGuPTU7m6psWiMLWCx1fd3HbqIEVx099dhKG9fq2 e2jddgFlJDLWMbfGjc9jct5VVT4+/Xc9220ZvgHAvM/A780tQe96qu8JwbEq8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748695748; 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=o+Cn5ViBeDbKCEBXFst6hovNDG1cXUb+TlZlkP4SNGc=; b=PiqZsdTv+ICp5ZdKJV2Z4iwO5gQhFJUMnOAKuIXsOFeb5g/1RWSUotFJDDys16s/gdKLZe 6U4i8H96CCfE4uzAiWigTSW3zgEpdQ/gbmZD8BLEIUkf4ML2UmLlj9xQS9GvzpHChbGBSj vT9hOcr7TMZeaTbF2d4foE62z13m0bN/LPZqK6n0jm1d7hSCNdtp+jrAG7eINwH+kBrBkf UzLddMN/Dxz2CcmhZN7C3ngFMo/ULnsCQyjNWiLJNOGBwY/vBuWMDZUiSeo+KgzAdZHil0 8rEfJ/VKi2+POGFsy+jH9w9EWkSDEULHwILVWb39OCtM1IzE/CJkMzZwaXy1PA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748695748; a=rsa-sha256; cv=none; b=GDBTlfyzcBw8uAdqy2BrPh5EXnIOb+61QhIqlehCmkUUoKs7DMxlUy6oTcw1LXBiDuYxKJ SZmstSX+o4MfAkyM77GGnC+zDt9v+Fuh2JfKWJqvxVCqrtj+RDKsEuIs9peFW/dXEPIe8P C1UnzSZVj/tnADQD2Fg9bVOB1dX7bR2KLFrD9pPqsJ5hi4hOwicQU5jI9AI2112uoZqPyl YpSzG4zj/+QILk8cXi1KRrohdB9H+SQDqCXaZDllkqh3eIt+MPFUbDz6J5QyFaN7NSjWdz CWh1EWlRXpM2SY0T75yuVsUR6eh09NPXzIFA9OUpFnAZwfOjeHj1C3C8e99OWQ== 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 4b8g0N3QjkzfRl; Sat, 31 May 2025 12:49:08 +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 54VCn8na024546; Sat, 31 May 2025 12:49:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VCn83Z024543; Sat, 31 May 2025 12:49:08 GMT (envelope-from git) Date: Sat, 31 May 2025 12:49:08 GMT Message-Id: <202505311249.54VCn83Z024543@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: d00a98d639ca - main - libpam: Tweak libcompat case. 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: d00a98d639ca2e977d6f3396d7c429cb2f836c49 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d00a98d639ca2e977d6f3396d7c429cb2f836c49 commit d00a98d639ca2e977d6f3396d7c429cb2f836c49 Author: Dag-Erling Smørgrav AuthorDate: 2025-05-31 12:48:34 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-05-31 12:48:34 +0000 libpam: Tweak libcompat case. Fixes: 45538173c120 --- contrib/openpam/lib/libpam/openpam_constants.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/openpam/lib/libpam/openpam_constants.c b/contrib/openpam/lib/libpam/openpam_constants.c index 7129fc0db43b..a608cf87c7eb 100644 --- a/contrib/openpam/lib/libpam/openpam_constants.c +++ b/contrib/openpam/lib/libpam/openpam_constants.c @@ -179,7 +179,9 @@ const char *openpam_module_path[] = { OPENPAM_MODULES_DIRECTORY, #elif defined(COMPAT_libcompat) "/usr/lib" COMPAT_libcompat, - "/usr/local/lib" COMPAT_libcompat, +#ifdef LOCALBASE + LOCALBASE "/lib" COMPAT_libcompat, +#endif #else "/usr/lib", #ifdef LOCALBASE