Author: abartlet Date: 2006-06-14 23:49:14 +0000 (Wed, 14 Jun 2006) New Revision: 16237
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16237 Log: Use an appropriate basedn for these searches, so they occour into the correct partition. Andrew Bartlett Modified: branches/SAMBA_4_0/source/kdc/hdb-ldb.c Changeset: Modified: branches/SAMBA_4_0/source/kdc/hdb-ldb.c =================================================================== --- branches/SAMBA_4_0/source/kdc/hdb-ldb.c 2006-06-14 23:47:45 UTC (rev 16236) +++ branches/SAMBA_4_0/source/kdc/hdb-ldb.c 2006-06-14 23:49:14 UTC (rev 16237) @@ -527,6 +527,7 @@ int ret; char *cross_ref_filter; struct ldb_result *cross_ref_res; + const struct ldb_dn *partitions_basedn = ldb_dn_string_compose(mem_ctx, samdb_base_dn(mem_ctx), "CN=Partitions,CN=Configuration"); cross_ref_filter = talloc_asprintf(mem_ctx, "(&(&(|(&(dnsRoot=%s)(nETBIOSName=*))(nETBIOSName=%s))(objectclass=crossRef))(ncName=*))", @@ -536,7 +537,7 @@ return ENOMEM; } - ret = ldb_search(ldb_ctx, NULL, LDB_SCOPE_SUBTREE, cross_ref_filter, realm_ref_attrs, &cross_ref_res); + ret = ldb_search(ldb_ctx, partitions_basedn, LDB_SCOPE_SUBTREE, cross_ref_filter, realm_ref_attrs, &cross_ref_res); if (ret != LDB_SUCCESS) { DEBUG(3, ("Failed to search for %s: %s\n", cross_ref_filter, ldb_errstring(ldb_ctx))); @@ -708,6 +709,7 @@ const char *realm; struct ldb_message **msg = NULL; struct ldb_message **realm_ref_msg = NULL; + const struct ldb_dn *partitions_basedn = ldb_dn_string_compose(mem_ctx, samdb_base_dn(mem_ctx), "CN=Partitions,CN=Configuration"); if (principal->name.name_string.len >= 2) { /* 'normal server' case */ int ldb_ret; @@ -740,7 +742,7 @@ } ldb_ret = gendb_search((struct ldb_context *)db->hdb_db, - mem_ctx, NULL, &realm_ref_msg, realm_ref_attrs, + mem_ctx, partitions_basedn, &realm_ref_msg, realm_ref_attrs, "ncName=%s", ldb_dn_linearize(mem_ctx, domain_dn)); if (ldb_ret != 1) {
