Revert "s4:dsdb/password_hash: Honor password complexity settings."

This reverts commit f8056b7a6998e002f473b0ad79eee046236a7032.

A better fix will follow.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c
index 0f8920c433399f0d9d68134b2961953fc3c16418..620de755d88e2d33a998b08a9111e2fef0b955b7 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
@@ -2188,14 +2188,8 @@ static int setup_io(struct ph_context *ac,
                & (UF_INTERDOMAIN_TRUST_ACCOUNT | UF_WORKSTATION_TRUST_ACCOUNT
                        | UF_SERVER_TRUST_ACCOUNT));
 
-       if (!ldb_req_is_untrusted(ac->req) &&
-           (io->u.userAccountControl & UF_PASSWD_NOTREQD))
-       {
+       if ((io->u.userAccountControl & UF_PASSWD_NOTREQD) != 0) {
                /* see [MS-ADTS] 2.2.15 */
-               /*
-                * This seems to only happen for SAMR
-                * and not for LDAP clients
-                */
                io->u.restrictions = 0;
        }