s3: correctly detect if the current dc is the closest one

ads->config.tried_closest_dc was never set.

metze

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit dfe5b00db35e1e7c7bb3ba36729fc3f97eb48db3)

diff --git a/source/include/ads.h b/source/include/ads.h
index 24884f5e18566c059006c94185f38c0eb6271c1c..1f4cc7a2aff7afee8880e95e3ab77e7ece3fe016 100644 (file)
--- a/source/include/ads.h
+++ b/source/include/ads.h
@@ -56,7 +56,6 @@ typedef struct {
                char *server_site_name;
                char *client_site_name;
                time_t current_time;
-               int tried_closest_dc;
        } config;
 } ADS_STRUCT;
 

diff --git a/source/utils/net_ads.c b/source/utils/net_ads.c
index d6a52b833ab35b9a0b6cfa152c9292c2d7db4112..f0ffe342c99c6138c50278da4d082359ff923075 100644 (file)
--- a/source/utils/net_ads.c
+++ b/source/utils/net_ads.c
@@ -306,7 +306,7 @@ retry:
 
                tried_closest_dc = True; /* avoid loop */
 
-               if (!ads->config.tried_closest_dc) {
+               if (!ads_closest_dc(ads)) {
 
                        namecache_delete(ads->server.realm, 0x1C);
                        namecache_delete(ads->server.workgroup, 0x1C);