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

[Karolin Seeger]

The branch, v4-0-test has been updated
       via  594e911 smbd: Stop using vfs_Chdir after SMB_VFS_DISCONNECT.
      from  2722ad6 Merge tag 'samba-4.0.25' into v4-0-test

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


- Log -----------------------------------------------------------------
commit 594e911269c81b4c810864ee69dc9cc6eee2f32b
Author: Ira Cooper <ira at samba.org>
Date:   Thu Jan 15 11:41:50 2015 -0500

    smbd: Stop using vfs_Chdir after SMB_VFS_DISCONNECT.
    
    This sequencing is causing problems for vfs_ceph, and likely
    other vfs modules.
    
    Signed-off-by: Ira Cooper <ira at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Fri Jan 16 00:13:17 CET 2015 on sn-devel-104
    
    (cherry picked from commit 81464daea71e5fa3067ec7d5f5c69c890c0f7949)
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11115
    S3: vfs_Chdir() is called after SMB_VFS_DISCONNECT in
    source3/smbd/service.c::close_cnum().
    
    Autobuild-User(v4-0-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-0-test): Mon Mar  2 23:25:27 CET 2015 on sn-devel-104

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

Summary of changes:
 source3/smbd/service.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 19c02d6..6d31338 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -1128,12 +1128,12 @@ void close_cnum(connection_struct *conn, uint64_t vuid)
 							talloc_tos()),
 				 lp_servicename(talloc_tos(), SNUM(conn))));
 
-	/* Call VFS disconnect hook */    
-	SMB_VFS_DISCONNECT(conn);
-
 	/* make sure we leave the directory available for unmount */
 	vfs_ChDir(conn, "/");
 
+	/* Call VFS disconnect hook */
+	SMB_VFS_DISCONNECT(conn);
+
 	/* execute any "postexec = " line */
 	if (*lp_postexec(talloc_tos(), SNUM(conn)) &&
 	    change_to_user(conn, vuid))  {


-- 
Samba Shared Repository