diff options
| author | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-04-13 08:41:10 +0200 |
|---|---|---|
| committer | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-04-13 08:55:15 +0200 |
| commit | ad9e4073574125b01b3992081be9b2a4d6852cbf (patch) | |
| tree | 4bde84e3f1962d64200366a1ddb3d7bcef6e42c8 /source4/rpc_server/netlogon | |
| parent | 8e4c34880a11b2b8a7b5fbb228c26301865a4b4d (diff) | |
| download | samba-ad9e4073574125b01b3992081be9b2a4d6852cbf.tar.gz samba-ad9e4073574125b01b3992081be9b2a4d6852cbf.tar.bz2 samba-ad9e4073574125b01b3992081be9b2a4d6852cbf.zip | |
Revert "s4:prefer "samdb_*_dn" basedn calls over the "ldb_get_*_dn" functions"
We should use the "ldb_get_*_basedn" calls since they are available in the LDB
library.
Diffstat (limited to 'source4/rpc_server/netlogon')
| -rw-r--r-- | source4/rpc_server/netlogon/dcerpc_netlogon.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c index bb9d6b8399..3fa5c69aea 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, samdb_root_dn(sam_ctx)); + info->dns_forestname.string = ldb_dn_canonical_string(info, ldb_get_root_basedn(sam_ctx)); if (!info->dns_forestname.string) { return NT_STATUS_NO_SUCH_DOMAIN; } @@ -1236,7 +1236,8 @@ static NTSTATUS dcesrv_netr_LogonGetDomainInfo(struct dcesrv_call_state *dce_cal * Check that the DNS hostname when it should be updated * will be used only by maximum one host. */ - ret = gendb_search(sam_ctx, mem_ctx, samdb_base_dn(sam_ctx), + ret = gendb_search(sam_ctx, mem_ctx, + ldb_get_default_basedn(sam_ctx), &res0, attrs3, "(dNSHostName=%s)", r->in.query->workstation_info->dns_hostname); if (ret < 0) { @@ -1349,7 +1350,7 @@ static NTSTATUS dcesrv_netr_LogonGetDomainInfo(struct dcesrv_call_state *dce_cal primary domain is also a "trusted" domain, so we need to put the primary domain into the lists of returned trusts as well. */ - ret = gendb_search_dn(sam_ctx, mem_ctx, samdb_base_dn(sam_ctx), + ret = gendb_search_dn(sam_ctx, mem_ctx, ldb_get_default_basedn(sam_ctx), &res2, attrs); if (ret != 1) { return NT_STATUS_INTERNAL_DB_CORRUPTION; |