diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2013-03-10 20:25:53 +1100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2013-03-11 19:46:24 +0100 |
| commit | 58e385a5ac37c072a4eef3baa7926b799a732e94 (patch) | |
| tree | 4994f50ec4764c3e59c21a9aa41be6546e848095 /python | |
| parent | fc496ef323c908a6b621198d9dc8076f6857385e (diff) | |
| download | samba-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 'python')
| -rw-r--r-- | python/samba/tests/posixacl.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/samba/tests/posixacl.py b/python/samba/tests/posixacl.py index 7cd22ebccd..f3a4772e30 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)) |