summaryrefslogtreecommitdiff
path: root/source4/dsdb
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2006-07-07 04:55:18 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:09:54 -0500
commitbc3d68af6de8af435381c9361b3bcb113406e1a8 (patch)
treef746209c6bcd31db6ad6eac494c49c9fad8b288b /source4/dsdb
parentf596c0a4ec34a52946e28a0fd7134ae768c06acc (diff)
downloadsamba-bc3d68af6de8af435381c9361b3bcb113406e1a8.tar.gz
samba-bc3d68af6de8af435381c9361b3bcb113406e1a8.tar.bz2
samba-bc3d68af6de8af435381c9361b3bcb113406e1a8.zip
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)
Diffstat (limited to 'source4/dsdb')
-rw-r--r--source4/dsdb/samdb/ldb_modules/samldb.c4
1 files changed, 3 insertions, 1 deletions
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;