summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Beck <gbeck@sernet.de>2013-08-01 14:16:24 +0200
committerKarolin Seeger <kseeger@samba.org>2013-08-12 09:09:44 +0200
commit1596219a7e877e26560b4f737f043b20047aabc8 (patch)
tree31f1a689a67ef58e2ef19228e5e8e64e84174d53
parent3f66ac634809da7f692660472c83aed2169ac911 (diff)
downloadsamba-1596219a7e877e26560b4f737f043b20047aabc8.tar.gz
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)
-rw-r--r--source3/smbd/nttrans.c9
1 files changed, 2 insertions, 7 deletions
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. */