From 7f790e3aa2ebc41207a22249e6b10b32b760c0b2 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@wookie.(none)>
Date: Tue, 21 Jul 2009 14:13:26 -0700
Subject: [PATCH] Don't call generate_matrix() during 'check'

---
 Shorewall/Perl/Shorewall/Compiler.pm | 14 +++++++-------
 Shorewall/Perl/Shorewall/Rules.pm    |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Shorewall/Perl/Shorewall/Compiler.pm b/Shorewall/Perl/Shorewall/Compiler.pm
index 7260c6cfb..eddc3d79e 100644
--- a/Shorewall/Perl/Shorewall/Compiler.pm
+++ b/Shorewall/Perl/Shorewall/Compiler.pm
@@ -43,7 +43,7 @@ use Shorewall::Raw;
 our @ISA = qw(Exporter);
 our @EXPORT = qw( compiler EXPORT TIMESTAMP DEBUG );
 our @EXPORT_OK = qw( $export );
-our $VERSION = '4.3_12';
+our $VERSION = '4.4_0';
 
 our $export;
 
@@ -725,9 +725,9 @@ sub compiler {
     unless ( $command eq 'check' ) {
 	pop_indent;
 	emit "}\n";
-	disable_object;
     }
 
+    disable_object;
     #
     #                                       N E T F I L T E R
     #       (Produces no output to the compiled script -- rules are stored in the chain table)
@@ -782,11 +782,6 @@ sub compiler {
     # Accounting.
     #
     setup_accounting;
-    #
-    # We generate the matrix even though we don't write out the rules. That way, we insure that
-    # a compile of the script won't blow up during that step.
-    #
-    generate_matrix;
 
     if ( $command eq 'check' ) {
 	if ( $family == F_IPV4 ) {
@@ -795,6 +790,11 @@ sub compiler {
 	    progress_message3 "Shorewall6 configuration verified";
 	}
     } else {
+	#
+	# Generate the zone x zone matrix
+	#
+	generate_matrix;
+
 	enable_object;
 	#
 	#                                    I N I T I A L I Z E
diff --git a/Shorewall/Perl/Shorewall/Rules.pm b/Shorewall/Perl/Shorewall/Rules.pm
index c497eaffd..4145ba3a8 100644
--- a/Shorewall/Perl/Shorewall/Rules.pm
+++ b/Shorewall/Perl/Shorewall/Rules.pm
@@ -1634,8 +1634,8 @@ sub generate_matrix() {
 
 	if ( $chainref->{policy} ne 'CONTINUE' ) {
 	    my $policyref = $filter_table->{$chainref->{policychain}};
-	    return $policyref->{name} if $policyref;
-	    fatal_error "No policy defined for zone $zone to zone $zone1";
+	    assert( $policyref );
+	    return $policyref->{name} if 
 	}
 
 	''; # CONTINUE policy