Convert ctdb_conn.c to enum ndr_error_code
authorVolker Lendecke <vl@sernet.de>
Sat, 10 Nov 2007 22:15:40 +0000 (23:15 +0100)
committerStefan Metzmacher <metze@samba.org>
Sun, 11 Nov 2007 08:12:37 +0000 (09:12 +0100)
Fix the build
(This used to be commit 432d0e9cb2370e52f7d4cb58d2da747e526403e8)

source3/lib/ctdbd_conn.c

index 2892b8f6ab16985b50f7e2e65879fcff49d425ad..b43aec7fd08d228b228a8a570b1c4578ee7b724b 100644 (file)
@@ -243,7 +243,7 @@ static struct messaging_rec *ctdb_pull_messaging_rec(TALLOC_CTX *mem_ctx,
 {
        struct messaging_rec *result;
        DATA_BLOB blob;
-       NTSTATUS status;
+       enum ndr_err_code ndr_err;
 
        if ((overall_length < offsetof(struct ctdb_req_message, data))
            || (overall_length
@@ -259,22 +259,22 @@ static struct messaging_rec *ctdb_pull_messaging_rec(TALLOC_CTX *mem_ctx,
 
        blob = data_blob_const(msg->data, msg->datalen);
 
-       status = ndr_pull_struct_blob(
+       ndr_err = ndr_pull_struct_blob(
                &blob, result, result,
                (ndr_pull_flags_fn_t)ndr_pull_messaging_rec);
 
-       if (DEBUGLEVEL >= 10) {
-               DEBUG(10, ("ctdb_pull_messaging_rec:\n"));
-               NDR_PRINT_DEBUG(messaging_rec, result);
-       }
-
-       if (!NT_STATUS_IS_OK(status)) {
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                DEBUG(0, ("ndr_pull_struct_blob failed: %s\n",
-                         nt_errstr(status)));
+                         ndr_errstr(ndr_err)));
                TALLOC_FREE(result);
                return NULL;
        }
 
+       if (DEBUGLEVEL >= 10) {
+               DEBUG(10, ("ctdb_pull_messaging_rec:\n"));
+               NDR_PRINT_DEBUG(messaging_rec, result);
+       }
+
        return result;
 }
 
@@ -620,19 +620,20 @@ NTSTATUS ctdbd_messaging_send(struct ctdbd_connection *conn,
        TALLOC_CTX *mem_ctx;
        DATA_BLOB blob;
        NTSTATUS status;
+       enum ndr_err_code ndr_err;
 
        if (!(mem_ctx = talloc_init("ctdbd_messaging_send"))) {
                DEBUG(0, ("talloc failed\n"));
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = ndr_push_struct_blob(
+       ndr_err = ndr_push_struct_blob(
                &blob, mem_ctx, msg,
                (ndr_push_flags_fn_t)ndr_push_messaging_rec);
 
-       if (!NT_STATUS_IS_OK(status)) {
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                DEBUG(0, ("ndr_push_struct_blob failed: %s\n",
-                         nt_errstr(status)));
+                         ndr_errstr(ndr_err)));
                goto fail;
        }