summaryrefslogtreecommitdiff
path: root/source3/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
commit292a51eda152f5e1885f38f3a811e956560f33f0 (patch)
tree113ecebcde11b60bdba0ab364d1d0260b01ef4f9 /source3/nsswitch
parent3d0d8f609d08a41faa8607fa374816bcde48a62e (diff)
downloadsamba-292a51eda152f5e1885f38f3a811e956560f33f0.tar.gz
samba-292a51eda152f5e1885f38f3a811e956560f33f0.tar.bz2
samba-292a51eda152f5e1885f38f3a811e956560f33f0.zip
Forward port the app-head changes for dc name cache into 3.0.
Jeremy. (This used to be commit 8bcc3116a22ce11b55a35f3363230f54bc5735fc)
Diffstat (limited to 'source3/nsswitch')
-rw-r--r--source3/nsswitch/winbindd_cm.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/source3/nsswitch/winbindd_cm.c b/source3/nsswitch/winbindd_cm.c
index 381cdaaa20..0ba9ab8266 100644
--- a/source3/nsswitch/winbindd_cm.c
+++ b/source3/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)