diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2004-02-02 07:45:50 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2004-02-02 07:45:50 +0000 |
| commit | 1daa101516e405c2eb3dd21e41c18360f3d19a6d (patch) | |
| tree | 4d79a203ca52c087f4355ddc1da9cdf70104d4c6 | |
| parent | 19cc1a9f202551fdaca39d67d926bb77e32d085c (diff) | |
| download | samba-1daa101516e405c2eb3dd21e41c18360f3d19a6d.tar.gz samba-1daa101516e405c2eb3dd21e41c18360f3d19a6d.tar.bz2 samba-1daa101516e405c2eb3dd21e41c18360f3d19a6d.zip | |
Merge the 'use cracklib' parameter from HEAD back to 3.0
Andrew Bartlett
(This used to be commit 2202667ebb713fb5d933fcaa1c19dc761da47ccb)
| -rw-r--r-- | source3/param/loadparm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 29845a51e0..3513c5b179 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -213,6 +213,7 @@ 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; @@ -783,6 +784,7 @@ 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}, @@ -1429,6 +1431,7 @@ 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. */ @@ -1777,6 +1780,7 @@ 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) |