summaryrefslogtreecommitdiffstats
path: root/ipalib
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2014-04-28 13:35:13 +0200
committerPetr Viktorin <pviktori@redhat.com>2014-04-30 22:16:28 +0200
commitc3d7e66291987149b3b9a019945179c54debfbf1 (patch)
tree6d4ce7e3b675b57113abcf34a95ee8958f3a2f04 /ipalib
parentbe6edef6e48224e74344f48d25876b09cd263674 (diff)
downloadfreeipa-c3d7e66291987149b3b9a019945179c54debfbf1.tar.gz
freeipa-c3d7e66291987149b3b9a019945179c54debfbf1.tar.xz
freeipa-c3d7e66291987149b3b9a019945179c54debfbf1.zip
ipalib.aci: Allow alternate "aci" keyword in ACIs
Dogtag adds some ACIs that use an alternate keyword: version 3.0; aci instead of version 3.0; acl Add support for this so the parser does not fail on these ACIs. Reviewed-By: Rob Crittenden <rcritten@redhat.com>
Diffstat (limited to 'ipalib')
-rwxr-xr-xipalib/aci.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipalib/aci.py b/ipalib/aci.py
index 5f33b81fe..cea61a9c4 100755
--- a/ipalib/aci.py
+++ b/ipalib/aci.py
@@ -23,7 +23,7 @@ import re
# The Python re module doesn't do nested parenthesis
# Break the ACI into 3 pieces: target, name, permissions/bind_rules
-ACIPat = re.compile(r'\(version\s+3.0\s*;\s*acl\s+\"([^\"]*)\"\s*;\s*([^;]*);\s*\)', re.UNICODE)
+ACIPat = re.compile(r'\(version\s+3.0\s*;\s*ac[li]\s+\"([^\"]*)\"\s*;\s*([^;]*);\s*\)', re.UNICODE)
# Break the permissions/bind_rules out
PermPat = re.compile(r'(\w+)\s*\((.*)\)\s+(.*)', re.UNICODE)