summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2021-01-26 21:29:58 -0800
committerKarolin Seeger <kseeger@samba.org>2021-02-26 08:50:40 +0000
commit51577d22ef6dcb6099b87295262d84c3a7e989d2 (patch)
tree3198cef01700f06ba36ec1725795cf15c9f76a69
parent42dbd31f73960b4d0c82fe8a8f3f02e6fff3f0c2 (diff)
downloadsamba-51577d22ef6dcb6099b87295262d84c3a7e989d2.tar.gz
smbd: In conn_force_tdis_done() when forcing a connection closed force a full reload of services.
Prevents reload_services() caching the fact it might be called multiple times in a row. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14604 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Ralph Boehme <slow@samba.org> (cherry picked from commit e4c8cd0781aef2a29bb4db1314c9fcd4f6edcecd)
-rw-r--r--source3/smbd/conn_idle.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/source3/smbd/conn_idle.c b/source3/smbd/conn_idle.c
index ca697383877..56a6ef896fb 100644
--- a/source3/smbd/conn_idle.c
+++ b/source3/smbd/conn_idle.c
@@ -273,5 +273,13 @@ static void conn_force_tdis_done(struct tevent_req *req)
* uid in the meantime. Ensure we're still root.
*/
change_to_root_user();
- reload_services(sconn, conn_snum_used, true);
+ /*
+ * Use 'false' in the last parameter (test) to force
+ * a full reload of services. Prevents
+ * reload_services caching the fact it's
+ * been called multiple times in a row.
+ * See BUG: https://bugzilla.samba.org/show_bug.cgi?id=14604
+ * for details.
+ */
+ reload_services(sconn, conn_snum_used, false);
}