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

[Karolin Seeger]

The branch, v4-1-test has been updated
       via  359d054 doc-xml: Add 'sharesec' reference to 'access based share enum'
       via  09a62da smbd: Stop using vfs_Chdir after SMB_VFS_DISCONNECT.
      from  d2c9373 Merge tag 'samba-4.1.17' into v4-1-test

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


- Log -----------------------------------------------------------------
commit 359d0547b637d1a8b0b24e16718c6fe4aa5cd34e
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Mar 2 11:55:01 2015 +0100

    doc-xml: Add 'sharesec' reference to 'access based share enum'
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11127
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Mon Mar  2 14:33:33 CET 2015 on sn-devel-104
    
    (cherry picked from commit e2ed224653985afa13e906e2a5f3656a18d622c0)
    Signed-off-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(v4-1-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-1-test): Wed Mar  4 00:20:05 CET 2015 on sn-devel-104

commit 09a62da360acd241d814a33fd48a9785e10a7ba1
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().

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

Summary of changes:
 docs-xml/smbdotconf/security/accessbasedshareenum.xml | 5 ++++-
 source3/smbd/service.c                                | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/security/accessbasedshareenum.xml b/docs-xml/smbdotconf/security/accessbasedshareenum.xml
index 8b94648..66932d0 100644
--- a/docs-xml/smbdotconf/security/accessbasedshareenum.xml
+++ b/docs-xml/smbdotconf/security/accessbasedshareenum.xml
@@ -7,7 +7,10 @@
      <para>If this parameter is <constant>yes</constant> for a
     service, then the share hosted by the service will only be visible
     to users who have read or write access to the share during share
-    enumeration (for example net view \\sambaserver).  This has
+    enumeration (for example net view \\sambaserver). The share ACLs
+    which allow or deny the access to the share can be modified using
+    for example the <command moreinfo="none">sharesec</command> command
+    or using the appropriate Windows tools. This has
     parallels to access based enumeration, the main difference being
     that only share permissions are evaluated, and security
     descriptors on files contained on the share are not used in
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 7d06551..e0c92774 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -1129,12 +1129,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