From bb8a928f9b5b2d732ab764a3096309f718ffa0fa Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Mon, 3 Oct 2005 17:39:36 +0000
Subject: [PATCH] Detect multiple firewall zones; fix inappropriate call to
 fatal_error; Display the firewall zone name

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2776 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/firewall | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Shorewall/firewall b/Shorewall/firewall
index 59d4a1598..131116a61 100755
--- a/Shorewall/firewall
+++ b/Shorewall/firewall
@@ -561,6 +561,7 @@ determine_zones()
 		    merge_zone
 		    ;;
 		firewall)
+		    [ -n "$FW" ] && startup_error "Only one firewall zone may be defined"
 		    list_search $zone $ZONES && startup_error "Zone $zone is defined more than once"
 		    [ -n "$parents" ] && startup_error "The firewall zone may not be nested"
 		    for r in $rest; do
@@ -1442,7 +1443,7 @@ validate_hosts_file() {
 	       hosts=${hosts#*:}
 	       ;;
 	   *)
-	       fatal_error "Invalid HOST(S) column contents: $hosts"
+	       startup_error "Invalid HOST(S) column contents: $hosts"
 	       ;;
        esac
 
@@ -3727,6 +3728,7 @@ check_config() {
     determine_zones
 
     display_list "Zones:" $ZONES
+    display_list "Firewall Zone:" $FW
 
     setup_ipsec