summaryrefslogtreecommitdiff
path: root/ctdb/ib
diff options
context:
space:
mode:
authorPeter Somogyi <psomogyi@gamax.hu>2007-04-20 14:26:19 +0200
committerPeter Somogyi <psomogyi@gamax.hu>2007-04-20 14:26:19 +0200
commite5f2e5e5eb56c390c68c1ac79a32fb068510fc41 (patch)
tree2051f1374b1a9743cbdd3643c84d6ee1d89ea376 /ctdb/ib
parentc950e5285830eb14f0fced820bbb2ad8927c5421 (diff)
downloadsamba-e5f2e5e5eb56c390c68c1ac79a32fb068510fc41.tar.gz
- ctdb/ib minor bugfixes (error case)
- make ctdb capable of alternative connection (like ib) again, solved the fork problem - do_debug memory overwrite bugfix (occured using ibwrapper_test with wrong address given) (This used to be ctdb commit da0b84cda26d544f63841dfd770ed7ebad401944)
Diffstat (limited to 'ctdb/ib')
-rw-r--r--ctdb/ib/ibwrapper.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ctdb/ib/ibwrapper.c b/ctdb/ib/ibwrapper.c
index f7b233954d2..908d38d5840 100644
--- a/ctdb/ib/ibwrapper.c
+++ b/ctdb/ib/ibwrapper.c
@@ -557,17 +557,17 @@ static void ibw_event_handler_cm(struct event_context *ev,
return;
error:
if (event!=NULL && (rc=rdma_ack_cm_event(event))) {
- sprintf(ibw_lasterr, "rdma_ack_cm_event failed with %d\n", rc);
- goto error;
+ DEBUG(0, ("rdma_ack_cm_event failed with %d\n", rc));
}
DEBUG(0, ("cm event handler: %s", ibw_lasterr));
if (cma_id!=pctx->cm_id) {
conn = talloc_get_type(cma_id->context, struct ibw_conn);
- if (conn)
+ if (conn) {
conn->state = IBWC_ERROR;
- pctx->connstate_func(NULL, conn);
+ pctx->connstate_func(NULL, conn);
+ }
} else {
ctx->state = IBWS_ERROR;
pctx->connstate_func(ctx, NULL);