Revert "smbd: remove unused smbd_server_connection->ev_ctx"
authorRalph Boehme <slow@samba.org>
Thu, 27 Dec 2018 14:17:22 +0000 (15:17 +0100)
committerStefan Metzmacher <metze@samba.org>
Fri, 11 Jan 2019 22:11:16 +0000 (23:11 +0100)
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>
source3/smbd/globals.h
source3/smbd/msdfs.c
source3/smbd/process.c

index 5695663..a13916e 100644 (file)
@@ -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;
index a577164..c523abb 100644 (file)
@@ -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;
index a3571ee..e730676 100644 (file)
@@ -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;