[SCM] CTDB repository - branch master updated - ctdb-1.11-63-g3d37be3

[Ronnie Sahlberg]

The branch, master has been updated
       via  3d37be3e2bfb61ede824028aeebaa18ba304faae (commit)
      from  8a86ac72088ad9f64ca83218c704f84c9abe00b6 (commit)

http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 3d37be3e2bfb61ede824028aeebaa18ba304faae
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed Sep 21 11:42:19 2011 +1000

    when checking that the interfaces exist in ctdb_add_public_address()
    cant talloc off vnn since it is not yet initialized and might not always be NULL

-----------------------------------------------------------------------

Summary of changes:
 server/ctdb_takeover.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
index 4114b40..29f7acd 100644
--- a/server/ctdb_takeover.c
+++ b/server/ctdb_takeover.c
@@ -880,15 +880,15 @@ static int ctdb_add_public_address(struct ctdb_context *ctdb,
 	int i;
 	int ret;
 
-	tmp = talloc_strdup(vnn, ifaces);
+	tmp = strdup(ifaces);
 	for (iface = strtok(tmp, ","); iface; iface = strtok(NULL, ",")) {
 		if (!ctdb_sys_check_iface_exists(iface)) {
 			DEBUG(DEBUG_CRIT,("Interface %s does not exist. Can not add public-address : %s\n", iface, ctdb_addr_to_str(addr)));
-			talloc_free(tmp);
+			free(tmp);
 			return -1;
 		}
 	}
-	talloc_free(tmp);
+	free(tmp);
 
 	/* Verify that we dont have an entry for this ip yet */
 	for (vnn=ctdb->vnn;vnn;vnn=vnn->next) {


-- 
CTDB repository