Author: abartlet Date: 2006-07-07 04:55:18 +0000 (Fri, 07 Jul 2006) New Revision: 16854
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16854 Log: Fix the RPC-SAMR-PASSWORDS test. It failed because we allocated users in the Builtin domain a SID from the global domain. Andrew Bartlett Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samldb.c Changeset: Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samldb.c =================================================================== --- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samldb.c 2006-07-07 03:45:02 UTC (rev 16853) +++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samldb.c 2006-07-07 04:55:18 UTC (rev 16854) @@ -190,13 +190,15 @@ 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;
