Changeset 988 for vendor/current/source4/libcli/composite

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source4/libcli/composite/composite.c (modified) (6 diffs)

vendor/current/source4/libcli/composite/composite.c

@@ -56 +56 @@
 
         while (c->state < COMPOSITE_STATE_DONE) {
-                if (event_loop_once(c->event_ctx) != 0) {
+                if (tevent_loop_once(c->event_ctx) != 0) {
                         return NT_STATUS_UNSUCCESSFUL;
                 }
@@ -107 +107 @@
         }
         if (!ctx->used_wait && !ctx->async.fn) {
-                event_add_timed(ctx->event_ctx, ctx, timeval_zero(), composite_trigger, ctx);
+                tevent_add_timer(ctx->event_ctx, ctx, timeval_zero(), composite_trigger, ctx);
         }
         ctx->status = status;
@@ -137 +137 @@
 {
         if (!ctx->used_wait && !ctx->async.fn) {
-                event_add_timed(ctx->event_ctx, ctx, timeval_zero(), composite_trigger, ctx);
+                tevent_add_timer(ctx->event_ctx, ctx, timeval_zero(), composite_trigger, ctx);
         }
         ctx->state = COMPOSITE_STATE_DONE;
@@ -158 +158 @@
            immediate event, otherwise we can be stuck forever */
         if (new_ctx->state >= COMPOSITE_STATE_DONE && continuation) {
-                event_add_timed(new_ctx->event_ctx, new_ctx, timeval_zero(), composite_trigger, new_ctx);
+                tevent_add_timer(new_ctx->event_ctx, new_ctx, timeval_zero(), composite_trigger, new_ctx);
         }
 }
@@ -168 +168 @@
 {
         if (composite_nomem(new_req, ctx)) return;
+        if (new_req->state > SMBCLI_REQUEST_RECV) {
+                composite_error(ctx, new_req->status);
+                return;
+        }
         new_req->async.fn = continuation;
         new_req->async.private_data = private_data;
@@ -178 +182 @@
 {
         if (composite_nomem(new_req, ctx)) return;
+        if (new_req->state > SMB2_REQUEST_RECV) {
+                composite_error(ctx, new_req->status);
+                return;
+        }
         new_req->async.fn = continuation;
         new_req->async.private_data = private_data;