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 6cbf5c03e932757ca2adf9358f62959704877acb..c281aae619de4416d5f72d2c3659a4dd84b7dcc2 100644 (file)
--- 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 a05470e52e4a923dd162afbb8a3a9e85eeacaeec..3cc591089a42a5df7f0f51edf7247874b08b9c2a 100644 (file)
--- 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,