sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

Revert "Ensure the masks don't conflict with the ACL checks."

Browse Source 
This reverts commit 78594909b8 which was
needed by 7622aa16ad.

This change masked bug #9462 which was fixed by
2013bb9b4d.  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
This commit is contained in:
Andrew Bartlett 2013-03-10 20:25:53 +11:00 committed by Michael Adam
parent fc496ef323
commit 58e385a5ac
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/samba/tests/posixacl.py
View File

@ -227,7 +227,7 @@ class PosixAclMappingTests(TestCaseInTempDir):
smbd.chown(self.tempdir, BA_id, SO_id) smbd.chown(self.tempdir, BA_id, SO_id)
smbd.set_simple_acl(self.tempdir, 0750) smbd.set_simple_acl(self.tempdir, 0750)
facl = getntacl(self.lp, self.tempdir, direct_db_access=False) 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) anysid = security.dom_sid(security.SID_NT_SELF)
self.assertEquals(acl, facl.as_sddl(anysid)) self.assertEquals(acl, facl.as_sddl(anysid))

3
selftest/target/Samba3.pm
View File

@ -986,8 +986,7 @@ sub provision($$$$$$)
map system = no map system = no
map readonly = no map readonly = no
store dos attributes = yes store dos attributes = yes
create mask = 0777 create mask = 755
directory mask = 0777
dos filemode = yes 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 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

3
selftest/target/Samba4.pm
View File

@ -1399,8 +1399,7 @@ sub provision_plugin_s4_dc($$)
smbd:sharedelay = 100000 smbd:sharedelay = 100000
smbd:writetimeupdatedelay = 500000 smbd:writetimeupdatedelay = 500000
create mask = 0777 create mask = 755
directory mask = 0777
dos filemode = yes dos filemode = yes
dcerpc endpoint servers = -winreg -srvsvc dcerpc endpoint servers = -winreg -srvsvc