ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-16 18:05:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixes #35629 (#35668)

Browse source
This commit is contained in:
Ken Evensen 2018-02-05 16:47:14 -05:00 • committed by Adam Miller
parent 754dd89d86
commit 5cce0249f3
2 changed files with 26 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -302,14 +302,13 @@ class PamdRule(object):
complicated = True
else:
pattern = re.compile(
r"""([\-A-Za-z0-9_]+)\s* # Rule Type
([A-Za-z0-9_]+)\s* # Rule Control
([A-Za-z0-9/_\-\.]+)\s* # Rule Path
r"""([@\-A-Za-z0-9_]+)\s* # Rule Type
([A-Za-z0-9_\-]+)\s* # Rule Control
([A-Za-z0-9/_\-\.]*)\s* # Rule Path
([A-Za-z0-9,_=<>\-\s\./]*)""", # Rule Args
re.X)
result = pattern.match(stringline)
rule_type = result.group(1)
if complicated:
rule_control = '[' + result.group(2) + ']'
@ -353,13 +352,13 @@ class PamdService(object):
self.name = self.ansible.params["name"]
def load_rules_from_file(self):
self.fname = self.path + "/" + self.name
self.fname = os.path.join(self.path, self.name)
stringline = ''
try:
for line in open(self.fname, 'r'):
stringline += line.rstrip()
stringline += line.rstrip().lstrip()
stringline += '\n'
self.load_rules_from_string(stringline)
self.load_rules_from_string(stringline.replace("\\\n", ""))
except IOError:
e = get_exception()
@ -375,6 +374,10 @@ class PamdService(object):
elif (not line.startswith('#') and
not line.isspace() and
len(line) != 0):
try:
self.ansible.log(msg="Creating rule from string %s" % stringline)
except AttributeError:
pass
self.rules.append(PamdRule.rulefromstring(stringline))
def write(self):