From: Martin Schwenke <martin@meltin.net>
Date: Mon, 23 May 2016 06:44:05 +0000 (+1000)
Subject: ctdb-ipalloc: Drop a use of CTDB_NO_MEMORY_NULL()
X-Git-Tag: tdb-1.3.10~551
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c86066cdc0af4af970c797bdd64db5c5a0c1cfc8;p=thirdparty%2Fsamba.git

ctdb-ipalloc: Drop a use of CTDB_NO_MEMORY_NULL()

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c
index bb548910dd0..8183784de98 100644
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -1253,7 +1253,12 @@ create_merged_ip_list(struct ctdb_context *ctdb, struct ipalloc_state *ipalloc_s
 			struct public_ip_list *tmp_ip;
 
 			tmp_ip = talloc_zero(ctdb->ip_tree, struct public_ip_list);
-			CTDB_NO_MEMORY_NULL(ctdb, tmp_ip);
+			if (tmp_ip == NULL) {
+				DEBUG(DEBUG_ERR,
+				      (__location__ " out of memory\n"));
+				return NULL;
+			}
+
 			/* Do not use information about IP addresses hosted
 			 * on other nodes, it may not be accurate */
 			if (public_ips->ip[j].pnn == i) {