diff options
| author | Stefan Metzmacher <metze@samba.org> | 2008-10-22 10:36:21 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-12-13 11:42:22 +0100 |
| commit | 588f5aae669910fee6da7f807f330163496b4170 (patch) | |
| tree | 70511e59e62efe9077a1d4a30b63e80fddfca49c | |
| parent | 627c844a13caf869ae3c68ec780a8eded7cb181d (diff) | |
| download | samba-588f5aae669910fee6da7f807f330163496b4170.tar.gz samba-588f5aae669910fee6da7f807f330163496b4170.tar.bz2 samba-588f5aae669910fee6da7f807f330163496b4170.zip | |
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)
| -rw-r--r-- | source3/include/ads.h | 1 | ||||
| -rw-r--r-- | source3/libads/ndr.c | 1 | ||||
| -rw-r--r-- | source3/utils/net_ads.c | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/source3/include/ads.h b/source3/include/ads.h index b72d250940..abff9eaa8c 100644 --- a/source3/include/ads.h +++ b/source3/include/ads.h @@ -80,7 +80,6 @@ typedef struct ads_struct { char *server_site_name; char *client_site_name; time_t current_time; - int tried_closest_dc; char *schema_path; char *config_path; } config; diff --git a/source3/libads/ndr.c b/source3/libads/ndr.c index 6324a22041..6ada66ca40 100644 --- a/source3/libads/ndr.c +++ b/source3/libads/ndr.c @@ -75,7 +75,6 @@ void ndr_print_ads_struct(struct ndr_print *ndr, const char *name, const struct ndr_print_string(ndr, "server_site_name", r->config.server_site_name); ndr_print_string(ndr, "client_site_name", r->config.client_site_name); ndr_print_time_t(ndr, "current_time", r->config.current_time); - ndr_print_bool(ndr, "tried_closest_dc", r->config.tried_closest_dc); ndr_print_string(ndr, "schema_path", r->config.schema_path); ndr_print_string(ndr, "config_path", r->config.config_path); ndr->depth--; diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c index b03fefe14a..27d534665c 100644 --- a/source3/utils/net_ads.c +++ b/source3/utils/net_ads.c @@ -293,7 +293,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); |