Attachment 8672 Details for Bug 9733 – git-am fix for master and 4.0.next.

[patch] git-am fix for master and 4.0.next.

0001-Fix-bug-9733-smbcontrol-close-share-is-not-working.patch (text/plain), 1.60 KB, created by Jeremy Allison on 2013-03-21 21:10:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2013-03-21 21:10:51 UTC

Size: 1.60 KB

patch

obsolete

>From 53d9ff3e7b295a0fcca501a8bc10020b342892e1 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Thu, 21 Mar 2013 13:47:07 -0700
>Subject: [PATCH] Fix bug #9733 - smbcontrol close-share is not working.
>
>As part of forcibly disconnecting a client from a share,
>smbd must atomically call reload_services() to ensure that
>the entry in the ServicePtrs[] array corresponding to
>that share is removed if the share was removed from
>the smb.conf or registry entries.
>
>Otherwise the ServicePtrs[] array entry for the share
>remains active and the client races to auto-reconnect to
>the share before a second message to reload the smb.conf
>file can be sent.
>
>This has to be done as part of the close-share message
>processing, as removing the share from the smb.conf file
>first, then telling the smbd to reload followed by the
>forcible disconnect message doesn't work as in this
>sequence of events when the reload message is received
>the client is still connected to the share, so the
>ServicePtrs[] entry is still left active.
>
>The forcible-disconnect + service reload has to be done
>together as an atomic operation in order for this to work.
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>---
> source3/smbd/conn_idle.c | 3 +++
> 1 file changed, 3 insertions(+)
>
>diff --git a/source3/smbd/conn_idle.c b/source3/smbd/conn_idle.c
>index 916a206..238b7bd 100644
>--- a/source3/smbd/conn_idle.c
>+++ b/source3/smbd/conn_idle.c
>@@ -142,4 +142,7 @@ void conn_force_tdis(struct smbd_server_connection *sconn, const char *sharename
> 
> 		TALLOC_FREE(tcon);
> 	}
>+
>+	change_to_root_user();
>+	reload_services(sconn, conn_snum_used, true);
> }
>-- 
>1.8.1.3
>

Flags:

ddiss: review+

Actions: View

Attachments on bug 9733: 8671 | 8672 | 8675