From bc3d68af6de8af435381c9361b3bcb113406e1a8 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 7 Jul 2006 04:55:18 +0000 Subject: r16854: Fix the RPC-SAMR-PASSWORDS test. It failed because we allocated users in the Builtin domain a SID from the global domain. Andrew Bartlett (This used to be commit 9d31b9f04721a2cac62f492f8db071aaa0aa966b) --- source4/dsdb/samdb/ldb_modules/samldb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source4/dsdb/samdb/ldb_modules') diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c index 0ac3449488..b1fcaf4f02 100644 --- a/source4/dsdb/samdb/ldb_modules/samldb.c +++ b/source4/dsdb/samdb/ldb_modules/samldb.c @@ -190,13 +190,15 @@ static struct ldb_dn *samldb_search_domain(struct ldb_module *module, TALLOC_CTX struct ldb_dn *sdn; struct ldb_result *res = NULL; int ret = 0; + const char *attrs[] = { NULL }; local_ctx = talloc_new(mem_ctx); if (local_ctx == NULL) return NULL; sdn = ldb_dn_copy(local_ctx, dn); do { - ret = ldb_search(module->ldb, sdn, LDB_SCOPE_BASE, "objectClass=domain", NULL, &res); + ret = ldb_search(module->ldb, sdn, LDB_SCOPE_BASE, + "(|(objectClass=domain)(objectClass=builtinDomain))", attrs, &res); talloc_steal(local_ctx, res); if (ret == LDB_SUCCESS && res->count == 1) break; -- cgit