sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

s3:smbtree: try to fix completely broken logic in get_workgroups()

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher 2011-07-22 12:48:09 +02:00
parent efbe1602bd
commit 5bd80b20a1
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
source3/utils/smbtree.c
View File

@ -95,24 +95,32 @@ static bool get_workgroups(struct user_auth_info *user_info)
return false;
}
if (!use_bcast && !find_master_ip(lp_workgroup(), &server_ss)) {
DEBUG(4, ("Unable to find master browser for workgroup %s, falling back to broadcast\n",
master_workgroup));
use_bcast = True;
} else if(!use_bcast) {
char addr[INET6_ADDRSTRLEN];
print_sockaddr(addr, sizeof(addr), &server_ss);
if (!(cli = get_ipc_connect(addr, &server_ss, user_info)))
return False;
}
if (!use_bcast && !find_master_ip(lp_workgroup(), &server_ss)) {
DEBUG(4,("Unable to find master browser for workgroup %s, "
"falling back to broadcast\n",
master_workgroup));
use_bcast = true;
}
if (!(cli = get_ipc_connect_master_ip_bcast(talloc_tos(),
user_info,
&master_workgroup))) {
if (!use_bcast) {
char addr[INET6_ADDRSTRLEN];
print_sockaddr(addr, sizeof(addr), &server_ss);
cli = get_ipc_connect(addr, &server_ss, user_info);
if (cli == NULL) {
return false;
}
} else {
cli = get_ipc_connect_master_ip_bcast(talloc_tos(),
user_info,
&master_workgroup);
if (cli == NULL) {
DEBUG(4, ("Unable to find master browser by "
"broadcast\n"));
return False;
}
return false;
}
}
if (!cli_NetServerEnum(cli, master_workgroup,
SV_TYPE_DOMAIN_ENUM, add_name, &workgroups))