pysmbd: Add SMB_ACL_EXECUTE to the mask set by make_simple_acl()

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit a6a01552efe69f6450425b001ad600ec056bd18c)

diff --git a/source3/smbd/pysmbd.c b/source3/smbd/pysmbd.c
index 0c8e8596513a7bd9c2511dd775201ffb487df74a..14893550e28f4dc4ae6152376f0f9adb80b75715 100644 (file)
--- a/source3/smbd/pysmbd.c
+++ b/source3/smbd/pysmbd.c
@@ -178,7 +178,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 5e10f8ddf87a0aebfb4af4e6c7e85247afcd6601..50518f0d0e801622cefca07e34025128ce4e62c9 100644 (file)
--- 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()