summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Beck <gbeck@sernet.de>2013-08-01 14:16:24 +0200
committerJeremy Allison <jra@samba.org>2013-08-01 20:58:25 +0200
commitf556e71db74e695349c03bf82f68ea6e700eae03 (patch)
tree32d5d36b4b1295958839d92ebce49217d2ec2dbd
parent148499cb62acddd07f60102f8c99c38eb6fb5554 (diff)
downloadsamba-f556e71db74e695349c03bf82f68ea6e700eae03.tar.gz
samba-f556e71db74e695349c03bf82f68ea6e700eae03.tar.bz2
samba-f556e71db74e695349c03bf82f68ea6e700eae03.zip
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> Reviewed-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Thu Aug 1 20:58:25 CEST 2013 on sn-devel-104
-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 c8116b0a43..800e2fd260 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -891,13 +891,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. */