diff options
-rw-r--r-- | NEWS | 5 | ||||
-rwxr-xr-x | ci/run-build-and-tests.sh | 2 | ||||
-rw-r--r-- | configure.ac | 38 |
3 files changed, 31 insertions, 14 deletions
@@ -44,6 +44,11 @@ Release 1.4.0 * Added new API call pam_start_confdir() for special applications that cannot use the system-default PAM configuration paths and need to explicitly specify another path +* Deprecated pam_cracklib: this module is no longer built by default and will + be removed in the next release, use pam_passwdqc (from passwdqc project) + or pam_pwquality (from libpwquality project) instead +* Deprecated pam_tally and pam_tally2: these modules are no longer built + by default and will be removed in the next release, use pam_faillock instead Release 1.3.1 * pam_motd: add support for a motd.d directory diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh index 070fc72a..a16282ca 100755 --- a/ci/run-build-and-tests.sh +++ b/ci/run-build-and-tests.sh @@ -5,7 +5,7 @@ # # SPDX-License-Identifier: GPL-2.0-or-later -DISTCHECK_CONFIGURE_FLAGS='--disable-dependency-tracking --enable-Werror' +DISTCHECK_CONFIGURE_FLAGS='--disable-dependency-tracking --enable-Werror --enable-tally --enable-tally2 --enable-cracklib=check' export DISTCHECK_CONFIGURE_FLAGS case "${TARGET-}" in diff --git a/configure.ac b/configure.ac index b8687c88..ea08a7a3 100644 --- a/configure.ac +++ b/configure.ac @@ -375,16 +375,26 @@ case "$ac_cv_search_dlopen" in esac AC_SUBST(LIBDL) -# Check for cracklib AC_ARG_ENABLE([cracklib], - AS_HELP_STRING([--disable-cracklib],[do not use cracklib]), - WITH_CRACKLIB=$enableval, WITH_CRACKLIB=yes) -if test x"$WITH_CRACKLIB" != xno ; then - AC_CHECK_HEADERS([crack.h], - AC_CHECK_LIB([crack], [FascistCheck], LIBCRACK="-lcrack", LIBCRACK="")) -else - LIBCRACK="" -fi + [AS_HELP_STRING([--enable-cracklib], + [build deprecated pam_cracklib module])], + [], [enable_cracklib=no]) +LIBCRACK="" +case "$enable_cracklib" in + no) ;; + yes|check) + dnl Check for cracklib + AC_CHECK_HEADERS([crack.h], + [AC_CHECK_LIB([crack], [FascistCheck], + [LIBCRACK="-lcrack"])]) + if test -z "$LIBCRACK"; then + if test "$enable_cracklib" = yes; then + AC_MSG_FAILURE([failed to find cracklib]) + fi + fi + ;; + *) AC_MSG_ERROR([bad value $enable_cracklib for --enable-cracklib option]) ;; +esac AC_SUBST(LIBCRACK) dnl Look for Linux Auditing library - see documentation @@ -666,16 +676,18 @@ fi AC_DEFINE_UNQUOTED(PAM_USERTYPE_OVERFLOW_UID, $opt_kerneloverflowuid, [Kernel overflow uid.]) AC_ARG_ENABLE([tally], - [AS_HELP_STRING([--disable-tally], [do not build pam_tally module])], - [], [enable_tally=yes]) + [AS_HELP_STRING([--enable-tally], + [build deprecated pam_tally module])], + [], [enable_tally=no]) case "$enable_tally" in yes|no) ;; *) AC_MSG_ERROR([bad value $enable_tally for --enable-tally option]) ;; esac AC_ARG_ENABLE([tally2], - [AS_HELP_STRING([--disable-tally2], [do not build pam_tally2 module])], - [], [enable_tally2=yes]) + [AS_HELP_STRING([--enable-tally2], + [build deprecated pam_tally2 module])], + [], [enable_tally2=no]) case "$enable_tally2" in yes|no) ;; *) AC_MSG_ERROR([bad value $enable_tally2 for --enable-tally2 option]) ;; |