From a5e6b05edc924bcf7859e5d6b74937ac54347a08 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 11 Dec 2012 13:08:28 +0100 Subject: Revert "s4:dsdb/password_hash: Honor password complexity settings." This reverts commit f8056b7a6998e002f473b0ad79eee046236a7032. A better fix will follow. Signed-off-by: Stefan Metzmacher Reviewed-by: Michael Adam --- source4/dsdb/samdb/ldb_modules/password_hash.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'source4/dsdb/samdb') diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c index 0f8920c433..620de755d8 100644 --- 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; } -- cgit