From 335b10ef10f9825ad52501c77bc6b77cdad39067 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Mon, 19 Apr 2004 17:05:31 +0000 Subject: [PATCH] r283: removing --with-cracklib after discussion with abartklet @ sambaXP (This used to be commit df94b0471eb0628aa27f534134d60b62ed123688) --- source3/configure.in | 57 ------------------------------------------------ source3/param/loadparm.c | 4 ---- source3/smbd/chgpasswd.c | 47 --------------------------------------- source3/tests/crack.c | 12 ---------- 4 files changed, 120 deletions(-) delete mode 100644 source3/tests/crack.c diff --git a/source3/configure.in b/source3/configure.in index c19a9361b22..a03b37dd77b 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -3000,63 +3000,6 @@ fi fi -dictpath="/usr/lib/cracklib_dict" -with_cracklib=yes -############################################### -# 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 diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index edd1bc0be78..e47fc3ebad8 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -214,7 +214,6 @@ typedef struct int change_notify_timeout; int map_to_guest; int min_passwd_length; - BOOL use_cracklib; int oplock_break_wait_time; int winbind_cache_time; int iLockSpinCount; @@ -790,7 +789,6 @@ static struct parm_struct parm_table[] = { {"hosts equiv", P_STRING, P_GLOBAL, &Globals.szHostsEquiv, NULL, NULL, FLAG_ADVANCED}, {"min passwd length", P_INTEGER, P_GLOBAL, &Globals.min_passwd_length, NULL, NULL, FLAG_ADVANCED}, {"min password length", P_INTEGER, P_GLOBAL, &Globals.min_passwd_length, NULL, NULL, FLAG_ADVANCED}, - {"use cracklib", P_BOOL, P_GLOBAL, &Globals.use_cracklib, NULL, NULL, FLAG_ADVANCED}, {"map to guest", P_ENUM, P_GLOBAL, &Globals.map_to_guest, NULL, enum_map_to_guest, FLAG_ADVANCED}, {"null passwords", P_BOOL, P_GLOBAL, &Globals.bNullPasswords, NULL, NULL, FLAG_ADVANCED}, {"obey pam restrictions", P_BOOL, P_GLOBAL, &Globals.bObeyPamRestrictions, NULL, NULL, FLAG_ADVANCED}, @@ -1437,7 +1435,6 @@ static void init_globals(void) Globals.map_to_guest = 0; /* By Default, "Never" */ Globals.min_passwd_length = MINPASSWDLENGTH; /* By Default, 5. */ - Globals.use_cracklib = False; Globals.oplock_break_wait_time = 0; /* By Default, 0 msecs. */ Globals.enhanced_browsing = True; Globals.iLockSpinCount = 3; /* Try 3 times. */ @@ -1787,7 +1784,6 @@ FN_GLOBAL_INTEGER(lp_machine_password_timeout, &Globals.machine_password_timeout FN_GLOBAL_INTEGER(lp_change_notify_timeout, &Globals.change_notify_timeout) FN_GLOBAL_INTEGER(lp_map_to_guest, &Globals.map_to_guest) FN_GLOBAL_INTEGER(lp_min_passwd_length, &Globals.min_passwd_length) -FN_GLOBAL_BOOL(lp_use_cracklib, &Globals.use_cracklib) FN_GLOBAL_INTEGER(lp_oplock_break_wait_time, &Globals.oplock_break_wait_time) FN_GLOBAL_INTEGER(lp_lock_spin_count, &Globals.iLockSpinCount) FN_GLOBAL_INTEGER(lp_lock_sleep_time, &Globals.iLockSpinTime) diff --git a/source3/smbd/chgpasswd.c b/source3/smbd/chgpasswd.c index d928445d94e..ca13a167fb0 100644 --- a/source3/smbd/chgpasswd.c +++ b/source3/smbd/chgpasswd.c @@ -48,16 +48,6 @@ #include "includes.h" -#ifdef HAVE_WORKING_CRACKLIB -#include - -#ifndef HAVE_CRACKLIB_DICTPATH -#ifndef CRACKLIB_DICTPATH -#define CRACKLIB_DICTPATH SAMBA_CRACKLIB_DICTPATH -#endif -#endif -#endif - extern struct passdb_ops pdb_ops; static NTSTATUS check_oem_password(const char *user, @@ -985,43 +975,6 @@ NTSTATUS change_oem_password(SAM_ACCOUNT *hnd, char *old_passwd, char *new_passw DEBUG(1, ("check_oem_password: Username does not exist in system !?!\n")); } -#ifdef HAVE_WORKING_CRACKLIB - if (pass) { - /* if we can, become the user to overcome internal cracklib sillyness */ - if (!push_sec_ctx()) - return NT_STATUS_UNSUCCESSFUL; - - set_sec_ctx(pass->pw_uid, pass->pw_gid, 0, NULL, NULL); - set_re_uid(); - } - - if (lp_use_cracklib()) { - const char *crack_check_reason; - DEBUG(4, ("change_oem_password: Checking password for user [%s]" - " against cracklib. \n", pdb_get_username(hnd))); - DEBUGADD(4, ("If this is your last message, then something is " - "wrong with cracklib, it might be missing it's " - "dictionaries at %s\n", - CRACKLIB_DICTPATH)); - dbgflush(); - - crack_check_reason = FascistCheck(new_passwd, (char *)CRACKLIB_DICTPATH); - if (crack_check_reason) { - DEBUG(1, ("Password Change: user [%s], " - "New password failed cracklib test - %s\n", - pdb_get_username(hnd), crack_check_reason)); - - /* get back to where we should be */ - if (pass) - pop_sec_ctx(); - return NT_STATUS_PASSWORD_RESTRICTION; - } - } - - if (pass) - pop_sec_ctx(); -#endif - /* * If unix password sync was requested, attempt to change * the /etc/passwd database first. Return failure if this cannot diff --git a/source3/tests/crack.c b/source3/tests/crack.c deleted file mode 100644 index 36119b3bbc6..00000000000 --- a/source3/tests/crack.c +++ /dev/null @@ -1,12 +0,0 @@ -#include - -#ifndef HAVE_CRACKLIB_DICTPATH -#ifndef CRACKLIB_DICTPATH -#define CRACKLIB_DICTPATH SAMBA_CRACKLIB_DICTPATH -#endif -#endif - -int main(int argc, char **argv) { - FascistCheck("Foo", CRACKLIB_DICTPATH); - return 0; -} -- 2.11.4.GIT