From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 13 Jul 2007 01:55:58 +0000 (+1000)
Subject: ensure killtcp structure is initialised
X-Git-Tag: tevent-0.9.20~348^2~2451
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f637e63179519212ffd74ec67a7ed2a868b931b;p=thirdparty%2Fsamba.git

ensure killtcp structure is initialised
(This used to be ctdb commit 2fe7d1ce87e55e125411e7406a9e00b8f55e3cb7)
---

diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c
index a4536e1c9dc..72774628169 100644
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -908,7 +908,8 @@ static void capture_tcp_handler(struct event_context *ev, struct fd_event *fde,
 }
 
 
-/* called every second until all sentenced connections have been reset
+/* 
+   called every second until all sentenced connections have been reset
  */
 static void ctdb_tickle_sentenced_connections(struct event_context *ev, struct timed_event *te, 
 					      struct timeval t, void *private_data)
@@ -976,7 +977,7 @@ static int ctdb_killtcp_add_connection(struct ctdb_context *ctdb,
 	   a new structure
 	 */
 	if (killtcp == NULL) {
-		killtcp = talloc(ctdb, struct ctdb_kill_tcp);
+		killtcp = talloc_zero(ctdb, struct ctdb_kill_tcp);
 		CTDB_NO_MEMORY(ctdb, killtcp);
 
 		killtcp->ctdb        = ctdb;
@@ -1027,7 +1028,7 @@ static int ctdb_killtcp_add_connection(struct ctdb_context *ctdb,
 		/* We also need to set up some events to tickle all these connections
 		   until they are all reset
 		*/
-		event_add_timed(ctdb->ev, killtcp, timeval_current_ofs(0, 0), 
+		event_add_timed(ctdb->ev, killtcp, timeval_zero(), 
 				ctdb_tickle_sentenced_connections, killtcp);
 	}