From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 4 Jun 2007 13:54:56 +0000 (+1000)
Subject: use the right IP from the passed structure in takeip/releaseip calls
X-Git-Tag: tevent-0.9.20~348^2~2566
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e95215850b330ca17e2a861e8b4ca8690a5c5c2b;p=thirdparty%2Fsamba.git

use the right IP from the passed structure in takeip/releaseip calls
(This used to be ctdb commit 3db5ba681b11d9ce6474938f221fe68d55a6e1ad)
---

diff --git a/ctdb/takeover/ctdb_takeover.c b/ctdb/takeover/ctdb_takeover.c
index bf9d3982de8..5e0b02513a0 100644
--- a/ctdb/takeover/ctdb_takeover.c
+++ b/ctdb/takeover/ctdb_takeover.c
@@ -180,7 +180,7 @@ int32_t ctdb_control_takeover_ip(struct ctdb_context *ctdb,
 	state->c = talloc_steal(ctdb, c);
 	state->sin = talloc(ctdb, struct sockaddr_in);       
 	CTDB_NO_MEMORY(ctdb, state->sin);
-	*state->sin = *(struct sockaddr_in *)indata.dptr;	
+	*state->sin = pip->sin;
 
 	DEBUG(0,("Takover of IP %s/%u on interface %s\n", 
 		 ip, ctdb->nodes[ctdb->vnn]->public_netmask_bits, 
@@ -284,7 +284,7 @@ int32_t ctdb_control_release_ip(struct ctdb_context *ctdb,
 	state->c = talloc_steal(state, c);
 	state->sin = talloc(state, struct sockaddr_in);       
 	CTDB_NO_MEMORY(ctdb, state->sin);
-	*state->sin = *(struct sockaddr_in *)indata.dptr;	
+	*state->sin = pip->sin;
 
 	ret = ctdb_event_script_callback(ctdb, state, release_ip_callback, state,
 					 "releaseip %s %s %u",