From 29a93b2bae90b796bf9432a0f9f2caf15a2eddff Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sun, 3 Oct 2004 23:39:46 +0000
Subject: [PATCH] Update some error messages

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1659 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall2/firewall  | 14 +++-----------
 Shorewall2/shorewall |  4 ++--
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/Shorewall2/firewall b/Shorewall2/firewall
index a68db0718..1dd5ff214 100755
--- a/Shorewall2/firewall
+++ b/Shorewall2/firewall
@@ -977,7 +977,7 @@ validate_hosts_file() {
 			;;
 		    ipsec)
 			[ -n "$POLICY_MATCH" ] || \
-			    startup_error "Your kernel and/or iptables does not not support policy match: ipsec"
+			    startup_error "Your kernel and/or iptables does not support policy match: ipsec"
 			eval ${z}_ipsec_hosts=\"\$${z}_ipsec_hosts $interface:$host\"
 			eval ${z}_is_complex=Yes
 			;;
@@ -1590,7 +1590,7 @@ setup_tunnels() # $1 = name of tunnels file
 		    addrule ${z}2${FW} -p udp --dport 4500 $options
 		fi
 	    else
-		fatal_error ": Invalid gateway zone ($z) -- Tunnel \"$tunnel\""
+		fatal_error "Invalid gateway zone ($z) -- Tunnel \"$tunnel\""
 	    fi
 	done
 
@@ -1924,14 +1924,6 @@ setup_mac_lists() {
     # Be sure that they are all ethernet interfaces
     #
     for interface in $maclist_interfaces; do
-	case $interface in
-	    eth*|wlan*|br[0-9]|ath[0-9])
-		;;
-	    *)
-		fatal_error "MAC verification is only supported on ethernet and 802.11b devices: $interface"
-		;;
-	esac
-
 	createchain $(mac_chain $interface) no
     done
     #
@@ -3257,7 +3249,7 @@ process_actions1() {
 	    case $xaction in
 		*:*)
 		    temp=${xaction#*:}
-		    [ ${#temp} -le 11 ] || fatal_error "Action Name Longer than 11 Characters: $temp"
+		    [ ${#temp} -le 30 ] || fatal_error "Action Name Longer than 30 Characters: $temp"
 		    xaction=${xaction%:*}
 		    case $temp in
 			ACCEPT|REJECT|DROP)
diff --git a/Shorewall2/shorewall b/Shorewall2/shorewall
index 78a715473..7de91b39b 100755
--- a/Shorewall2/shorewall
+++ b/Shorewall2/shorewall
@@ -1131,7 +1131,7 @@ case "$1" in
 	    else
 		case $RESTOREFILE in
 		    save|restore-base)
-			echo "   ERROR: Reserved file name: save"
+			echo "   ERROR: Reserved file name: $RESTOREFILE"
 			;;
 		    *)
 			if iptables -L dynamic -n > /var/lib/shorewall/save; then
@@ -1182,7 +1182,7 @@ case "$1" in
 	    rm -f $RESTOREPATH
 	    echo "    $RESTOREPATH removed"
 	elif [ -f $RESTOREPATH ]; then
-	    echo "   ERROR: $RESTOREPATH is not a restore script"
+	    echo "   $RESTOREPATH exists and is not a saved Shorewall configuration"
 	fi
 	;;
     ipcalc)