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 eecd8b67618c326adf8f4983641b81efa9fa3dc3..35e4e7b18b9755710c6ad77f8eab9a2561776a20 100644 (file)
--- 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);
 }
 
 /*