[SCM] Samba Shared Repository - branch v3-6-test updated

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  3d2c591 s3:smb2_server: SMB2_OP_CANCEL requests don't have to be signed
       via  bd5d9d9 s3-docs: Remove "experimental" label on VFS ACL modules
      from  bdf1c39 These modules are no longer experimental but production-ready (especially the acl_xattr code). Remove the "experimental" tag.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 3d2c591ff6ce75317556de8ad522c73e5cc8f614
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Sep 28 08:28:08 2011 +0200

    s3:smb2_server: SMB2_OP_CANCEL requests don't have to be signed
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Thu Sep 29 02:58:41 CEST 2011 on sn-devel-104
    (cherry picked from commit ea00f0e452f64868fdc78cf0dc8e9ce3af19fe32)
    
    Fix bug #8503 (The SMB2 server should ignore signing on CANCEL requests).

commit bd5d9d9fba23ea585b701c41ec27482a0076729e
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Sep 28 20:17:42 2011 +0200

    s3-docs: Remove "experimental" label on VFS ACL modules
    
    in the documentation also (bug #8494).
    
    Karolin

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

Summary of changes:
 docs-xml/manpages-3/vfs_acl_tdb.8.xml   |    4 ----
 docs-xml/manpages-3/vfs_acl_xattr.8.xml |    4 ----
 source3/smbd/smb2_server.c              |    2 ++
 3 files changed, 2 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/vfs_acl_tdb.8.xml b/docs-xml/manpages-3/vfs_acl_tdb.8.xml
index 762364f..646c5ba 100644
--- a/docs-xml/manpages-3/vfs_acl_tdb.8.xml
+++ b/docs-xml/manpages-3/vfs_acl_tdb.8.xml
@@ -40,10 +40,6 @@
 	<filename>$LOCKDIR/file_ntacls.tdb</filename>.
 	</para>
 
-	<para>Please note that this module is
-	<emphasis>experimental</emphasis>!
-	</para>
-
 	<para>This module is stackable.</para>
 </refsect1>
 
diff --git a/docs-xml/manpages-3/vfs_acl_xattr.8.xml b/docs-xml/manpages-3/vfs_acl_xattr.8.xml
index e1eb92a..d428cc2 100644
--- a/docs-xml/manpages-3/vfs_acl_xattr.8.xml
+++ b/docs-xml/manpages-3/vfs_acl_xattr.8.xml
@@ -44,10 +44,6 @@
 	</command>).
 	</para>
 
-	<para>Please note that this module is
-	<emphasis>experimental</emphasis>!
-	</para>
-
 	<para>This module is stackable.</para>
 </refsect1>
 
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index aa9f22b..cad4ca6 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -1180,6 +1180,8 @@ NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req)
 		if (!NT_STATUS_IS_OK(status)) {
 			return smbd_smb2_request_error(req, status);
 		}
+	} else if (opcode == SMB2_OP_CANCEL) {
+		/* Cancel requests are allowed to skip the signing */
 	} else if (req->session && req->session->do_signing) {
 		return smbd_smb2_request_error(req, NT_STATUS_ACCESS_DENIED);
 	}


-- 
Samba Shared Repository