Merge branch '1.3' of 10.1.1.27:/shared/ctdb/ctdb-git into 1.3

[sahlberg/ctdb.git] / ib / ibw_ctdb.c

diff --git a/ib/ibw_ctdb.c b/ib/ibw_ctdb.c
index fd577ffdce407315aeac8f33770c41dedd96e9cd..5664c193acb95bbc1c776ef0826f244de2240fe6 100644 (file)
--- a/ib/ibw_ctdb.c
+++ b/ib/ibw_ctdb.c
@@ -21,7 +21,7 @@
  */
 
 #include "includes.h"
-#include "lib/events/events.h"
+#include "lib/tevent/tevent.h"
 #include <system/network.h>
 #include <assert.h>
 #include "ctdb_private.h"
@@ -166,6 +166,8 @@ int ctdb_ibw_receive_handler(struct ibw_conn *conn, void *buf, int n)
         * and being reused for next receive
         * noticed that HL requires talloc-ed memory to be stolen */
        buf2 = talloc_zero_size(conn, n);
+       CTDB_NO_MEMORY(ctdb, buf2);
+
        memcpy(buf2, buf, n);
 
        ctdb->upcalls->recv_pkt(ctdb, (uint8_t *)buf2, (uint32_t)n);