diff options
| -rw-r--r-- | source4/cldap_server/netlogon.c | 2 | ||||
| -rw-r--r-- | source4/dsdb/samdb/cracknames.c | 2 | ||||
| -rw-r--r-- | source4/rpc_server/lsa/lsa_init.c | 2 | ||||
| -rw-r--r-- | source4/rpc_server/netlogon/dcerpc_netlogon.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/source4/cldap_server/netlogon.c b/source4/cldap_server/netlogon.c index e6a4ab373c..95fff1a8c6 100644 --- a/source4/cldap_server/netlogon.c +++ b/source4/cldap_server/netlogon.c @@ -233,7 +233,7 @@ NTSTATUS fill_netlogon_samlogon_response(struct ldb_context *sam_ctx, #if 0 /* w2k8-r2 as a sole DC does not claim this */ - if (ldb_dn_compare(ldb_get_root_basedn(sam_ctx), ldb_get_default_basedn(sam_ctx)) == 0) { + if (ldb_dn_compare(samdb_root_dn(sam_ctx), samdb_base_dn(sam_ctx)) == 0) { server_type |= DS_DNS_FOREST_ROOT; } #endif diff --git a/source4/dsdb/samdb/cracknames.c b/source4/dsdb/samdb/cracknames.c index 9430ce0a98..bce00bdb9d 100644 --- a/source4/dsdb/samdb/cracknames.c +++ b/source4/dsdb/samdb/cracknames.c @@ -817,7 +817,7 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ search_dn = samdb_result_dn(sam_ctx, mem_ctx, domain_res->msgs[0], "ncName", NULL); } else { dsdb_flags = DSDB_SEARCH_SEARCH_ALL_PARTITIONS; - search_dn = ldb_get_root_basedn(sam_ctx); + search_dn = samdb_root_dn(sam_ctx); } /* search with the 'phantom root' flag */ diff --git a/source4/rpc_server/lsa/lsa_init.c b/source4/rpc_server/lsa/lsa_init.c index 8125746fb0..1fadee07f0 100644 --- a/source4/rpc_server/lsa/lsa_init.c +++ b/source4/rpc_server/lsa/lsa_init.c @@ -56,7 +56,7 @@ NTSTATUS dcesrv_lsa_get_policy_state(struct dcesrv_call_state *dce_call, TALLOC_ /* work out the domain_dn - useful for so many calls its worth fetching here */ - state->domain_dn = ldb_get_default_basedn(state->sam_ldb); + state->domain_dn = samdb_base_dn(state->sam_ldb); if (!state->domain_dn) { return NT_STATUS_NO_MEMORY; } diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c index cdc9967c92..e337be9014 100644 --- a/source4/rpc_server/netlogon/dcerpc_netlogon.c +++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c @@ -1124,7 +1124,7 @@ static NTSTATUS fill_one_domain_info(TALLOC_CTX *mem_ctx, } else { char *p; /* TODO: we need a common function for pulling the forest */ - info->dns_forestname.string = ldb_dn_canonical_string(info, ldb_get_root_basedn(sam_ctx)); + info->dns_forestname.string = ldb_dn_canonical_string(info, samdb_root_dn(sam_ctx)); if (!info->dns_forestname.string) { return NT_STATUS_NO_SUCH_DOMAIN; } |