From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 22 Mar 2018 09:54:41 +0000 (+0100)
Subject: smbd: use sconn->root_ev_ctx for brl_timeout_fn()
X-Git-Tag: tevent-0.9.37~274
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=182991c26c8149c79b13a277b9822efc49fd1df0;p=thirdparty%2Fsamba.git

smbd: use sconn->root_ev_ctx for brl_timeout_fn()

This already calls change_to_root_user(), which can be removed
later.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index 6cbf5c03e93..c281aae619d 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -135,7 +135,11 @@ static bool recalc_brl_timeout(struct smbd_server_connection *sconn)
 		    (int)from_now.tv_sec, (int)from_now.tv_usec));
 	}
 
-	sconn->smb1.locks.brl_timeout = tevent_add_timer(sconn->ev_ctx,
+	/*
+	 * brl_timeout_fn() calls change_to_root_user()
+	 * so we can use sconn->root_ev_ctx.
+	 */
+	sconn->smb1.locks.brl_timeout = tevent_add_timer(sconn->root_ev_ctx,
 							 NULL, next_timeout,
 							 brl_timeout_fn, sconn);
 	if (sconn->smb1.locks.brl_timeout == NULL) {
diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
index a05470e52e4..3cc591089a4 100644
--- a/source3/smbd/smb2_lock.c
+++ b/source3/smbd/smb2_lock.c
@@ -568,8 +568,12 @@ static bool recalc_smb2_brl_timeout(struct smbd_server_connection *sconn)
 			(int)from_now.tv_sec, (int)from_now.tv_usec));
 	}
 
+	/*
+	 * brl_timeout_fn() calls change_to_root_user()
+	 * so we can use sconn->root_ev_ctx.
+	 */
 	sconn->smb2.locks.brl_timeout = tevent_add_timer(
-				sconn->ev_ctx,
+				sconn->root_ev_ctx,
 				NULL,
 				next_timeout,
 				brl_timeout_fn,