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

ctdb-ipalloc: Whether IPs can be hosted need not depend on merged IP list

Browse Source 
Merged IP list won't be available here...

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12254

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2016-09-12 15:49:03 +10:00 committed by Martin Schwenke
parent 0e5c62d8fc
commit dfc3b8855d
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ctdb/server/ipalloc.c
View File

@ -245,14 +245,18 @@ bool ipalloc_set_public_ips(struct ipalloc_state *ipalloc_state,
bool ipalloc_can_host_ips(struct ipalloc_state *ipalloc_state)
{
int i;
struct public_ip_list *ip_list;
for (ip_list = ipalloc_state->all_ips;
ip_list != NULL;
ip_list = ip_list->next) {
if (ip_list->pnn != -1) {
return true;
for (i=0; i < ipalloc_state->num; i++) {
struct ctdb_public_ip_list *ips =
ipalloc_state->known_public_ips;
if (ips[i].num != 0) {
int j;
/* Succeed if an address is hosted on node i */
for (j=0; j < ips[i].num; j++) {
if (ips[i].ip[j].pnn == i) {
return true;
}
}
}
}