summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorRichard Sharpe <realrichardsharpe@gmail.com>2012-01-23 12:50:25 -0800
committerJeremy Allison <jra@samba.org>2012-01-23 12:50:25 -0800
commit3191040c3d2c761769e983af3bdcd386f21e82c4 (patch)
tree4b197069487066fa8c9471866adc14caffc153bc /source3
parentaf6bf7714d8eb4cd3ac4e9f9ab674326e74c6a49 (diff)
downloadsamba-3191040c3d2c761769e983af3bdcd386f21e82c4.tar.gz
samba-3191040c3d2c761769e983af3bdcd386f21e82c4.tar.bz2
samba-3191040c3d2c761769e983af3bdcd386f21e82c4.zip
Another fix for bug #8556 - ACL permissions ignored when SMBsetatr is requested.
Prevent systems with "store dos attributes = yes" from overriding FILE_WRITE_ATTRIBUITES.
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/open.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 1fd8c11e2d..538805920f 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -164,6 +164,7 @@ NTSTATUS smbd_check_access_rights(struct connection_struct *conn,
if ((access_mask & FILE_WRITE_ATTRIBUTES) &&
(rejected_mask & FILE_WRITE_ATTRIBUTES) &&
+ !lp_store_dos_attributes(SNUM(conn)) &&
(lp_map_readonly(SNUM(conn)) ||
lp_map_archive(SNUM(conn)) ||
lp_map_hidden(SNUM(conn)) ||