cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

pamd: fix idempotence issue when removing rules (#54105)

Browse source
This commit is contained in:
Łukasz Szczęsny 2019-04-01 16:18:33 +02:00 committed by Sam Doran
parent f405d97e1e
commit bcdd1dc951
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/pamd-make-idempotence-fix.yaml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- pamd - fix idempotence issue when removing rules

2
lib/ansible/modules/system/pamd.py
View file

@ -482,7 +482,7 @@ class PamdService(object):
else: else:
self._head = current_line.next self._head = current_line.next
current_line.next.prev = None current_line.next.prev = None
changed += 1 changed += 1
current_line = current_line.next current_line = current_line.next
return changed return changed

2
test/units/modules/system/test_pamd.py
View file

@ -349,5 +349,7 @@ session required pam_unix.so"""
def test_remove_rule(self): def test_remove_rule(self):
self.assertTrue(self.pamd.remove('account', 'required', 'pam_unix.so')) self.assertTrue(self.pamd.remove('account', 'required', 'pam_unix.so'))
# Second run should not change anything
self.assertFalse(self.pamd.remove('account', 'required', 'pam_unix.so'))
test_rule = PamdRule('account', 'required', 'pam_unix.so') test_rule = PamdRule('account', 'required', 'pam_unix.so')
self.assertNotIn(str(test_rule), str(self.pamd)) self.assertNotIn(str(test_rule), str(self.pamd))