From 58e385a5ac37c072a4eef3baa7926b799a732e94 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sun, 10 Mar 2013 20:25:53 +1100 Subject: [PATCH] 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 Reviewed-by: Jeremy Allison Autobuild-User(master): Michael Adam Autobuild-Date(master): Mon Mar 11 19:46:24 CET 2013 on sn-devel-104 --- python/samba/tests/posixacl.py | 2 +- selftest/target/Samba3.pm | 3 +-- selftest/target/Samba4.pm | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/python/samba/tests/posixacl.py b/python/samba/tests/posixacl.py index 7cd22ebccd1..f3a4772e30c 100644 --- a/python/samba/tests/posixacl.py +++ b/python/samba/tests/posixacl.py @@ -227,7 +227,7 @@ class PosixAclMappingTests(TestCaseInTempDir): smbd.chown(self.tempdir, BA_id, SO_id) smbd.set_simple_acl(self.tempdir, 0750) facl = getntacl(self.lp, self.tempdir, direct_db_access=False) - acl = "O:BAG:SOD:(A;;0x001f01ff;;;BA)(A;;0x001200a9;;;SO)(A;;;;;WD)(A;OICIIO;0x001f01ff;;;CO)(A;OICIIO;0x001f01ff;;;CG)(A;OICIIO;0x001f01ff;;;WD)" + acl = "O:BAG:SOD:(A;;0x001f01ff;;;BA)(A;;0x001200a9;;;SO)(A;;;;;WD)(A;OICIIO;0x001f01ff;;;CO)(A;OICIIO;0x001200a9;;;CG)(A;OICIIO;0x001200a9;;;WD)" anysid = security.dom_sid(security.SID_NT_SELF) self.assertEquals(acl, facl.as_sddl(anysid)) diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index 8d9c4b93106..72c111609f3 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 6f694143dd3..495cc23d5c5 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