From d3e78eddad1a7dbf8fc9954cf7f74b99f1c5f2c6 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Thu, 19 Apr 2007 01:01:03 +0000
Subject: [PATCH] Fix and extend last change

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

diff --git a/Shorewall-perl/Shorewall/Chains.pm b/Shorewall-perl/Shorewall/Chains.pm
index ed51a649e..29f628e1b 100644
--- a/Shorewall-perl/Shorewall/Chains.pm
+++ b/Shorewall-perl/Shorewall/Chains.pm
@@ -1256,7 +1256,7 @@ sub expand_rule( $$$$$$$$$$ )
 
 	    $origdest = '';
 	} else {
-	    fatal_error "Invalid ORIGINAL DEST" if  $origdest =~ /^([^!]+)?,!([^!]+)$/;
+	    fatal_error "Invalid ORIGINAL DEST" if  $origdest =~ /^([^!]+)?,!([^!]+)$/ || $origdest =~ /.*!.*!/;
 
 	    if ( $origdest =~ /^([^!]+)?!([^!]+)$/ ) {
 		#
@@ -1285,7 +1285,7 @@ sub expand_rule( $$$$$$$$$$ )
     # Determine if there is Source Exclusion
     #
     if ( $inets ) {
-	fatal_error "Invalid SOURCE" if  $inets =~ /^([^!]+)?,!([^!]+)$/;
+	fatal_error "Invalid SOURCE" if $inets =~ /^([^!]+)?,!([^!]+)$/ || $inets =~ /.*!.*!/;
 	
 	if ( $inets =~ /^([^!]+)?!([^!]+)$/ ) {
 	    $inets = $1;
@@ -1310,7 +1310,7 @@ sub expand_rule( $$$$$$$$$$ )
     # Determine if there is Destination Exclusion
     #
     if ( $dnets ) {
-	fatal_error "Invalid DEST" if  $inets =~ /^([^!]+)?,!([^!]+)$/;
+	fatal_error "Invalid DEST" if  $dnets =~ /^([^!]+)?,!([^!]+)$/ || $dnets =~ /.*!.*!/;
 	
 	if ( $dnets =~ /^([^!]+)?!([^!]+)$/ ) {
 	    $dnets = $1;