From: Gregor Beck <gbeck@sernet.de>
Date: Thu, 1 Aug 2013 12:16:24 +0000 (+0200)
Subject: Fix bug 9678 - Windows 8 Roaming profiles fail
X-Git-Tag: samba-3.6.18~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1596219a7e877e26560b4f737f043b20047aabc8;p=thirdparty%2Fsamba.git

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@sernet.de>
(cherry picked from commit b085c39d9e39d305b715fd73c267eff0fc5fd4c4)
---

diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 5fc3a09784d..a884b2f38f4 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. */