[SCM] Samba Shared Repository - branch v4-13-test updated

[Karolin Seeger]

The branch, v4-13-test has been updated
       via  331e4d8363f smbd: In conn_force_tdis_done() when forcing a connection closed force a full reload of services.
      from  55400f08000 dbcheck: Check Deleted Objects and reduce noise in reports about expired tombstones

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-13-test


- Log -----------------------------------------------------------------
commit 331e4d8363fee023b9ac56137e48592a9e1323d7
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jan 26 21:29:58 2021 -0800

    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 at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    (cherry picked from commit e4c8cd0781aef2a29bb4db1314c9fcd4f6edcecd)
    
    Autobuild-User(v4-13-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-13-test): Fri Feb 26 08:50:23 UTC 2021 on sn-devel-184

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/conn_idle.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

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);
 }


-- 
Samba Shared Repository