From nobody Sun Jul 09 17:52:01 2023 X-Original-To: dev-commits-src-all@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 4QzZTG16PKz4mVbM; Sun, 9 Jul 2023 17:52:02 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzZTG03y4z3tnX; Sun, 9 Jul 2023 17:52:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925122; 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=D+YB1RpLmawJBqM3q08V8JqFo28z4OSknBHySrv89Xk=; b=JtNCBaJYqbP4G/Y7tfwp5mgXvPLDbHJZHw6FessUgZK5qtBNPwPAKZt+XrS4ToDrT4i5Fc dejeWT1BRqdued2IZFv+8krbDug0jU5U7vtUmTkG2cJF66B/+eEWJwCVaj5LkGUpLks+Jd 4VFYr/p/1o1UvE4u91l2RhmGwM2AxFyrd3aq2nvdQY8H3F3KqhNjGjbXRAMmAUUYb5azTW ZgRD/Ikh/DUNDlw8nXUbgcPS8smPI/GpHO1ROZejFNFaKOqWjaS9bAQuK7yJmn4tpoZs14 xiySd3og7ZTR/nJKN4sE4WFE7tBRYoPVYouTU4fSjfT2F5fMfiPX9wUy6AcNeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925122; 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=D+YB1RpLmawJBqM3q08V8JqFo28z4OSknBHySrv89Xk=; b=v/+sS5HdAkWLgyhv3y1Db/YMOLj8+f35ar6aVNC5oIrqxAVQDobjKNPQbdOIBpYd5Q33sZ RtfI2Il3b7ZNTvBm9VOWe/jVuzRMCwVPM97gLiMqROcbNbCczjCpFDtPa0pHrSpIF+IbLa qI4Gy3SFCbJ8710RF5OwMKTMqx9QKv28jArr/iku/JniTHMnQN3Uz/ZVF2qWVZP76omiSG DOcdcZBwPXrGd0588pyIqyW+mRLclU2IfbBNNfoPed+SwcY2tYhG95BK04CwnSgJGz08jz 5UWslN8TkjWh3kh/xxgYyDfG/JMJJC2QoX3Nw5fzhgHJVIc4ne21Sgv2E+NO9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925122; a=rsa-sha256; cv=none; b=OXWjOjygfKAouNtrKHtrbb+ZsET6oL8UIhFDGJ1H1CVjOQEgXi9ftAIbraajA/pfxLFemW /XjanD0U/p70Ml2JlfhJeTKAqgnKbNNWPgSFgdbV2Vl0DcnLvhYbrfRaC++5mFr4mZd4z7 I1ktIJku214hf3Zdwr95SjxQj8NuSyl8oPWfq6RVo41xRJl0t51diXC0OwRkwbS5w2NgIT CfCFWVS9VXHFp3eVegYXu/ZwqUwfAGmI2H9uMJ3HeAGEzbfjsmdcIl/f03JobCcqqqbhnK eUs/7UPvAkj/OGxZ7jyPTw3X0Cdp5EeqsuzcCMhE3l6cl4tS4oAha3eZhZbvQw== 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 4QzZTF6Fdkz1Bv5; Sun, 9 Jul 2023 17:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369Hq1CP098661; Sun, 9 Jul 2023 17:52:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369Hq1KK098660; Sun, 9 Jul 2023 17:52:01 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:52:01 GMT Message-Id: <202307091752.369Hq1KK098660@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 0ade2f8cf78a - main - openpam: Migrate from COMPAT_32BIT to generic COMPAT_libcompat List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ade2f8cf78a3dbf66503e032682fb2c5d0677bf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=0ade2f8cf78a3dbf66503e032682fb2c5d0677bf commit 0ade2f8cf78a3dbf66503e032682fb2c5d0677bf Author: Jessica Clarke AuthorDate: 2023-07-09 17:48:17 +0000 Commit: Jessica Clarke CommitDate: 2023-07-09 17:48:17 +0000 openpam: Migrate from COMPAT_32BIT to generic COMPAT_libcompat See commit 8fad2cda93c7 ("bsd.compat.mk: Provide new CPP and sub-make variables") for the context behind this change. Reviewed by: brooks, jhb Differential Revision: https://reviews.freebsd.org/D40923 --- contrib/openpam/lib/libpam/openpam_constants.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/openpam/lib/libpam/openpam_constants.c b/contrib/openpam/lib/libpam/openpam_constants.c index 52f353570c40..ba92b49b6865 100644 --- a/contrib/openpam/lib/libpam/openpam_constants.c +++ b/contrib/openpam/lib/libpam/openpam_constants.c @@ -175,9 +175,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", +#elif defined(COMPAT_libcompat) + "/usr/lib" COMPAT_libcompat, + "/usr/local/lib" COMPAT_libcompat, #else "/usr/lib", "/usr/local/lib",