From 69be03858319c46269e4daa6495982f1af6c946d Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Fri, 27 Apr 2007 15:15:13 +0000
Subject: [PATCH] Fix setting of ORIGINAL_POLICY_MATCH

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6134 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-perl/Shorewall/Config.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Shorewall-perl/Shorewall/Config.pm b/Shorewall-perl/Shorewall/Config.pm
index a160bc287..c36536f1d 100644
--- a/Shorewall-perl/Shorewall/Config.pm
+++ b/Shorewall-perl/Shorewall/Config.pm
@@ -66,6 +66,7 @@ our @VERSION = 1.00;
 our %globals  =   ( SHAREDIR => '/usr/share/shorewall' ,
 		    CONFDIR =>  '/etc/shorewall',
 		    SHAREDIRPL => '/usr/share/shorewall-perl/',
+		    ORIGINAL_POLICY_MATCH => '',
 		    LOGPARMS => '',
 		    TC_SCRIPT => '',
 		    VERSION =>  '3.9.4',
@@ -158,7 +159,6 @@ our %config =
 		MACLIST_DISPOSITION => undef,
 		TCP_FLAGS_DISPOSITION => undef,
 		BLACKLIST_DISPOSITION => undef,
-		ORIGINAL_POLICY_MATCH => undef,
 		);
 #
 # Config options and global settings that are to be copied to object
@@ -839,7 +839,6 @@ sub get_configuration( $ ) {
 	open_file 'capabilities' or fatal_error "Compiling under an ordinary user id requires a capabilities file";
     }
 
-    $globals{ORIGINAL_POLICY_MATCH} = $capabilities{POLICY_MATCH};
 
     #
     # If we successfully called open_file above, then this loop will read the capabilities file.
@@ -859,6 +858,8 @@ sub get_configuration( $ ) {
 	}
     }
 
+    $globals{ORIGINAL_POLICY_MATCH} = $capabilities{POLICY_MATCH};
+
     if ( $config{LOGRATE} || $config{LOGBURST} ) {
 	 $globals{LOGLIMIT}  = '-m limit';
 	 $globals{LOGLIMIT} .= " --limit $config{LOGRATE}"        if $config{LOGRATE};