From 18cfd011c3c5c7a632c279bf94b6f5e181be3fa7 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sun, 1 Jun 2003 16:51:34 +0000
Subject: [PATCH] A small cleanup of the rules parsing code

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

diff --git a/Shorewall/firewall b/Shorewall/firewall
index 2291216a5..0cbe98989 100755
--- a/Shorewall/firewall
+++ b/Shorewall/firewall
@@ -1968,10 +1968,6 @@ add_a_rule()
 {
     local natrule=
 
-    rule_error() {
-	fatal_error "Only DNAT and REDIRECT rules may specify port mapping; rule \"$rule\""
-    }
-
     # Set source variables
 
     cli=
@@ -2099,9 +2095,9 @@ add_a_rule()
 	    # A specific server or server port given
 
 	    if [ -n "$natrule" ]; then
-		    add_nat_rule
+		add_nat_rule
 	    elif [ -n "$addr" -a "$addr" != "$serv" ] || [ -n "$servport" -a "$servport" != "$port" ]; then
-		rule_error
+		fatal_error "Only DNAT and REDIRECT rules may specify port mapping; rule \"$rule\""
 	    fi
 
 	    if [ -z "$dnat_only" -a $chain != ${FW}2${FW} ]; then