Revert "smbd: remove unused smbd_server_connection->ev_ctx"

This reverts commit 721fbbfa7001b2788602106101f0407483894322.

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 5695663cc665e315de5df6d786cf501245821311..a13916e230ab3a0f100acc4a5d87d6aa67f5eec7 100644 (file)
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -879,6 +879,7 @@ struct smbd_server_connection {
        const struct tsocket_address *local_address;
        const struct tsocket_address *remote_address;
        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;

diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c
index a57716469716877d7930e387ce3eb68dc0423265..c523abb3158c81173ace34014fc8cee3473b49d1 100644 (file)
--- a/source3/smbd/msdfs.c
+++ b/source3/smbd/msdfs.c
@@ -264,6 +264,7 @@ static NTSTATUS create_conn_struct_as_root(TALLOC_CTX *ctx,
                return NT_STATUS_NO_MEMORY;
        }
 
+       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;

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index a3571ee811abefe8fb5255a54cdbf8b281cb73d8..e730676ef3615b38f51b2deab50216207e68100f 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -3931,6 +3931,7 @@ void smbd_process(struct tevent_context *ev_ctx,
        client->sconn = sconn;
        sconn->client = client;
 
+       sconn->ev_ctx = ev_ctx;
        sconn->raw_ev_ctx = ev_ctx;
        sconn->root_ev_ctx = ev_ctx;
        sconn->guest_ev_ctx = ev_ctx;