From 200ff9c1e930249a0ab1dea4a8b1b92ef614aa6e Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 14 Jul 2005 08:02:10 +0000 Subject: r8454: Fix Bug #2502 Removing deprecated lp_min_password_length (the same functionality is provided by the account policy). Note that we now allow to set passwords less then 5 chars (if the admins decides to do so by setting the account policy). Thanks to Daniel Beschorner Guenther (This used to be commit fd91378925f7e3541df4f31bd461dabc1da523a9) --- source3/smbd/chgpasswd.c | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'source3/smbd') diff --git a/source3/smbd/chgpasswd.c b/source3/smbd/chgpasswd.c index 56e5727b7d..f445ca3365 100644 --- a/source3/smbd/chgpasswd.c +++ b/source3/smbd/chgpasswd.c @@ -1017,7 +1017,6 @@ NTSTATUS change_oem_password(SAM_ACCOUNT *hnd, char *old_passwd, char *new_passw return NT_STATUS_ACCOUNT_RESTRICTION; } - /* FIXME: AP_MIN_PASSWORD_LEN and lp_min_passwd_length() need to be merged - gd */ if (account_policy_get(AP_MIN_PASSWORD_LEN, &min_len) && (str_charnum(new_passwd) < min_len)) { DEBUG(1, ("user %s cannot change password - password too short\n", username)); @@ -1026,16 +1025,6 @@ NTSTATUS change_oem_password(SAM_ACCOUNT *hnd, char *old_passwd, char *new_passw /* return NT_STATUS_PWD_TOO_SHORT; */ } - /* Take the passed information and test it for minimum criteria */ - /* Minimum password length */ - if (str_charnum(new_passwd) < lp_min_passwd_length()) { - /* too short, must be at least MINPASSWDLENGTH */ - DEBUG(1, ("Password Change: user %s, New password is shorter than minimum password length = %d\n", - username, lp_min_passwd_length())); - return NT_STATUS_PASSWORD_RESTRICTION; -/* return NT_STATUS_PWD_TOO_SHORT; */ - } - if (check_passwd_history(hnd,new_passwd)) { return NT_STATUS_PASSWORD_RESTRICTION; } -- cgit