Revert "smbd: add smbd_server_connection->{root,guest}_ev_ctx pointer"

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>

diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index a273cdb3651ee169172cf2c823040521a6f81679..689aa0b6ed1e93ef0ca439b37930fc0e888fef72 100644 (file)
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -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;

diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c
index 65e95128aa20ba675784f9b86cd778c8c6513734..af5888c8a24ca9149ca00ea464393454dee0805b 100644 (file)
--- a/source3/smbd/msdfs.c
+++ b/source3/smbd/msdfs.c
@@ -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);

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 2363eb78ea52c4a424c9971daca32e0bb9e96b9e..dbcf13187cf2b424d6debf30210df3033e5af95e 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -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(),