From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Tue, 4 Sep 2007 04:19:18 +0000 (+1000)
Subject: dont just always return 0 from the killtcp control.
X-Git-Tag: tevent-0.9.20~348^2~2430^2~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=784eac90798de87050b51c2aa5ff4ca5a78cc13a;p=thirdparty%2Fsamba.git

dont just always return 0 from the killtcp control.
return 0 or -1 so that the ctdb tool knows whether the control succeeded
or not

(This used to be ctdb commit cace8b40090be5529ec6b463d3839d0e22f4039d)
---

diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c
index eecd8b67618..35e4e7b18b9 100644
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -1242,7 +1242,7 @@ static int ctdb_killtcp_add_connection(struct ctdb_context *ctdb,
 	vnn = find_public_ip_vnn(ctdb, addr);
 	if (vnn == NULL) {
 		DEBUG(0,(__location__ " Could not killtcp, '%s' is not a public address\n", addr)); 
-		return 0;
+		return -1;
 	}
 
 	vnn_list = vnn->vnn_list;
@@ -1336,9 +1336,7 @@ int32_t ctdb_control_kill_tcp(struct ctdb_context *ctdb, TDB_DATA indata)
 {
 	struct ctdb_control_killtcp *killtcp = (struct ctdb_control_killtcp *)indata.dptr;
 
-	ctdb_killtcp_add_connection(ctdb, &killtcp->src, &killtcp->dst);
-
-	return 0;
+	return ctdb_killtcp_add_connection(ctdb, &killtcp->src, &killtcp->dst);
 }
 
 /*