From a9339fc884d880e45702717f52925f35d08febaa Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Wed, 6 Oct 2004 01:52:46 +0000
Subject: [PATCH] Clean up error messages

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

diff --git a/Shorewall2/firewall b/Shorewall2/firewall
index 1dd5ff214..667236589 100755
--- a/Shorewall2/firewall
+++ b/Shorewall2/firewall
@@ -3803,26 +3803,25 @@ add_a_rule()
 
     case "$logtarget" in
 	ACCEPT|DROP|REJECT|CONTINUE)	
-	    [ "$logtarget" = REJECT -a -n "$servport" ] && \
-		fatal_error "Server port may not be specified in a REJECT rule; rule: \"$rule\""
 	    if [ -z "$proto" -a -z "$cli" -a -z "$serv" -a -z "$servport" -a -z "$userspec" ] ; then
 		error_message "Warning -- Rule \"$rule\" is a POLICY"
 		error_message "	       -- and should be moved to the policy file"
 	    fi
 	    ;;
 	REDIRECT)
-	    [ -n "$serv" ] && startup_error "REDIRECT rules cannot"\
-		" specify a server IP; rule: \"$rule\""
+	    [ -n "$serv" ] && \
+		fatal_error "REDIRECT rules cannot  specify a server IP; rule: \"$rule\""
 	    servport=${servport:=$port}
 	    natrule=Yes
 	    ;;
 	DNAT)
-	    [ -n "$serv" ] || fatal_error "DNAT rules require a" \
-		" server address; rule: \"$rule\""
+	    [ -n "$serv" ] || \
+		fatal_error "DNAT rules require a server address; rule: \"$rule\""
 	    natrule=Yes
 	    ;;
 	LOG)
-	    [ -z "$loglevel" ] && fatal_error "LOG requires log level"
+	    [ -z "$loglevel" ] && \
+		fatal_error "LOG requires log level"
 	    ;;
     esac