diff options
| author | Micah Anderson <micah@riseup.net> | 2018-03-24 16:39:33 +0100 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2018-03-24 16:39:33 +0100 |
| commit | 37bb199434a193dbcd2ad8e42bc5cb024718b884 (patch) | |
| tree | 504b5aa469b71494c508a4e82e3c8010085e08b5 | |
| parent | 00d7e707917a28816ea34589318390fe4f185c73 (diff) | |
This fixes the ?SECTION change.
The change requiring ? before SECTION happened in 4.6.0. Our check was only
looking at the major version to see if it was 4, and if so, it would not add the
?. This was too imprecise and would not add the ? in versions of shorewall 4.6
and greater. So this commit will change that check to be more specific.
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | manifests/rule_section.pp | 2 |
2 files changed, 1 insertions, 2 deletions
@@ -84,7 +84,6 @@ the following: * the rfc1918 file and norfc1918 option are deprecated * the tcrules file is deprecated, replaced by mangled * the routestopped file is deprecated and replaced by stoppedrules -* as of shorewall 4.6.0, SECTION headers need a leading '?' You should migrate your own calls to this module to move to the currently supported methods, we will be dropping support for deprecated features as diff --git a/manifests/rule_section.pp b/manifests/rule_section.pp index 24b3dfb..620af89 100644 --- a/manifests/rule_section.pp +++ b/manifests/rule_section.pp @@ -2,7 +2,7 @@ define shorewall::rule_section( $order, ){ - if versioncmp($shorewall_major_version,'4') > 0 { + if versioncmp($shorewall_version,'4.6.0') > 0 { $rule_section_prefix = '?' } else { $rule_section_prefix = '' |