saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix code for proto args in modules.iptables

Browse source 
In modules.iptables.build_rule:
  Fix incorrect output when providing proto='!tcp'
  Make salt cleverer when both 'protocol' and 'proto' in kwargs.

NOTE: Conflicts in merge commit 000de95 are wrong dealed with.
This commit is contained in:
Xiami 2016-03-23 18:19:18 +08:00
parent 3e08dd0a93
commit aae3af7e49
1 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
salt/modules/iptables.py
View file

@ -195,22 +195,12 @@ def build_rule(table='filter', chain=None, command=None, position='', full=None,
rule.append('{0}-o {1}'.format(maybe_add_negation('of'), kwargs['of']))
del kwargs['of']
if 'protocol' in kwargs:
proto = kwargs['protocol']
proto_negation = maybe_add_negation('protocol')
del kwargs['protocol']
elif 'proto' in kwargs:
proto = kwargs['proto']
proto_negation = maybe_add_negation('proto')
del kwargs['proto']
if proto:
if proto.startswith('!') or proto.startswith('not'):
proto = re.sub(bang_not_pat, '', proto)
rule += '! '
rule.append('{0}-p {1}'.format(proto_negation, proto))
proto = True
for proto_arg in ('protocol', 'proto'):
if proto_arg in kwargs:
if not proto:
rule.append('{0}-p {1}'.format(maybe_add_negation(proto_arg), kwargs[proto_arg]))
proto = True
del kwargs[proto_arg]
if 'match' in kwargs:
match_value = kwargs['match']