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

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  b085c39 Fix bug 9678 - Windows 8 Roaming profiles fail
       via  326ebbd security.idl: add new security_secinfo bits
      from  cb48b06 WHATSNEW: Start release notes for Samba 3.6.18.

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


- Log -----------------------------------------------------------------
commit b085c39d9e39d305b715fd73c267eff0fc5fd4c4
Author: Gregor Beck <gbeck at sernet.de>
Date:   Thu Aug 1 14:16:24 2013 +0200

    Fix bug 9678 - Windows 8 Roaming profiles fail
    
    Windows 8 tries to set 'ATTRIBUTE_SECURITY_INFORMATION' on some
    dirs. Ignoring it makes roaming profiles work again.
    Just like w2k3 gracefully ignore all the other bits.
    
    Signed-off-by: Gregor Beck <gbeck at sernet.de>

commit 326ebbdaca4d13fa498779f960a202955531576b
Author: Gregor Beck <gbeck at sernet.de>
Date:   Wed Jul 31 15:28:51 2013 +0200

    security.idl: add new security_secinfo bits
    
    [MS-DTYP].pdf 2.4.7
    
    Signed-off-by: Gregor Beck <gbeck at sernet.de>

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

Summary of changes:
 librpc/idl/security.idl |    3 +++
 source3/smbd/nttrans.c  |    9 ++-------
 2 files changed, 5 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/idl/security.idl b/librpc/idl/security.idl
index 696d5a5..0ea79a3 100644
--- a/librpc/idl/security.idl
+++ b/librpc/idl/security.idl
@@ -593,6 +593,9 @@ interface security
 		SECINFO_DACL                 = 0x00000004,
 		SECINFO_SACL                 = 0x00000008,
 		SECINFO_LABEL                = 0x00000010,
+		SECINFO_ATTRIBUTE	     = 0x00000020,
+		SECINFO_SCOPE                = 0x00000040,
+		SECINFO_BACKUP		     = 0x00010000,
 		SECINFO_UNPROTECTED_SACL     = 0x10000000,
 		SECINFO_UNPROTECTED_DACL     = 0x20000000,
 		SECINFO_PROTECTED_SACL	     = 0x40000000,
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 5fc3a09..a884b2f 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -885,13 +885,8 @@ NTSTATUS set_sd(files_struct *fsp, struct security_descriptor *psd,
 
 	/* Ensure we have at least one thing set. */
 	if ((security_info_sent & (SECINFO_OWNER|SECINFO_GROUP|SECINFO_DACL|SECINFO_SACL)) == 0) {
-		if (security_info_sent & SECINFO_LABEL) {
-			/* Only consider SECINFO_LABEL if no other
-			   bits are set. Just like W2K3 we don't
-			   store this. */
-			return NT_STATUS_OK;
-		}
-		return NT_STATUS_INVALID_PARAMETER;
+		/* Just like W2K3 */
+		return NT_STATUS_OK;
 	}
 
 	/* Ensure we have the rights to do this. */


-- 
Samba Shared Repository