sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-28 17:47:29 +03:00
Code

Fix memory leak in getting DC list. Remember to exclude failed lookups.

Browse Source 
Jeremy.
(This used to be commit c4fcbb2948beb3b6594d53a7ffdc8b94fd0d94e0)
This commit is contained in:
Jeremy Allison 2002-09-30 23:16:42 +00:00
parent 8ea9c80a6e
commit d2c0dca984
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source3/nsswitch/winbindd_cm.c
View File

@ -140,16 +140,23 @@ static BOOL cm_ads_find_dc(const char *domain, struct in_addr *dc_ip, fstring sr
*/
static BOOL cm_rpc_find_dc(const char *domain, struct in_addr *dc_ip, fstring srv_name)
{
struct in_addr *ip_list = NULL;
struct in_addr *ip_list = NULL, exclude_ip;
int count, i;
zero_ip(&exclude_ip);
/* Lookup domain controller name. Try the real PDC first to avoid
SAM sync delays */
if (get_dc_list(True, domain, &ip_list, &count) &&
name_status_find(domain, 0x1c, 0x20, ip_list[0], srv_name)) {
*dc_ip = ip_list[0];
if (get_dc_list(True, domain, &ip_list, &count)) {
if (name_status_find(domain, 0x1c, 0x20, ip_list[0], srv_name)) {
*dc_ip = ip_list[0];
SAFE_FREE(ip_list);
return True;
}
/* Didn't get name, remember not to talk to this DC. */
exclude_ip = ip_list[0];
SAFE_FREE(ip_list);
return True;
}
if (!get_dc_list(False, domain, &ip_list, &count)) {
@ -157,9 +164,18 @@ static BOOL cm_rpc_find_dc(const char *domain, struct in_addr *dc_ip, fstring sr
return False;
}
/* Remove the entry we've already failed with (should be the PDC). */
for (i = 0; i < count; i++) {
if (ip_equal( exclude_ip, ip_list[i]))
zero_ip(&ip_list[i]);
}
/* Pick a nice close server */
/* Look for DC on local net */
for (i = 0; i < count; i++) {
if (is_zero_ip(ip_list[i]))
continue;
if (!is_local_net(ip_list[i]))
continue;