From f9c2096c0be797cd04a47c241656f9b9cc933ae4 Mon Sep 17 00:00:00 2001 From: Chris Hofstaedtler Date: Mon, 24 Feb 2025 22:50:01 +0100 Subject: [PATCH] configure.ac: be deterministic about passwd location Statically set PASSWD_PROGRAM depending on exec_prefix, and not by where the passwd program was at configure time. Depending on the specific build situation before, this may or may not change the embedded passwd program path. Also configure.ac sets exec_prefix=/ for prefix=/usr, so this might be a bit confusing, but at least deterministic. Closes: #1224 Signed-off-by: Chris Hofstaedtler --- configure.ac | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 403f3abc7..d5e902906 100644 --- a/configure.ac +++ b/configure.ac @@ -103,13 +103,7 @@ AC_DEFINE_UNQUOTED(LASTLOG_FILE, "$shadow_cv_logdir/lastlog", AC_DEFINE_UNQUOTED(FAILLOG_FILE, "$shadow_cv_logdir/faillog", [Path for faillog file.]) -AC_CACHE_CHECK([location of the passwd program], shadow_cv_passwd_dir, -[if test -f /usr/bin/passwd; then - shadow_cv_passwd_dir=/usr/bin -else - shadow_cv_passwd_dir=/bin -fi]) -AC_DEFINE_UNQUOTED(PASSWD_PROGRAM, "$shadow_cv_passwd_dir/passwd", +AC_DEFINE_UNQUOTED(PASSWD_PROGRAM, "$exec_prefix/bin/passwd", [Path to passwd program.]) AC_ARG_ENABLE(shadowgrp, -- 2.47.2