summaryrefslogtreecommitdiff
path: root/source3/smbd/process.c
diff options
context:
space:
mode:
authorRalph Boehme <slow@samba.org>2018-12-27 11:38:34 +0100
committerStefan Metzmacher <metze@samba.org>2019-01-11 23:11:15 +0100
commit97a7f8864f34d3dcf3c31fb16b7f39f047580bd8 (patch)
tree32f8b14abf072b476058edadfb75a938e335dc64 /source3/smbd/process.c
parent864e985168d0622c51b351974180c5b1dfd5dc60 (diff)
downloadsamba-97a7f8864f34d3dcf3c31fb16b7f39f047580bd8.tar.gz
Revert "smbd: make use of smbd_impersonate_{conn_vuid,conn_sess,root,guest}_create() wrappers"
This reverts commit 0dcaa0707bad67f7bfaa10ccaf167bfefbe87a0c. 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>
Diffstat (limited to 'source3/smbd/process.c')
-rw-r--r--source3/smbd/process.c18
1 files changed, 2 insertions, 16 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index dc95af17393..a3571ee811a 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -3900,8 +3900,6 @@ void smbd_process(struct tevent_context *ev_ctx,
.ev = ev_ctx,
.frame = talloc_stackframe(),
};
- struct tevent_context *root_ev_ctx = NULL;
- struct tevent_context *guest_ev_ctx = NULL;
struct smbXsrv_client *client = NULL;
struct smbd_server_connection *sconn = NULL;
struct smbXsrv_connection *xconn = NULL;
@@ -3914,18 +3912,6 @@ void smbd_process(struct tevent_context *ev_ctx,
char *chroot_dir = NULL;
int rc;
- root_ev_ctx = smbd_impersonate_root_create(ev_ctx);
- if (root_ev_ctx == NULL) {
- DEBUG(0,("smbd_impersonate_root_create() failed\n"));
- exit_server_cleanly("smbd_impersonate_root_create().\n");
- }
-
- guest_ev_ctx = smbd_impersonate_guest_create(ev_ctx);
- if (guest_ev_ctx == NULL) {
- DEBUG(0,("smbd_impersonate_guest_create() failed\n"));
- exit_server_cleanly("smbd_impersonate_guest_create().\n");
- }
-
status = smbXsrv_client_create(ev_ctx, ev_ctx, msg_ctx, now, &client);
if (!NT_STATUS_IS_OK(status)) {
DBG_ERR("smbXsrv_client_create(): %s\n", nt_errstr(status));
@@ -3946,8 +3932,8 @@ void smbd_process(struct tevent_context *ev_ctx,
sconn->client = client;
sconn->raw_ev_ctx = ev_ctx;
- sconn->root_ev_ctx = root_ev_ctx;
- sconn->guest_ev_ctx = guest_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(),