From c20611b6c06c63346165d425d4a4e142d7c78368 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Mon, 20 Aug 2012 18:09:59 -0700 Subject: [PATCH 1/2] Add CONTINUE keyword to the masq file Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Nat.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Shorewall/Perl/Shorewall/Nat.pm b/Shorewall/Perl/Shorewall/Nat.pm index 1a23a28c0..51ffdaadd 100644 --- a/Shorewall/Perl/Shorewall/Nat.pm +++ b/Shorewall/Perl/Shorewall/Nat.pm @@ -177,6 +177,8 @@ sub process_one_masq( ) if ( $addresses =~ /^SAME/ ) { fatal_error "The SAME target is no longer supported"; + } elsif ( $addresses eq 'CONTINUE' ) { + $target = 'ACCEPT'; } elsif ( $addresses eq 'detect' ) { my $variable = get_interface_address $interface; $target = "SNAT --to-source $variable"; From 64edd30a76c992bc7de44df8ffb0fb31a5d85744 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Tue, 21 Aug 2012 07:54:51 -0700 Subject: [PATCH 2/2] Correct link in shorewall[6].conf manpages Signed-off-by: Tom Eastep --- Shorewall/manpages/shorewall.conf.xml | 2 +- Shorewall6/manpages/shorewall6.conf.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Shorewall/manpages/shorewall.conf.xml b/Shorewall/manpages/shorewall.conf.xml index d47f37cfe..bc010f3d8 100644 --- a/Shorewall/manpages/shorewall.conf.xml +++ b/Shorewall/manpages/shorewall.conf.xml @@ -720,7 +720,7 @@ net all DROP infothen the chain name is 'net2all' Added in Shorewall 4.5.4. Specifies the pathname of the directory containing the GeoIP Match database. See http://www.shorewall.net/ISOCODES.html. + url="http://www.shorewall.net/ISO-3661.html">http://www.shorewall.net/ISO-3661.html. If not specified, the default value is /usr/share/xt_geoip/LE which is the default location of the little-endian database. diff --git a/Shorewall6/manpages/shorewall6.conf.xml b/Shorewall6/manpages/shorewall6.conf.xml index 37d7c5308..7f7d38de0 100644 --- a/Shorewall6/manpages/shorewall6.conf.xml +++ b/Shorewall6/manpages/shorewall6.conf.xml @@ -629,7 +629,7 @@ net all DROP infothen the chain name is 'net2all' Added in Shorewall 4.5.4. Specifies the pathname of the directory containing the GeoIP Match database. See http://www.shorewall.net/ISOCODES.html. + url="http://www.shorewall.net/ISO-3661.html">http://www.shorewall.net/ISO-3661.html. If not specified, the default value is /usr/share/xt_geoip/LE which is the default location of the little-endian database.