Compare commits

...

2 commits

Author SHA1 Message Date
Silejonu
6c34555e0c
Merge 392fd0deaa into 1994b2cf1c 2025-05-10 07:59:30 +00:00
Silejonu
392fd0deaa fix(acl): correctly assert needed changes when recursive is true 2025-05-10 09:59:10 +02:00
2 changed files with 9 additions and 1 deletions

View file

@ -0,0 +1,2 @@
bugfixes:
- acl - correctly assert needed changes when pointing to a directory and recursive is set to true.

View file

@ -243,13 +243,19 @@ def acl_changed(module, cmd, entry, use_nfsv4_acls=False):
cmd.insert(1, '--test')
lines = run_acl(module, cmd)
counter = 0
lines_checked = 0
lines_unchanged = 0
for line in lines:
lines_checked += 1
if line.endswith('*,*') and not use_nfsv4_acls:
return False
lines_unchanged += 1
# if use_nfsv4_acls and entry is listed
if use_nfsv4_acls and entry == line:
counter += 1
if lines_unchanged == lines_checked:
return False
# The current 'nfs4_setfacl --test' lists a new entry,
# which will be added at the top of list, followed by the existing entries.
# So if the entry has already been registered, the entry should be find twice.