Fix #300 for match extension protocol #302
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
So... puppetlabs#300 fixed matching `-m (tcp|udp)` at the beginning of `-m multiport` or `--dport` or `--sport` rules, but broke actual *creation* of those rules because `-m (tcp|udp)` was used as an iptables argument, which it is not. This change removes the problematic argument from `@resource_map` and instead just substitutes `-m (tcp|udp)` out of any existing rules before matching. The `-m tcp` match extension arguments are optional anyway, and not needed for iptables functionality and don't change the semantics at all.
apenney
pushed a commit
that referenced
this pull request
Feb 6, 2014
Fix #300 for match extension protocol
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
So... #300 fixed matching
-m (tcp|udp)at the beginning of-m multiportor--dportor--sportrules, but broke actual creationof those rules because
-m (tcp|udp)was used as an iptables argument,which it is not.
This change removes the problematic argument from
@resource_mapandinstead just substitutes
-m (tcp|udp)out of any existing rules beforematching. The
-m tcpmatch extension arguments are optional anyway,and not needed for iptables functionality and don't change the semantics
at all.