lib: Remove messaging_tevent_context() dependency from ctdbd_conn.c

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/include/ctdbd_conn.h b/source3/include/ctdbd_conn.h
index 1381569a5a56a49a712f84287c906eaff817bed8..9342ddcaa93a3f4fc2d12cd8daab44eca47fc732 100644 (file)
--- a/source3/include/ctdbd_conn.h
+++ b/source3/include/ctdbd_conn.h
@@ -33,7 +33,8 @@ int ctdbd_messaging_connection(TALLOC_CTX *mem_ctx,
 uint32_t ctdbd_vnn(const struct ctdbd_connection *conn);
 
 int ctdbd_register_msg_ctx(struct ctdbd_connection *conn,
-                          struct messaging_context *msg_ctx);
+                          struct messaging_context *msg_ctx,
+                          struct tevent_context *ev);
 struct messaging_context *ctdb_conn_msg_ctx(struct ctdbd_connection *conn);
 
 int ctdbd_conn_get_fd(struct ctdbd_connection *conn);

diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index f091da7b2f06b7427144a033cc52ab123d9f7da1..990819e089aa9cd36b9c72a166e3b2e378b13297 100644 (file)
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -577,17 +577,15 @@ static void ctdbd_socket_handler(struct tevent_context *event_ctx,
  */
 
 int ctdbd_register_msg_ctx(struct ctdbd_connection *conn,
-                          struct messaging_context *msg_ctx)
+                          struct messaging_context *msg_ctx,
+                          struct tevent_context *ev)
 {
        SMB_ASSERT(conn->msg_ctx == NULL);
        SMB_ASSERT(conn->fde == NULL);
 
-       if (!(conn->fde = tevent_add_fd(messaging_tevent_context(msg_ctx),
-                                      conn,
-                                      conn->fd,
-                                      TEVENT_FD_READ,
-                                      ctdbd_socket_handler,
-                                      conn))) {
+       conn->fde = tevent_add_fd(ev, conn, conn->fd, TEVENT_FD_READ,
+                                 ctdbd_socket_handler, conn);
+       if (conn->fde == NULL) {
                DEBUG(0, ("event_add_fd failed\n"));
                return ENOMEM;
        }

diff --git a/source3/lib/messages_ctdbd.c b/source3/lib/messages_ctdbd.c
index a0c8d9050c096ebc3d876b7f38bdba1a5728bc35..5acd46829557554a4efe8865db040c583f617e28 100644 (file)
--- a/source3/lib/messages_ctdbd.c
+++ b/source3/lib/messages_ctdbd.c
@@ -188,7 +188,8 @@ NTSTATUS messaging_ctdbd_init(struct messaging_context *msg_ctx,
                return map_nt_error_from_unix(ret);
        }
 
-       ret = ctdbd_register_msg_ctx(ctx->conn, msg_ctx);
+       ret = ctdbd_register_msg_ctx(ctx->conn, msg_ctx,
+                                    messaging_tevent_context(msg_ctx));
 
        if (ret != 0) {
                DEBUG(10, ("ctdbd_register_msg_ctx failed: %s\n",