lib: Make ctdbd_register_msg_ctx return 0/errno

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 1db0c0a40e9e2ed9d079f219cf1b9bb873f61c02..40c2d891b0f3f8bfbe6a07a48b28211a08965397 100644 (file)
--- a/source3/include/ctdbd_conn.h
+++ b/source3/include/ctdbd_conn.h
@@ -32,8 +32,8 @@ NTSTATUS ctdbd_messaging_connection(TALLOC_CTX *mem_ctx,
 
 uint32_t ctdbd_vnn(const struct ctdbd_connection *conn);
 
-NTSTATUS ctdbd_register_msg_ctx(struct ctdbd_connection *conn,
-                               struct messaging_context *msg_ctx);
+int ctdbd_register_msg_ctx(struct ctdbd_connection *conn,
+                          struct messaging_context *msg_ctx);
 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 30c09364fd81c7d36f75519d11d08022a8b468fc..deb3e4e3b469e122dc186dc49af4ecebe8cf3142 100644 (file)
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -582,8 +582,8 @@ static void ctdbd_socket_handler(struct tevent_context *event_ctx,
  * Prepare a ctdbd connection to receive messages
  */
 
-NTSTATUS ctdbd_register_msg_ctx(struct ctdbd_connection *conn,
-                               struct messaging_context *msg_ctx)
+int ctdbd_register_msg_ctx(struct ctdbd_connection *conn,
+                          struct messaging_context *msg_ctx)
 {
        SMB_ASSERT(conn->msg_ctx == NULL);
        SMB_ASSERT(conn->fde == NULL);
@@ -595,12 +595,12 @@ NTSTATUS ctdbd_register_msg_ctx(struct ctdbd_connection *conn,
                                       ctdbd_socket_handler,
                                       conn))) {
                DEBUG(0, ("event_add_fd failed\n"));
-               return NT_STATUS_NO_MEMORY;
+               return ENOMEM;
        }
 
        conn->msg_ctx = msg_ctx;
 
-       return NT_STATUS_OK;
+       return 0;
 }
 
 NTSTATUS ctdbd_messaging_send_iov(struct ctdbd_connection *conn,

diff --git a/source3/lib/messages_ctdbd.c b/source3/lib/messages_ctdbd.c
index e6724a856a2f311b986875bc8976ca8e0dcdbcdb..599a9bdd4d311e58beea50640978c39f2aa2bad3 100644 (file)
--- a/source3/lib/messages_ctdbd.c
+++ b/source3/lib/messages_ctdbd.c
@@ -194,13 +194,13 @@ NTSTATUS messaging_ctdbd_init(struct messaging_context *msg_ctx,
                return status;
        }
 
-       status = ctdbd_register_msg_ctx(ctx->conn, msg_ctx);
+       ret = ctdbd_register_msg_ctx(ctx->conn, msg_ctx);
 
-       if (!NT_STATUS_IS_OK(status)) {
+       if (ret != 0) {
                DEBUG(10, ("ctdbd_register_msg_ctx failed: %s\n",
-                          nt_errstr(status)));
+                          strerror(ret)));
                TALLOC_FREE(result);
-               return status;
+               return map_nt_error_from_unix(ret);
        }
 
        ret = register_with_ctdbd(ctx->conn, getpid(),