ctdb-ipalloc: Fix a memory leak
authorMartin Schwenke <martin@meltin.net>
Tue, 1 Dec 2015 03:38:48 +0000 (14:38 +1100)
committerMichael Adam <obnox@samba.org>
Tue, 12 Jan 2016 18:16:17 +0000 (19:16 +0100)
Commit cfa0ffe78073f9e3a014bb127fb9a4b7ad95fceb introduced a memory
leak.  Never assume...

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Michael Adam <obnox@samba.org>
ctdb/server/ctdb_takeover.c

index 8de1666f1f00d226e5ddafd47c79a1d18b9aaab5..227bd162d441c8d89504e4c4e8b3ace3120c90d4 100644 (file)
@@ -1434,7 +1434,7 @@ static int ctdb_reload_remote_public_ips(struct ctdb_context *ctdb,
                ret = ctdb_ctrl_get_public_ips_flags(ctdb,
                                        TAKEOVER_TIMEOUT(),
                                        j,
-                                       ctdb->nodes,
+                                       ipalloc_state->known_public_ips,
                                        0,
                                        &ipalloc_state->known_public_ips[j]);
                if (ret != 0) {
@@ -1454,7 +1454,7 @@ static int ctdb_reload_remote_public_ips(struct ctdb_context *ctdb,
                ret = ctdb_ctrl_get_public_ips_flags(ctdb,
                                        TAKEOVER_TIMEOUT(),
                                        j,
-                                       ctdb->nodes,
+                                       ipalloc_state->available_public_ips,
                                        CTDB_PUBLIC_IP_FLAGS_ONLY_AVAILABLE,
                                        &ipalloc_state->available_public_ips[j]);
                if (ret != 0) {