git: 0ade2f8cf78a - main - openpam: Migrate from COMPAT_32BIT to generic COMPAT_libcompat
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 09 Jul 2023 17:52:01 UTC
The branch main has been updated by jrtc27:
URL: https://cgit.FreeBSD.org/src/commit/?id=0ade2f8cf78a3dbf66503e032682fb2c5d0677bf
commit 0ade2f8cf78a3dbf66503e032682fb2c5d0677bf
Author: Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2023-07-09 17:48:17 +0000
Commit: Jessica Clarke <jrtc27@FreeBSD.org>
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",