summaryrefslogtreecommitdiff
path: root/ctdb/server/ipalloc.c
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2016-06-22 14:22:02 +1000
committerAmitay Isaacs <amitay@samba.org>2016-07-04 15:42:25 +0200
commit41a14e72b5944d8a92f91e4583c2826da497dc00 (patch)
tree56a42191d0b5bbddce4fd83bd26da15e8310a423 /ctdb/server/ipalloc.c
parent21adcd32bd96b26f361d7f5b0b6818d7d395ce42 (diff)
downloadsamba-41a14e72b5944d8a92f91e4583c2826da497dc00.tar.gz
ctdb-ipalloc: ipalloc() returns public IP list
Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/server/ipalloc.c')
-rw-r--r--ctdb/server/ipalloc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ctdb/server/ipalloc.c b/ctdb/server/ipalloc.c
index de6d94268dd..dd88f81c29b 100644
--- a/ctdb/server/ipalloc.c
+++ b/ctdb/server/ipalloc.c
@@ -265,7 +265,7 @@ bool ipalloc_can_host_ips(struct ipalloc_state *ipalloc_state)
}
/* The calculation part of the IP allocation algorithm. */
-bool ipalloc(struct ipalloc_state *ipalloc_state)
+struct public_ip_list *ipalloc(struct ipalloc_state *ipalloc_state)
{
bool ret = false;
@@ -285,5 +285,5 @@ bool ipalloc(struct ipalloc_state *ipalloc_state)
or -1 if there is no node that can cover this ip
*/
- return ret;
+ return (ret ? ipalloc_state->all_ips : NULL);
}