fixes

wb-ndr: remove unused WINBINDD_DUAL_DSGETDCNAME support

metze

Conflicts:

	source/winbindd/winbindd_locator.c

diff --git a/source/winbindd/winbindd_locator.c b/source/winbindd/winbindd_locator.c
index 340c942b1845388f090869686f3db3f444f5ec97..25314c16588050a60b51dab1948d11edabffa7dc 100644 (file)
--- a/source/winbindd/winbindd_locator.c
+++ b/source/winbindd/winbindd_locator.c
@@ -132,7 +132,7 @@ static void ndr_child_get_dc_info_comapt_ds(struct winbindd_domain *domain,
                                            struct winbind_get_dc_info *r)
 {
        NTSTATUS result;
-       struct DS_DOMAIN_CONTROLLER_INFO *info = NULL;
+       struct netr_DsRGetDCNameInfo *info = NULL;
        const char *dc = NULL;
 
        DEBUG(3, ("dsgetdcname for '%s'\n", r->in.domain_name));
@@ -145,15 +145,15 @@ static void ndr_child_get_dc_info_comapt_ds(struct winbindd_domain *domain,
                return;
        }
 
-       if (info->domain_controller_address) {
-               dc = info->domain_controller_address;
+       if (info->dc_address) {
+               dc = info->dc_address;
                if ((dc[0] == '\\') && (dc[1] == '\\')) {
                        dc += 2;
                }
        }
 
-       if ((!dc || !is_ipaddress_v4(dc)) && info->domain_controller_name) {
-               dc = info->domain_controller_name;
+       if ((!dc || !is_ipaddress_v4(dc)) && info->dc_unc) {
+               dc = info->dc_unc;
        }
 
        if (!dc || !*dc) {