From 148c62f69ef0b9fe6c583f665e2d9d5bbe22695f Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sat, 21 Jul 2007 23:35:07 +0000
Subject: [PATCH] I've got to stop messing with this...

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

diff --git a/Shorewall-perl/Shorewall/Config.pm b/Shorewall-perl/Shorewall/Config.pm
index 1624e04ec..d20ccee54 100644
--- a/Shorewall-perl/Shorewall/Config.pm
+++ b/Shorewall-perl/Shorewall/Config.pm
@@ -877,12 +877,8 @@ sub read_a_line() {
 	    #
 	    # Expand Shell Variables using %ENV
 	    #
-	    while ( $currentline =~ m( ^(.*?)        # Part preceding '$'
-                                       \$({)?        # '$' and optional '{'
-                                       ([a-zA-Z]\w*) # Shell Variable Name
-                                       (?(2)})       # Match opening '{'
-                                       (.*)$)x       # Rest of Line
-                                     ) {
+	    #                            $ 1     $2   $3              -     $4
+	    while ( $currentline =~ m( ^(.*?) \$({)? ([a-zA-Z]\w*) (?(2)}) (.*)$)x ) {
 		my $val = $ENV{$3};
 		$val = '' unless defined $val;
 		$currentline = join( '', $1 , $val , $4 );