valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #19750 from techhat/xmark

Browse Source 
Move --set-xmark after iptables jump
This commit is contained in:
Thomas S Hatch 2015-01-15 10:13:27 -07:00
commit 2fd489d5bf
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/modules/iptables.py
View File

@ -297,6 +297,10 @@ def build_rule(table=None, chain=None, command=None, position='', full=None, fam
after_jump.append('--set-mark {0} '.format(kwargs['set-mark']))
del kwargs['set-mark']
if 'set-xmark' in kwargs:
after_jump.append('--set-xmark {0} '.format(kwargs['set-xmark']))
del kwargs['set-xmark']
for item in kwargs:
if str(kwargs[item]).startswith('!') or str(kwargs[item]).startswith('not'):
kwargs[item] = re.sub(bang_not_pat, '', kwargs[item])