From: Ralph Boehme <slow@samba.org>
Date: Thu, 27 Dec 2018 14:26:15 +0000 (+0100)
Subject: Revert "smbd: add smbd_server_connection->raw_ev_ctx pointer"
X-Git-Tag: talloc-2.1.15~142
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcd0edfdc90a009a87fc8b0bafbd09e2711ebccb;p=thirdparty%2Fsamba.git

Revert "smbd: add smbd_server_connection->raw_ev_ctx pointer"

This reverts commit 6114f9545fa856717220658e87f2a60f6767b7f4.

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 689aa0b6ed1..02f1e58b77b 100644
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -877,7 +877,6 @@ struct smbd_server_connection {
 	const struct tsocket_address *remote_address;
 	const char *remote_hostname;
 	struct tevent_context *ev_ctx;
-	struct tevent_context *raw_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 af5888c8a24..19cb301f56b 100644
--- a/source3/smbd/msdfs.c
+++ b/source3/smbd/msdfs.c
@@ -258,13 +258,12 @@ static NTSTATUS create_conn_struct_as_root(TALLOC_CTX *ctx,
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	sconn->raw_ev_ctx = samba_tevent_context_init(sconn);
-	if (sconn->raw_ev_ctx == NULL) {
+	sconn->ev_ctx = samba_tevent_context_init(sconn);
+	if (sconn->ev_ctx == NULL) {
 		TALLOC_FREE(sconn);
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	sconn->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 03aa2254c15..99693ed1315 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -3924,7 +3924,6 @@ void smbd_process(struct tevent_context *ev_ctx,
 	sconn->client = client;
 
 	sconn->ev_ctx = ev_ctx;
-	sconn->raw_ev_ctx = ev_ctx;
 	sconn->msg_ctx = msg_ctx;
 
 	ret = pthreadpool_tevent_init(sconn, lp_aio_max_threads(),