From 0349a9a88c8b852c14fdc391273fa99cc60ae0f4 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Tue, 19 Feb 2013 13:05:24 -0800
Subject: [PATCH] Rename the IPv6 masq file 'snat'.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/Perl/Shorewall/Nat.pm                           | 6 ++++--
 Shorewall6/configfiles/{masq => snat}                     | 6 +++---
 .../manpages/{shorewall6-masq.xml => shorewall6-snat.xml} | 8 ++++----
 3 files changed, 11 insertions(+), 9 deletions(-)
 rename Shorewall6/configfiles/{masq => snat} (76%)
 rename Shorewall6/manpages/{shorewall6-masq.xml => shorewall6-snat.xml} (99%)

diff --git a/Shorewall/Perl/Shorewall/Nat.pm b/Shorewall/Perl/Shorewall/Nat.pm
index 9179d8744..fa8e42546 100644
--- a/Shorewall/Perl/Shorewall/Nat.pm
+++ b/Shorewall/Perl/Shorewall/Nat.pm
@@ -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 );
     }
diff --git a/Shorewall6/configfiles/masq b/Shorewall6/configfiles/snat
similarity index 76%
rename from Shorewall6/configfiles/masq
rename to Shorewall6/configfiles/snat
index c8b582bb6..c7f3773d5 100644
--- a/Shorewall6/configfiles/masq
+++ b/Shorewall6/configfiles/snat
@@ -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
diff --git a/Shorewall6/manpages/shorewall6-masq.xml b/Shorewall6/manpages/shorewall6-snat.xml
similarity index 99%
rename from Shorewall6/manpages/shorewall6-masq.xml
rename to Shorewall6/manpages/shorewall6-snat.xml
index 19eb6fb2d..20a0a8287 100644
--- a/Shorewall6/manpages/shorewall6-masq.xml
+++ b/Shorewall6/manpages/shorewall6-snat.xml
@@ -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>