Attachment 8671 Details for Bug 9733 – git-am fix for 3.6.next.

[patch] git-am fix for 3.6.next.

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

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2013-03-21 21:09:28 UTC

Size: 1.52 KB

patch

obsolete

>From 756fcf7ec98f89d1eb9ed820320750c6ef862dfb Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Thu, 21 Mar 2013 13:59:20 -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.c | 3 +++
> 1 file changed, 3 insertions(+)
>
>diff --git a/source3/smbd/conn.c b/source3/smbd/conn.c
>index 8a96e88..418c42a 100644
>--- a/source3/smbd/conn.c
>+++ b/source3/smbd/conn.c
>@@ -512,4 +512,7 @@ void msg_force_tdis(struct messaging_context *msg,
> 			}
> 		}
> 	}
>+
>+	change_to_root_user();
>+	reload_services(msg, -1, true);
> }
>-- 
>1.8.1.3
>

Flags:

ddiss: review-

Actions: View

Attachments on bug 9733: 8671 | 8672 | 8675