Merge pull request #7968 from bcoca/acl_fix_compare
acl module: now compares permissions correctly
This commit is contained in:
commit
0221727050
1 changed files with 13 additions and 10 deletions
23
files/acl
23
files/acl
|
@ -102,6 +102,17 @@ EXAMPLES = '''
|
|||
register: acl_info
|
||||
'''
|
||||
|
||||
def normalize_permissions(p):
|
||||
perms = ['-','-','-']
|
||||
for char in p:
|
||||
if char == 'r':
|
||||
perms[0] = 'r'
|
||||
if char == 'w':
|
||||
perms[1] = 'w'
|
||||
if char == 'x':
|
||||
perms[2] = 'x'
|
||||
return ''.join(perms)
|
||||
|
||||
def split_entry(entry):
|
||||
''' splits entry and ensures normalized return'''
|
||||
|
||||
|
@ -129,15 +140,7 @@ def split_entry(entry):
|
|||
else:
|
||||
t = None
|
||||
|
||||
perms = ['-','-','-']
|
||||
for char in p:
|
||||
if char == 'r':
|
||||
perms[0] = 'r'
|
||||
if char == 'w':
|
||||
perms[1] = 'w'
|
||||
if char == 'x':
|
||||
perms[2] = 'x'
|
||||
p = ''.join(perms)
|
||||
p = normalize_permissions(p)
|
||||
|
||||
return [d,t,e,p]
|
||||
|
||||
|
@ -208,7 +211,7 @@ def main():
|
|||
entry = module.params.get('entry')
|
||||
entity = module.params.get('entity')
|
||||
etype = module.params.get('etype')
|
||||
permissions = module.params.get('permissions')
|
||||
permissions = normalize_permissions(module.params.get('permissions'))
|
||||
state = module.params.get('state')
|
||||
follow = module.params.get('follow')
|
||||
default = module.params.get('default')
|
||||
|
|
Loading…
Reference in a new issue