merged tridge's branch

(This used to be ctdb commit 15e18293eaa5ddcd325395213014b5a4498ca309)

diff --git a/ctdb/ib/ibwrapper_test.c b/ctdb/ib/ibwrapper_test.c
index fa506500e46b65faeb1d2c01aa783c47e461b4f7..6ef5aa1e679951df81256bbe3378f7b7abeb8e31 100644 (file)
--- a/ctdb/ib/ibwrapper_test.c
+++ b/ctdb/ib/ibwrapper_test.c
@@ -336,7 +336,7 @@ int ibwtest_receive_handler(struct ibw_conn *conn, void *buf, int n)
                                ibw_stop(tcx->ibwctx);
                                goto error;
                        }
-               } else {
+               } else if (op!=TESTOP_SEND_ID) {
                        char *buf2;
                        void *key2;