From: Jeremy Allison Date: Thu, 21 Mar 2013 20:47:07 +0000 (-0700) Subject: Fix bug #9733 - smbcontrol close-share is not working. X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=84dad60672aa5fdc0ff20f5fb8471d5209174063;p=metze%2Fsamba%2Fwip.git 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 Reviewed-by: David Disseldorp Autobuild-User(master): David Disseldorp Autobuild-Date(master): Fri Mar 22 20:10:11 CET 2013 on sn-devel-104 --- diff --git a/source3/smbd/conn_idle.c b/source3/smbd/conn_idle.c index 916a2067ad9a..238b7bd76901 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); }