lib: Make ctdb_watch_us 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 7073c0c8e20080fa927cd3506e4e16af682d6e59..1fb77fd76cf5b47b8a92c2a8df1169c72c7ef126 100644 (file)
--- a/source3/include/ctdbd_conn.h
+++ b/source3/include/ctdbd_conn.h
@@ -80,7 +80,7 @@ int ctdbd_control_local(struct ctdbd_connection *conn, uint32_t opcode,
                        uint64_t srvid, uint32_t flags, TDB_DATA data,
                        TALLOC_CTX *mem_ctx, TDB_DATA *outdata,
                        int *cstatus);
-NTSTATUS ctdb_watch_us(struct ctdbd_connection *conn);
+int ctdb_watch_us(struct ctdbd_connection *conn);
 NTSTATUS ctdb_unwatch(struct ctdbd_connection *conn);
 
 struct ctdb_req_message;

diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 3d9f8f01b27209d0a7e48eef6eae7159993ee22e..ee598c67ed38e467409ef3c08f67e2625f12ec21 100644 (file)
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -1252,7 +1252,7 @@ int ctdbd_control_local(struct ctdbd_connection *conn, uint32_t opcode,
                             mem_ctx, outdata, cstatus);
 }
 
-NTSTATUS ctdb_watch_us(struct ctdbd_connection *conn)
+int ctdb_watch_us(struct ctdbd_connection *conn)
 {
        struct ctdb_client_notify_register reg_data;
        size_t struct_len;
@@ -1273,9 +1273,8 @@ NTSTATUS ctdb_watch_us(struct ctdbd_connection *conn)
        if (ret != 0) {
                DEBUG(1, ("ctdbd_control_local failed: %s\n",
                          strerror(ret)));
-               return map_nt_error_from_unix(ret);
        }
-       return NT_STATUS_OK;
+       return ret;
 }
 
 NTSTATUS ctdb_unwatch(struct ctdbd_connection *conn)