From a42ba57102d02732b91af0f3097748cbc8a56af0 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sun, 14 Dec 2008 19:49:03 +0000
Subject: [PATCH] Fix a couple of more bugs (one serious)

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9052 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-perl/Shorewall/Compiler.pm | 4 ++--
 Shorewall-perl/Shorewall/Zones.pm    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Shorewall-perl/Shorewall/Compiler.pm b/Shorewall-perl/Shorewall/Compiler.pm
index db3cf47d0..f238fdcf8 100644
--- a/Shorewall-perl/Shorewall/Compiler.pm
+++ b/Shorewall-perl/Shorewall/Compiler.pm
@@ -248,7 +248,7 @@ sub generate_script_1() {
 	       'result=$?',
 	       'qt1 $IP6TABLES -F foox1234',
 	       'qt1 $IP6TABLES -X foox1234',
-	       '[ $result = 0 ] || startup_error "Your kernel/iptables do not include state match support. No version of Shorewall6 will run on this system"',
+	       '[ $result = 0 ] || startup_error "Your kernel/ip6tables do not include state match support. No version of Shorewall6 will run on this system"',
 	       '' );
     }
 
@@ -272,7 +272,7 @@ EOF
 	      '        qt $IPTABLES -L $1 -n && qt $IPTABLES -F $1 && qt $IPTABLES -X $1' );
     } else {
 	emit( '    deletechain() {',
-	      '         qt $IPTABLES -L $1 -n && qt $IPTABLES -F $1 && qt $IPTABLES -X $1' );
+	      '         qt $IP6TABLES -L $1 -n && qt $IP6TABLES -F $1 && qt $IP6TABLES -X $1' );
     }
 
     emit <<'EOF';
diff --git a/Shorewall-perl/Shorewall/Zones.pm b/Shorewall-perl/Shorewall/Zones.pm
index 455369ece..ff2a4d4ed 100644
--- a/Shorewall-perl/Shorewall/Zones.pm
+++ b/Shorewall-perl/Shorewall/Zones.pm
@@ -391,7 +391,7 @@ sub zone_report()
 			    if ( $family == F_IPV4 ) {
 				progress_message_nocompress "      $interface:$grouplist";
 			    } else {
-				progress_message_nocompress "      $interface:\[$grouplist\]";
+				progress_message_nocompress "      $interface:<$grouplist>";
 			    }
 			    $printed = 1;
 			}
@@ -450,7 +450,7 @@ sub dump_zone_contents()
 			    if ( $family == F_IPV4 ) {
 				$entry .= " $interface:$grouplist";
 			    } else {
-				$entry .= " $interface:\[$grouplist\]";
+				$entry .= " $interface:<$grouplist>";
 			    }
 			}
 		    }