holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Rename the IPv6 masq file 'snat'.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2013-02-19 13:05:24 -08:00
parent 524d6242b0
commit 0349a9a88c
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -332,9 +332,11 @@ sub process_one_masq( )
#
sub setup_masq()
{
if ( my $fn = open_file( 'masq', 1, 1 ) ) {
my $name = $family == F_IPV4 ? 'masq' : 'snat';
first_entry( sub { progress_message2 "$doing $fn..."; require_capability 'NAT_ENABLED' , 'a non-empty masq file' , 's'; } );
if ( my $fn = open_file( $name, 1, 1 ) ) {
first_entry( sub { progress_message2 "$doing $fn..."; require_capability 'NAT_ENABLED' , 'a non-empty $name file' , 's'; } );
process_one_masq while read_a_line( NORMAL_READ );
}

6
Shorewall6/configfiles/masq → Shorewall6/configfiles/snat
View File

@ -1,10 +1,10 @@
#
# Shorewall6 version 4 - Masq file
# Shorewall6 version 4 - SNAT file
#
# For information about entries in this file, type "man shorewall6-masq"
# For information about entries in this file, type "man shorewall6-snat"
#
# The manpage is also online at
# http://www.shorewall.net/manpages6/shorewall6-masq.html
# http://www.shorewall.net/manpages6/shorewall6-snat.html
#
########################################################################################################################
#INTERFACE SOURCE ADDRESS PROTO PORT(S) IPSEC MARK USER/ SWITCH ORIGINAL

8
Shorewall6/manpages/shorewall6-masq.xml → Shorewall6/manpages/shorewall6-snat.xml
View File

@ -3,20 +3,20 @@
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<refentry>
<refmeta>
<refentrytitle>shorewall6-masq</refentrytitle>
<refentrytitle>shorewall6-snat</refentrytitle>
<manvolnum>5</manvolnum>
</refmeta>
<refnamediv>
<refname>masq</refname>
<refname>snat</refname>
<refpurpose>Shorewall6 SNAT definition file</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
<command>/etc/shorewall6/masq</command>
<command>/etc/shorewall6/snat</command>
</cmdsynopsis>
</refsynopsisdiv>
@ -511,6 +511,6 @@
<refsect1>
<title>FILES</title>
<para>/etc/shorewall6/masq</para>
<para>/etc/shorewall6/snat</para>
</refsect1>
</refentry>