extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-24 15:18:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 4.5.7

Browse Source
This commit is contained in:
Tom Eastep 2012-08-21 07:55:11 -07:00
commit a789b18615
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall/Perl/Shorewall/Nat.pm
View File

@ -177,6 +177,8 @@ sub process_one_masq( )
if ( $addresses =~ /^SAME/ ) { if ( $addresses =~ /^SAME/ ) {
fatal_error "The SAME target is no longer supported"; fatal_error "The SAME target is no longer supported";
} elsif ( $addresses eq 'CONTINUE' ) {
$target = 'ACCEPT';
} elsif ( $addresses eq 'detect' ) { } elsif ( $addresses eq 'detect' ) {
my $variable = get_interface_address $interface; my $variable = get_interface_address $interface;
$target = "SNAT --to-source $variable"; $target = "SNAT --to-source $variable";

2
Shorewall/manpages/shorewall.conf.xml
View File

@ -720,7 +720,7 @@ net all DROP info</programlisting>then the chain name is 'net2all'
<para>Added in Shorewall 4.5.4. Specifies the pathname of the <para>Added in Shorewall 4.5.4. Specifies the pathname of the
directory containing the <firstterm>GeoIP Match</firstterm> directory containing the <firstterm>GeoIP Match</firstterm>
database. See <ulink database. See <ulink
url="http://www.shorewall.net/ISOCODES.html">http://www.shorewall.net/ISOCODES.html</ulink>. url="http://www.shorewall.net/ISO-3661.html">http://www.shorewall.net/ISO-3661.html</ulink>.
If not specified, the default value is If not specified, the default value is
<filename>/usr/share/xt_geoip/LE</filename> which is the default <filename>/usr/share/xt_geoip/LE</filename> which is the default
location of the little-endian database.</para> location of the little-endian database.</para>

2
Shorewall6/manpages/shorewall6.conf.xml
View File

@ -629,7 +629,7 @@ net all DROP info</programlisting>then the chain name is 'net2all'
<para>Added in Shorewall 4.5.4. Specifies the pathname of the <para>Added in Shorewall 4.5.4. Specifies the pathname of the
directory containing the <firstterm>GeoIP Match</firstterm> directory containing the <firstterm>GeoIP Match</firstterm>
database. See <ulink database. See <ulink
url="http://www.shorewall.net/ISOCODES.html">http://www.shorewall.net/ISOCODES.html</ulink>. url="http://www.shorewall.net/ISO-3661.html">http://www.shorewall.net/ISO-3661.html</ulink>.
If not specified, the default value is If not specified, the default value is
<filename>/usr/share/xt_geoip/LE</filename> which is the default <filename>/usr/share/xt_geoip/LE</filename> which is the default
location of the little-endian database.</para> location of the little-endian database.</para>