diff options
| author | Tim Potter <tpot@samba.org> | 2001-11-29 05:50:32 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2001-11-29 05:50:32 +0000 |
| commit | ff27a326f17223cba12b7e0b41ec84aad8238385 (patch) | |
| tree | d1374839939104a08f1f309cab2004e223b9656c /source3/nsswitch | |
| parent | 5bfc7214afb23984acc7aba9fd7a57eec7c18d6d (diff) | |
| download | samba-ff27a326f17223cba12b7e0b41ec84aad8238385.tar.gz samba-ff27a326f17223cba12b7e0b41ec84aad8238385.tar.bz2 samba-ff27a326f17223cba12b7e0b41ec84aad8238385.zip | |
I think the lookup_pdc_name() should be called lookup_dc_name() and the
name_status_find() call here should look up a #1c name instead of #1d.
This fixes some bugs currently with BDC authentication in winbindd and in
smbd as you can't query the #1d name with the ip address of a BDC.
Who is Uncle Tom Cobbley anyway?
(This used to be commit 4215048f7b20a8f9e5877bdbb2f54841b2f7fa64)
Diffstat (limited to 'source3/nsswitch')
| -rw-r--r-- | source3/nsswitch/winbindd_cm.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/source3/nsswitch/winbindd_cm.c b/source3/nsswitch/winbindd_cm.c index db5c51404a..f11d86d4c1 100644 --- a/source3/nsswitch/winbindd_cm.c +++ b/source3/nsswitch/winbindd_cm.c @@ -92,7 +92,6 @@ static BOOL cm_get_dc_name(char *domain, fstring srv_name) static struct get_dc_name_cache *get_dc_name_cache; struct get_dc_name_cache *dcc; struct in_addr *ip_list, dc_ip; - extern pstring global_myname; int count, i; /* Check the cache for previous lookups */ @@ -144,8 +143,10 @@ static BOOL cm_get_dc_name(char *domain, fstring srv_name) /* Lookup domain controller name */ - if (!get_dc_list(False, domain, &ip_list, &count)) + if (!get_dc_list(False, domain, &ip_list, &count)) { + DEBUG(3, ("Could not look up dc's for domain %s\n", domain)); return False; + } /* Firstly choose a PDC/BDC who has the same network address as any of our interfaces. */ @@ -155,7 +156,10 @@ static BOOL cm_get_dc_name(char *domain, fstring srv_name) goto got_ip; } - if (count == 0) return False; + if (count == 0) { + DEBUG(3, ("No domain controllers for domain %s\n", domain)); + return False; + } i = (sys_random() % count); @@ -163,8 +167,13 @@ static BOOL cm_get_dc_name(char *domain, fstring srv_name) dc_ip = ip_list[i]; SAFE_FREE(ip_list); - if (!lookup_pdc_name(global_myname, domain, &dc_ip, srv_name)) + /* We really should be doing a GETDC call here rather than a node + status lookup. */ + + if (!name_status_find(domain, 0x1c, 0x20, dc_ip, srv_name)) { + DEBUG(3, ("Error looking up DC name for %s in domain %s\n", inet_ntoa(dc_ip), domain)); return False; + } /* We have a name so make the cache entry positive now */ |