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

diff --git a/python/samba/tests/posixacl.py b/python/samba/tests/posixacl.py
index 7cd22ebccd12d20cfe101d0b46a832b7580e28f9..f3a4772e30c58521889a6bfbb27db84d84919ddc 100644 (file)
--- 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 8d9c4b931062546a2d45b6bc25eeaad7dbfda985..72c111609f347a0302b9af71b8467fc06af54d80 100755 (executable)
--- 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 6f694143dd31ff9b9c587a9f0d9ac78352dcb003..495cc23d5c5d1b410b405c0630580d91837695fe 100644 (file)
--- 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