smbd: In conn_force_tdis_done() when forcing a connection closed force a full reload...
authorJeremy Allison <jra@samba.org>
Wed, 27 Jan 2021 05:29:58 +0000 (21:29 -0800)
committerKarolin Seeger <kseeger@samba.org>
Fri, 26 Feb 2021 08:50:23 +0000 (08:50 +0000)
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)

Autobuild-User(v4-13-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-13-test): Fri Feb 26 08:50:23 UTC 2021 on sn-devel-184

source3/smbd/conn_idle.c

index ca697383877135db5b51543e6e64b278b3bf9842..56a6ef896fb62c03c0ba76e941efcdc7ce148227 100644 (file)
@@ -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);
 }