From 1dce4ebed861a6dfbd19da20601d92bc9be3484a Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 14 Jan 2004 17:34:41 +0000 Subject: revert the cracklib changes until post 3.0.2 (This used to be commit 6202e0fa727a4307f51bf42f5ced401a7c7b8214) --- source3/configure.in | 58 ---------------------------------------------------- 1 file changed, 58 deletions(-) (limited to 'source3/configure.in') diff --git a/source3/configure.in b/source3/configure.in index 375eed06ab..7a844c337d 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -2961,64 +2961,6 @@ if test x"$samba_cv_HAVE_TRUNCATED_SALT" = x"yes"; then fi fi - -dictpath="/usr/lib/cracklib_dict" - -############################################### -# test for where we get FaciestCheck from -AC_MSG_CHECKING(where to use cracklib from (default=$dictpath)) -AC_ARG_WITH(cracklib, -[ --with-cracklib[=DIR] Look for cracklib dictionary in this location ], -[ case "$withval" in - yes) - AC_MSG_RESULT(${dictpath}) - ;; - no) - AC_MSG_RESULT(no) - dictpath="" - ;; - *) - dictpath="$withval" - AC_MSG_RESULT(${dictpath}) - ;; - esac ], - dictpath="" - AC_MSG_RESULT(no) -) - -if test x$dictpath != x""; then - AC_SEARCH_LIBS(FascistCheck, [crack], - [test "$ac_cv_search_crack" = "none required" || samba_cv_found_crack="yes" - AC_DEFINE(HAVE_CRACK,1,[Whether the system has the FaciestCheck function from cracklib])]) - - crack_saved_libs=$LIBS; - - if test x$samba_cv_found_crack=x"yes"; then - AC_SEARCH_LIBS(CRACKLIB_DICTPATH, [crypt], - AC_DEFINE(HAVE_CRACKLIB_DICTPATH, 1, [Whether we have given a CRACKLIB_DICTPATH in our headers]) - ) - - AC_DEFINE_UNQUOTED(SAMBA_CRACKLIB_DICTPATH, "$dictpath", [Where the cracklib dictionay is]) - AC_MSG_CHECKING(Whether we have a working cracklib) - AC_TRY_RUN([ - #include "${srcdir-.}/tests/crack.c"], - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_WORKING_CRACKLIB,1,[Whether we have a working cracklib]) - AUTH_LIBS="-lcrack $AUTH_LIBS", - - AC_MSG_RESULT(no) - AC_MSG_WARN(cracklib exists - but does not function correctly), - - AC_MSG_RESULT(no) - AC_MSG_WARN(cannot test-run when cross-compiling) - ) - else - AC_MSG_CHECKING(Whether we have cracklib) - AC_MSG_RESULT(no) - fi - LIBS=$crack_saved_libs -fi - ######################################################################################## ## ## TESTS FOR SAM BACKENDS. KEEP THESE GROUPED TOGETHER -- cgit