summaryrefslogtreecommitdiff
path: root/selftest/target
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2013-03-10 20:25:53 +1100
committerMichael Adam <obnox@samba.org>2013-03-11 19:46:24 +0100
commit58e385a5ac37c072a4eef3baa7926b799a732e94 (patch)
tree4994f50ec4764c3e59c21a9aa41be6546e848095 /selftest/target
parentfc496ef323c908a6b621198d9dc8076f6857385e (diff)
downloadsamba-58e385a5ac37c072a4eef3baa7926b799a732e94.tar.gz
samba-58e385a5ac37c072a4eef3baa7926b799a732e94.tar.bz2
samba-58e385a5ac37c072a4eef3baa7926b799a732e94.zip
Revert "Ensure the masks don't conflict with the ACL checks."
This reverts commit 78594909b8b22bd07978922b1c85dfd6f6456963 which was needed by 7622aa16adeb00bf161a6dd07664c37125391272. This change masked bug #9462 which was fixed by 2013bb9b4dbed747921df2591068e2765428f57d. The issue was that the defaults for the substituted parameters did not match the old parameter. Changing the values in our test suite hid the issue, but did not fix the issue. (Additional change in the revert is to correct the expected ACL value in posixacl.py due to changed implied inherited permissions). Andrew Bartlett Reviewed-by: Michael Adam <obnox@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Michael Adam <obnox@samba.org> Autobuild-Date(master): Mon Mar 11 19:46:24 CET 2013 on sn-devel-104
Diffstat (limited to 'selftest/target')
-rwxr-xr-xselftest/target/Samba3.pm3
-rw-r--r--selftest/target/Samba4.pm3
2 files changed, 2 insertions, 4 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 8d9c4b9310..72c111609f 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -986,8 +986,7 @@ sub provision($$$$$$)
map system = no
map readonly = no
store dos attributes = yes
- create mask = 0777
- directory mask = 0777
+ create mask = 755
dos filemode = yes
vfs objects = $vfs_modulesdir_abs/acl_xattr.so $vfs_modulesdir_abs/fake_acls.so $vfs_modulesdir_abs/xattr_tdb.so $vfs_modulesdir_abs/streams_depot.so
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 6f694143dd..495cc23d5c 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -1399,8 +1399,7 @@ sub provision_plugin_s4_dc($$)
smbd:sharedelay = 100000
smbd:writetimeupdatedelay = 500000
- create mask = 0777
- directory mask = 0777
+ create mask = 755
dos filemode = yes
dcerpc endpoint servers = -winreg -srvsvc