extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-24 03:31:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.1.5'

Browse Source
This commit is contained in:
Tom Eastep 2017-07-20 10:37:53 -07:00
commit b9b7baf98d
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Shorewall/Perl/Shorewall/Rules.pm
View File

@ -5642,15 +5642,23 @@ sub process_snat( )
sub setup_snat( $ ) # Convert masq->snat if true sub setup_snat( $ ) # Convert masq->snat if true
{ {
my $fn; my $fn;
my $have_masq;
convert_masq() if $_[0]; if ( $_[0] ) {
convert_masq();
if ( $fn = open_file( 'masq', 1, 1 ) ) { } elsif ( $fn = open_file( 'masq', 1, 1 ) ) {
first_entry( sub { progress_message2 "$doing $fn..."; require_capability 'NAT_ENABLED' , "a non-empty masq file" , 's'; } ); first_entry( sub { progress_message2 "$doing $fn..."; require_capability 'NAT_ENABLED' , "a non-empty masq file" , 's'; } );
process_one_masq(0) while read_a_line( NORMAL_READ ); process_one_masq(0), $have_masq = 1 while read_a_line( NORMAL_READ );
} elsif ( $fn = open_file( 'snat', 1, 1 ) ) { }
first_entry( sub { progress_message2 "$doing $fn..."; require_capability 'NAT_ENABLED' , "a non-empty snat file" , 's'; } );
process_snat while read_a_line( NORMAL_READ ); unless ( $have_masq ) {
#
# Masq file empty or didn't exist
#
if ( $fn = open_file( 'snat', 1, 1 ) ) {
first_entry( sub { progress_message2 "$doing $fn..."; require_capability 'NAT_ENABLED' , "a non-empty snat file" , 's'; } );
process_snat while read_a_line( NORMAL_READ );
}
} }
} }

13
docs/Documentation_Index.xml
View File

@ -417,7 +417,8 @@
<row> <row>
<entry><ulink url="IPv6Support.html">IPv6 Support</ulink></entry> <entry><ulink url="IPv6Support.html">IPv6 Support</ulink></entry>
<entry><ulink url="Events.html">Shorewall Events</ulink></entry> <entry><ulink url="SharedConfig.html">Shared Shorewall/Shorewall6
Configuration</ulink></entry>
<entry/> <entry/>
</row> </row>
@ -426,8 +427,7 @@
<entry><ulink url="ISO-3661.html">ISO 3661 Country <entry><ulink url="ISO-3661.html">ISO 3661 Country
Codes</ulink></entry> Codes</ulink></entry>
<entry><ulink url="Shorewall-init.html">Shorewall <entry><ulink url="Events.html">Shorewall Events</ulink></entry>
Init</ulink></entry>
<entry/> <entry/>
</row> </row>
@ -436,8 +436,8 @@
<entry><ulink url="Shorewall_and_Kazaa.html">Kazaa <entry><ulink url="Shorewall_and_Kazaa.html">Kazaa
Filtering</ulink></entry> Filtering</ulink></entry>
<entry><ulink url="Shorewall-Lite.html">Shorewall <entry><ulink url="Shorewall-init.html">Shorewall
Lite</ulink></entry> Init</ulink></entry>
<entry/> <entry/>
</row> </row>
@ -446,7 +446,8 @@
<entry><ulink url="kernel.htm">Kernel <entry><ulink url="kernel.htm">Kernel
Configuration</ulink></entry> Configuration</ulink></entry>
<entry/> <entry><ulink url="Shorewall-Lite.html">Shorewall
Lite</ulink></entry>
<entry/> <entry/>
</row> </row>