Use rpccli_netr_DsRGetDCName() in rpcclient and winbindd.

[ira/wip.git] / source3 / winbindd / winbindd_cm.c

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index dbdab65f70843aa2bc4d51c8ab7d934798204cbd..0f536cdfb8dcd35cc215c49970545e8c0183c3a2 100644 (file)
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -602,19 +602,20 @@ static bool get_dc_name_via_netlogon(struct winbindd_domain *domain,
        orig_timeout = cli_set_timeout(netlogon_pipe->cli, 35000);
 
        if (our_domain->active_directory) {
-               struct DS_DOMAIN_CONTROLLER_INFO *domain_info = NULL;
-
-               werr = rpccli_netlogon_dsr_getdcname(netlogon_pipe,
-                                                    mem_ctx,
-                                                    our_domain->dcname,
-                                                    domain->name,
-                                                    NULL,
-                                                    NULL,
-                                                    DS_RETURN_DNS_NAME,
-                                                    &domain_info);
+               struct netr_DsRGetDCNameInfo *domain_info = NULL;
+
+               result = rpccli_netr_DsRGetDCName(netlogon_pipe,
+                                                 mem_ctx,
+                                                 our_domain->dcname,
+                                                 domain->name,
+                                                 NULL,
+                                                 NULL,
+                                                 DS_RETURN_DNS_NAME,
+                                                 &domain_info,
+                                                 &werr);
                if (W_ERROR_IS_OK(werr)) {
                        tmp = talloc_strdup(
-                               mem_ctx, domain_info->domain_controller_name);
+                               mem_ctx, domain_info->dc_unc);
                        if (tmp == NULL) {
                                DEBUG(0, ("talloc_strdup failed\n"));
                                talloc_destroy(mem_ctx);
@@ -626,7 +627,7 @@ static bool get_dc_name_via_netlogon(struct winbindd_domain *domain,
                        }
                        if (strlen(domain->forest_name) == 0) {
                                fstrcpy(domain->forest_name,
-                                       domain_info->dns_forest_name);
+                                       domain_info->forest_name);
                        }
                }
        } else {