Attachment 16413 Details for Bug 14604 – git-am fix for 4.14.next, 4.13.next.

[patch] git-am fix for 4.14.next, 4.13.next.

0001-smbd-In-conn_force_tdis_done-when-forcing-a-connecti.patch (text/plain), 1.34 KB, created by Jeremy Allison on 2021-01-28 19:39:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2021-01-28 19:39:44 UTC

Size: 1.34 KB

patch

obsolete

>From 50226167244b9128b7a4e8a227c2115f1f3ef81f Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Tue, 26 Jan 2021 21:29:58 -0800
>Subject: [PATCH] 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)
>---
> source3/smbd/conn_idle.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
>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);
> }
>-- 
>2.27.0
>

Flags:

jra: review? (slow)
bjacke: review+

Actions: View

Attachments on bug 14604: 16413