From a6a01552efe69f6450425b001ad600ec056bd18c Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sun, 11 Nov 2012 22:07:49 +1100 Subject: [PATCH] pysmbd: Add SMB_ACL_EXECUTE to the mask set by make_simple_acl() Signed-off-by: Andrew Bartlett Reviewed-by: Jelmer Vernooij Reviewed-by: Andrew Bartlett --- source3/smbd/pysmbd.c | 2 +- source4/scripting/python/samba/tests/posixacl.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source3/smbd/pysmbd.c b/source3/smbd/pysmbd.c index ed3e23a0dfa..6a6a8120f3a 100644 --- a/source3/smbd/pysmbd.c +++ b/source3/smbd/pysmbd.c @@ -179,7 +179,7 @@ static SMB_ACL_T make_simple_acl(gid_t gid, mode_t chmod_mode) { TALLOC_CTX *frame = talloc_stackframe(); - mode_t mode = SMB_ACL_READ|SMB_ACL_WRITE; + mode_t mode = SMB_ACL_READ|SMB_ACL_WRITE|SMB_ACL_EXECUTE; mode_t mode_user = (chmod_mode & 0700) >> 6; mode_t mode_group = (chmod_mode & 070) >> 3; diff --git a/source4/scripting/python/samba/tests/posixacl.py b/source4/scripting/python/samba/tests/posixacl.py index 5e10f8ddf87..50518f0d0e8 100644 --- a/source4/scripting/python/samba/tests/posixacl.py +++ b/source4/scripting/python/samba/tests/posixacl.py @@ -246,7 +246,7 @@ class PosixAclMappingTests(TestCaseInTempDir): self.assertEquals(posix_acl.acl[2].a_perm, 0) self.assertEquals(posix_acl.acl[3].a_type, smb_acl.SMB_ACL_MASK) - self.assertEquals(posix_acl.acl[3].a_perm, 6) + self.assertEquals(posix_acl.acl[3].a_perm, 7) def test_setposixacl_group_getposixacl(self): lp = LoadParm() @@ -274,7 +274,7 @@ class PosixAclMappingTests(TestCaseInTempDir): self.assertEquals(posix_acl.acl[3].info.gid, BA_gid) self.assertEquals(posix_acl.acl[4].a_type, smb_acl.SMB_ACL_MASK) - self.assertEquals(posix_acl.acl[4].a_perm, 6) + self.assertEquals(posix_acl.acl[4].a_perm, 7) def test_setntacl_sysvol_check_getposixacl(self): lp = LoadParm() -- 2.11.4.GIT