Revert "smbd: add smbd_server_connection->{root,guest}_ev_ctx pointer"
authorRalph Boehme <slow@samba.org>
Thu, 27 Dec 2018 14:21:01 +0000 (15:21 +0100)
committerStefan Metzmacher <metze@samba.org>
Fri, 11 Jan 2019 22:11:17 +0000 (23:11 +0100)
This reverts commit 146938217ed1ab9a7a9f38c055fec5513cbd5c4d.

See the discussion in

https://lists.samba.org/archive/samba-technical/2018-December/131731.html

for the reasoning behind this revert.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
source3/smbd/globals.h
source3/smbd/msdfs.c
source3/smbd/process.c

index a273cdb..689aa0b 100644 (file)
@@ -878,8 +878,6 @@ struct smbd_server_connection {
        const char *remote_hostname;
        struct tevent_context *ev_ctx;
        struct tevent_context *raw_ev_ctx;
-       struct tevent_context *root_ev_ctx;
-       struct tevent_context *guest_ev_ctx;
        struct messaging_context *msg_ctx;
        struct notify_context *notify_ctx;
        bool using_smb2;
index 65e9512..af5888c 100644 (file)
@@ -265,8 +265,6 @@ static NTSTATUS create_conn_struct_as_root(TALLOC_CTX *ctx,
        }
 
        sconn->ev_ctx = sconn->raw_ev_ctx;
-       sconn->root_ev_ctx = sconn->raw_ev_ctx;
-       sconn->guest_ev_ctx = sconn->raw_ev_ctx;
        sconn->msg_ctx = msg;
 
        conn = conn_new(sconn);
index 2363eb7..dbcf131 100644 (file)
@@ -3925,8 +3925,6 @@ void smbd_process(struct tevent_context *ev_ctx,
 
        sconn->ev_ctx = ev_ctx;
        sconn->raw_ev_ctx = ev_ctx;
-       sconn->root_ev_ctx = ev_ctx;
-       sconn->guest_ev_ctx = ev_ctx;
        sconn->msg_ctx = msg_ctx;
 
        ret = pthreadpool_tevent_init(sconn, lp_aio_max_threads(),