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) --- tdm/ConfigureChecks.cmake | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'tdm/ConfigureChecks.cmake') diff --git a/tdm/ConfigureChecks.cmake b/tdm/ConfigureChecks.cmake index 563ac6c0a..8ebba8e6d 100644 --- a/tdm/ConfigureChecks.cmake +++ b/tdm/ConfigureChecks.cmake @@ -122,18 +122,6 @@ if( WITH_XDMCP ) endif() -if( WITH_PAM ) - - set( USE_PAM 1 CACHE INTERNAL "" FORCE ) - -elseif( WITH_SHADOW ) - - set( HAVE_SHADOW 1 CACHE INTERNAL "" FORCE ) - set( USESHADOW 1 CACHE INTERNAL "" FORCE ) - -endif( ) - - # If a tdm.service file is wanted, find systemd, then work out which # distribution is running, select an appropriate template and create the file. # When it is not possible to identify the distribution or there is no specific -- cgit v1.2.1