Remove libcrack support

Signed-off-by: Alejandro Colomar <alx@kernel.org>

diff --git a/configure.ac b/configure.ac
index 5c8c77647e64a52a2100dafb8086db2901fbe576..c2b0a1a571c3e0e11d8d62d016a36d08e84c5f62 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -243,9 +243,6 @@ AC_ARG_WITH(skey,
 AC_ARG_WITH(tcb,
        [AS_HELP_STRING([--with-tcb], [use tcb support (incomplete) @<:@default=yes if found@:>@])],
        [with_tcb=$withval], [with_tcb=maybe])
-AC_ARG_WITH(libcrack,
-       [AS_HELP_STRING([--with-libcrack], [use libcrack @<:@default=no@:>@])],
-       [with_libcrack=$withval], [with_libcrack=no])
 AC_ARG_WITH(sha-crypt,
        [AS_HELP_STRING([--with-sha-crypt], [allow the SHA256 and SHA512 password encryption algorithms @<:@default=yes@:>@])],
        [with_sha_crypt=$withval], [with_sha_crypt=yes])
@@ -521,13 +518,6 @@ if test "$with_audit" != "no"; then
        fi
 fi
 
-AC_SUBST(LIBCRACK)
-if test "$with_libcrack" = "yes"; then
-       echo "checking cracklib flavour, don't be surprised by the results"
-       AC_CHECK_LIB(crack, FascistCheck,
-               [LIBCRACK=-lcrack AC_DEFINE(HAVE_LIBCRACK, 1, [Defined if you have libcrack.])])
-fi
-
 if test "$with_btrfs" != "no"; then
        AC_CHECK_HEADERS([sys/statfs.h linux/magic.h linux/btrfs_tree.h], \
                [btrfs_headers="yes"], [btrfs_headers="no"])
@@ -768,7 +758,6 @@ echo
 echo "shadow will be compiled with the following features:"
 echo
 echo " auditing support:               $with_audit"
-echo " CrackLib support:               $with_libcrack"
 echo " PAM support:                    $with_libpam"
 if test "$with_libpam" = "yes"; then
 echo " suid account management tools:  $enable_acct_tools_setuid"

diff --git a/etc/login.defs b/etc/login.defs
index 114dbcd90007405bd1f13f245455d8ddb64202d1..33622c296b26fe333671183c9c83b9cdb9093f92 100644 (file)
--- a/etc/login.defs
+++ b/etc/login.defs
@@ -227,11 +227,6 @@ PASS_WARN_AGE      7
 #
 SU_WHEEL_ONLY  no
 
-#
-# If compiled with cracklib support, sets the path to the dictionaries
-#
-CRACKLIB_DICTPATH      /var/cache/cracklib/cracklib_dict
-
 #
 # Min/max values for automatic uid selection in useradd(8)
 #

diff --git a/lib/getdef.c b/lib/getdef.c
index 977660c27d726d0ddc91cfb0610ad61dc36198ea..d64e6343c60fcf46596ab0344765f7c077b85499 100644 (file)
--- a/lib/getdef.c
+++ b/lib/getdef.c
@@ -39,7 +39,6 @@ struct itemdef {
 #define PAMDEFS                                        \
        {"CHFN_AUTH", NULL},                    \
        {"CHSH_AUTH", NULL},                    \
-       {"CRACKLIB_DICTPATH", NULL},            \
        {"ENV_HZ", NULL},                       \
        {"ENVIRON_FILE", NULL},                 \
        {"ENV_TZ", NULL},                       \

diff --git a/lib/obscure.c b/lib/obscure.c
index 4070d4e4dbd2ab694bcb9fa32ddfa8fec89c5cc1..2aece68b7db992f76504291c9d2d6180ede985ba 100644 (file)
--- a/lib/obscure.c
+++ b/lib/obscure.c
@@ -12,11 +12,6 @@
 #ident "$Id$"
 
 
-/*
- * This version of obscure.c contains modifications to support "cracklib"
- * by Alec Muffet (alec.muffett@uk.sun.com).  You must obtain the Cracklib
- * library source code for this function to operate.
- */
 #include <ctype.h>
 #include <stdio.h>
 
@@ -97,12 +92,6 @@ static /*@observer@*//*@null@*/const char *password_check (
        const char *msg = NULL;
        char *oldmono, *newmono, *wrapped;
 
-#ifdef HAVE_LIBCRACK
-       char *dictpath;
-
-       char *FascistCheck ();
-#endif
-
        if (strcmp (new, old) == 0) {
                return _("no change");
        }
@@ -121,17 +110,6 @@ static /*@observer@*//*@null@*/const char *password_check (
                msg = _("too similar");
        } else if (strstr (wrapped, newmono) != NULL) {
                msg = _("rotated");
-       } else {
-#ifdef HAVE_LIBCRACK
-               /*
-                * Invoke Alec Muffett's cracklib routines.
-                */
-
-               dictpath = getdef_str ("CRACKLIB_DICTPATH");
-               if (NULL != dictpath) {
-                       msg = FascistCheck (new, dictpath);
-               }
-#endif
        }
        strzero (newmono);
        strzero (oldmono);

diff --git a/libsubid/Makefile.am b/libsubid/Makefile.am
index 5ba0ab357274f3f0692cfa3c4188f4aa1ed935b9..b6488e779d7495612ad2c7adcfe282c99534a09e 100644 (file)
--- a/libsubid/Makefile.am
+++ b/libsubid/Makefile.am
@@ -8,7 +8,6 @@ MISCLIBS = \
        $(LIBAUDIT) \
        $(LIBSELINUX) \
        $(LIBSEMANAGE) \
-       $(LIBCRACK) \
        $(LIBCRYPT_NOPAM) \
        $(LIBSKEY) \
        $(LIBMD) \

diff --git a/share/containers/fedora.dockerfile b/share/containers/fedora.dockerfile
index 7c58f9186ffaeb4031c2fba7eadf8f99eebbdc10..85e8b4808c5cd52ffe4aa88e86942ba1256ddccd 100644 (file)
--- a/share/containers/fedora.dockerfile
+++ b/share/containers/fedora.dockerfile
@@ -10,7 +10,7 @@ WORKDIR /usr/local/src/shadow/
 
 RUN ./autogen.sh --enable-shadowgrp --enable-man --with-audit \
         --with-sha-crypt --with-bcrypt --with-yescrypt --with-selinux \
-        --without-libcrack --without-libpam --enable-shared --without-libbsd \
+        --without-libpam --enable-shared --without-libbsd \
         --with-group-name-max-length=32 --enable-lastlog --enable-logind=no
 RUN make -kj4 || true
 RUN make

diff --git a/src/Makefile.am b/src/Makefile.am
index fcfee9d2cce86016cbf4c2268140eae2c0d3d620..b6cb09ef19f2660f45410ee341f1e6eb917d270a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -123,7 +123,7 @@ login_LDADD    = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBCRYPT_NOPAM) $(LIBSKEY) $(L
 newgrp_LDADD   = $(LDADD) $(LIBAUDIT) $(LIBCRYPT) $(LIBECONF)
 newusers_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT) $(LIBECONF) -ldl
 nologin_LDADD  =
-passwd_LDADD   = $(LDADD) $(LIBPAM) $(LIBCRACK) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT_NOPAM) $(LIBECONF) -ldl
+passwd_LDADD   = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT_NOPAM) $(LIBECONF) -ldl
 pwck_LDADD     = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF)
 pwconv_LDADD   = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF)
 pwunconv_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF)