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 iptables --match-set (#23643) (#33301)

Browse source 
Function is expecting two arguments. But after processing state only one
parameter (it contain two words) is pushed into list of options.
This patch reverts the parsing of "iptables --match-set" to the behaviour
of salt v2014.*.

This is a backport of https://github.com/saltstack/salt/pull/28325

Closes #23643
This commit is contained in:
gerhardqux 2016-05-17 18:24:14 +02:00 • committed by Nicole Thomas
parent 757ef20a31
commit 8acee5e06c
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/modules/iptables.py
View file

@ -1178,7 +1178,7 @@ def _parser():
## sctp
add_arg('--chunk-types', dest='chunk-types', action='append')
## set
add_arg('--match-set', dest='match-set', action='append', nargs=2)
add_arg('--match-set', dest='match-set', action='append')
add_arg('--return-nomatch', dest='return-nomatch', action='append')
add_arg('--update-counters', dest='update-counters', action='append')
add_arg('--update-subcounters', dest='update-subcounters', action='append')