Merge pull request #295 from techtonik/patch-3

acl: Fix X support in ACL permissions
2015-01-29 11:04:41 -05:00 · 2015-01-29 11:04:41 -05:00 · f4dbcea30c
commit f4dbcea30c
parent 256ce9dd4d 4f2b99c1e0
1 changed files with 3 additions and 0 deletions
--- a/files/acl.py
+++ b/files/acl.py
@ -111,6 +111,9 @@ def normalize_permissions(p):
            perms[1] = 'w'
        if char == 'x':
            perms[2] = 'x'
+        if char == 'X':
+            if perms[2] != 'x':  # 'x' is more permissive
+              perms[2] = 'X'
    return ''.join(perms)

 def split_entry(entry):