summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2006-03-22 21:49:38 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:59:06 -0500
commit7de4a5b135daddcbbe21ca11419491dac7c88c6c (patch)
treeec30d409e76e87b285c0578500e58f3bbf050c34 /source4
parent268a86e1764aaab318d3af3d7ff4c9860a7ac3e4 (diff)
downloadsamba-7de4a5b135daddcbbe21ca11419491dac7c88c6c.tar.gz
samba-7de4a5b135daddcbbe21ca11419491dac7c88c6c.tar.bz2
samba-7de4a5b135daddcbbe21ca11419491dac7c88c6c.zip
r14662: To allow the RPC-SAMR test to pass, we need to look for both domains
and the builtinDomain objectClasses, when trying to find domain policies. Andrew Bartlett (This used to be commit 9fc1196f0ca0235aa764d4ae770e3c31978396fa)
Diffstat (limited to 'source4')
-rw-r--r--source4/dsdb/samdb/ldb_modules/password_hash.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c
index 047cb97b35..8a5f94042a 100644
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
@@ -326,7 +326,7 @@ static int password_hash_handle(struct ldb_module *module, struct ldb_request *r
is_computer = False;
}
- domain_expression = talloc_asprintf(mem_ctx, "(&(objectSid=%s)(objectClass=domain))",
+ domain_expression = talloc_asprintf(mem_ctx, "(&(objectSid=%s)(|(objectClass=domain)(objectClass=builtinDomain)))",
ldap_encode_ndr_dom_sid(mem_ctx, domain_sid));
/* Find the user's domain, then find out the domain password