Changeset 745 for trunk/server/lib/util/tevent_ntstatus.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• lib/util/tevent_ntstatus.c (modified) (3 diffs)

trunk/server/lib/util/tevent_ntstatus.c

@@ -21 +21 @@
 #include "tevent_ntstatus.h"
 
-bool tevent_req_nterror(struct tevent_req *req, NTSTATUS status)
+#define TEVENT_NTERROR_MAGIC (0x917b5acd)
+
+bool _tevent_req_nterror(struct tevent_req *req,
+                         NTSTATUS status,
+                         const char *location)
 {
-        return tevent_req_error(req, NT_STATUS_V(status));
+        uint64_t err;
+
+        if (NT_STATUS_IS_OK(status)) {
+                return false;
+        }
+
+        /*
+         * I've put this variable here, because I'm not 100% certain
+         * how to correctly assign a 64-bit constant and left-shift it
+         * by 32 bits in a single expression. If anyone knows, feel
+         * free :-)
+         */
+        err = TEVENT_NTERROR_MAGIC;
+        err <<= 32;
+        err |= NT_STATUS_V(status);
+
+        return _tevent_req_error(req, err, location);
 }
 
@@ -42 +62 @@
                 break;
         case TEVENT_REQ_USER_ERROR:
-                *status = NT_STATUS(err);
+                if ((err >> 32) != TEVENT_NTERROR_MAGIC) {
+                        abort();
+                }
+                *status = NT_STATUS(err & 0xffffffff);
                 break;
         default:
@@ -60 +83 @@
         return NT_STATUS_OK;
 }
+
+void tevent_req_simple_finish_ntstatus(struct tevent_req *subreq,
+                                       NTSTATUS subreq_status)
+{
+        struct tevent_req *req = tevent_req_callback_data(
+                subreq, struct tevent_req);
+
+        TALLOC_FREE(subreq);
+
+        if (!NT_STATUS_IS_OK(subreq_status)) {
+                tevent_req_nterror(req, subreq_status);
+                return;
+        }
+        tevent_req_done(req);
+}