summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-12-11 13:08:28 +0100
committerStefan Metzmacher <metze@samba.org>2012-12-11 13:58:56 +0100
commita5e6b05edc924bcf7859e5d6b74937ac54347a08 (patch)
treecdae5277facf442bc292a7d3739f5294b66c885d
parent914a61d9e5b7a182592f3afe60f4dad1cd342fc4 (diff)
downloadsamba-a5e6b05edc924bcf7859e5d6b74937ac54347a08.tar.gz
samba-a5e6b05edc924bcf7859e5d6b74937ac54347a08.tar.bz2
samba-a5e6b05edc924bcf7859e5d6b74937ac54347a08.zip
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>
-rw-r--r--source4/dsdb/samdb/ldb_modules/password_hash.c8
1 files changed, 1 insertions, 7 deletions
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;
}