From 61357f5f74e91ac7bc1ed8c6a5b9a0da373e22c2 Mon Sep 17 00:00:00 2001 From: Bobby Bingham Date: Thu, 30 Mar 2023 21:54:25 -0500 Subject: kcheckpass: fix shadow support when not building tdm 1. If not building with PAM, kcheckpass relies on HAVE_SHADOW to decide whether to support shadow passwords. However, this was only set if also building tdm. Consolidate all PAM/shadow configure checks at the top level so these are always set correctly. 2. Consolidate /etc/passwd and shadow password handling The shadow password handler already completely handles /etc/passwd passwords as well, so having a separate handler for just /etc/passwd is pure code duplication. Signed-off-by: Bobby Bingham (cherry picked from commit 8c543e26ec35237d00ec44fadda80318c386fdde) --- kcheckpass/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kcheckpass/CMakeLists.txt') diff --git a/kcheckpass/CMakeLists.txt b/kcheckpass/CMakeLists.txt index 5e83ee41e..b2091e0ce 100644 --- a/kcheckpass/CMakeLists.txt +++ b/kcheckpass/CMakeLists.txt @@ -24,7 +24,7 @@ include_directories( tde_add_executable( kcheckpass AUTOMOC SOURCES - kcheckpass.c checkpass_etcpasswd.c checkpass_pam.c + kcheckpass.c checkpass_pam.c checkpass_shadow.c checkpass_osfc2passwd.c checkpass_aix.c LINK tdefakes-shared ${CRYPT_LIBRARY} ${PAM_LIBRARY} DESTINATION ${BIN_INSTALL_DIR} -- cgit v1.2.1