summaryrefslogtreecommitdiffstats
path: root/source/nsswitch
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2003-06-13 21:03:15 +0000
committerJeremy Allison <jra@samba.org>2003-06-13 21:03:15 +0000
commit8bcc3116a22ce11b55a35f3363230f54bc5735fc (patch)
tree654d06e02d4b559f886c7bb3013e9668e492db17 /source/nsswitch
parent8e37c1d579ed801fd602d698174f981deff435d9 (diff)
downloadsamba-8bcc3116a22ce11b55a35f3363230f54bc5735fc.tar.gz
samba-8bcc3116a22ce11b55a35f3363230f54bc5735fc.tar.xz
samba-8bcc3116a22ce11b55a35f3363230f54bc5735fc.zip
Forward port the app-head changes for dc name cache into 3.0.
Jeremy.
Diffstat (limited to 'source/nsswitch')
-rw-r--r--source/nsswitch/winbindd_cm.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/source/nsswitch/winbindd_cm.c b/source/nsswitch/winbindd_cm.c
index 381cdaaa20f..0ba9ab82665 100644
--- a/source/nsswitch/winbindd_cm.c
+++ b/source/nsswitch/winbindd_cm.c
@@ -51,9 +51,6 @@
- I'm pretty annoyed by all the make_nmb_name() stuff. It should be
moved down into another function.
- - There needs to be a utility function in libsmb/namequery.c that does
- cm_get_dc_name()
-
- Take care when destroying cli_structs as they can be shared between
various sam handles.
@@ -132,8 +129,6 @@ static BOOL cm_ads_find_dc(const char *domain, struct in_addr *dc_ip, fstring sr
return True;
}
-
-
static BOOL cm_get_dc_name(const char *domain, fstring srv_name, struct in_addr *ip_out)
{
static struct get_dc_name_cache *get_dc_name_cache;
@@ -196,7 +191,7 @@ static BOOL cm_get_dc_name(const char *domain, fstring srv_name, struct in_addr
if (!ret) {
/* fall back on rpc methods if the ADS methods fail */
- ret = rpc_find_dc(domain, srv_name, &dc_ip);
+ ret = get_dc_name(domain, srv_name, &dc_ip);
}
if (!ret)