Revert "s3:messages: protect against usage of wrapper tevent_context objects for...

[samba.git] / source3 / lib / messages.c

diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index 864d758fb13ec4b1f72e4fa02cb0abb1e70e6d27..dd19173b9736707bccecfb27569a08d2af70f2ac 100644 (file)
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -365,11 +365,6 @@ static bool messaging_alert_event_contexts(struct messaging_context *ctx)
                 * alternatively would be to track whether the
                 * immediate has already been scheduled. For
                 * now, avoid that complexity here.
-                *
-                * reg->ev and ctx->event_ctx can't
-                * be wrapper tevent_context pointers
-                * so we don't need to use
-                * tevent_context_same_loop().
                 */
 
                if (reg->ev == ctx->event_ctx) {
@@ -498,12 +493,6 @@ static NTSTATUS messaging_init_internal(TALLOC_CTX *mem_ctx,
 
        sec_init();
 
-       if (tevent_context_is_wrapper(ev)) {
-               /* This is really a programmer error! */
-               DBG_ERR("Should not be used with a wrapper tevent context\n");
-               return NT_STATUS_INVALID_PARAMETER;
-       }
-
        lck_path = lock_path(talloc_tos(), "msg.lock");
        if (lck_path == NULL) {
                return NT_STATUS_NO_MEMORY;
@@ -1025,13 +1014,6 @@ struct tevent_req *messaging_filtered_read_send(
        state->filter = filter;
        state->private_data = private_data;
 
-       if (tevent_context_is_wrapper(ev)) {
-               /* This is really a programmer error! */
-               DBG_ERR("Wrapper tevent context doesn't use main context.\n");
-               tevent_req_error(req, EINVAL);
-               return tevent_req_post(req, ev);
-       }
-
        /*
         * We have to defer the callback here, as we might be called from
         * within a different tevent_context than state->ev
@@ -1352,11 +1334,6 @@ static void messaging_dispatch_rec(struct messaging_context *msg_ctx,
        bool consumed;
        size_t i;
 
-       /*
-        * ev and msg_ctx->event_ctx can't be wrapper tevent_context pointers
-        * so we don't need to use tevent_context_same_loop().
-        */
-
        if (ev == msg_ctx->event_ctx) {
                consumed = messaging_dispatch_classic(msg_ctx, rec);
                if (consumed) {