From f156a9a62699b41d79bdb9ec0c26fa8d68baf8c8 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sun, 2 Oct 2005 16:22:52 +0000
Subject: [PATCH] Correct ipp2p logging

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

diff --git a/Shorewall/firewall b/Shorewall/firewall
index c623196f9..59d4a1598 100755
--- a/Shorewall/firewall
+++ b/Shorewall/firewall
@@ -5375,7 +5375,7 @@ process_rule() # $1 = target
 				else
 				    if [ -n "$loglevel" -a -z "$natrule" ]; then
 					log_rule_limit $loglevel $chain $logchain $logtarget "$ratelimit" "$logtag" -A $user \
-					    $(fix_bang $proto $sports $multiport $cli $(dest_ip_range $srv) $dports) $state
+					     $state $(fix_bang $proto $sports $multiport $cli $(dest_ip_range $srv) $dports)
 				    fi
 
 				    if [ -n "$nonat" ]; then
@@ -5393,7 +5393,7 @@ process_rule() # $1 = target
 		    else
 			if [ -n "$loglevel" -a -z "$natrule" ]; then
 			    log_rule_limit $loglevel $chain $logchain $logtarget "$ratelimit" "$logtag" -A $user \
-				$(fix_bang $proto $sports $multiport $cli $dports) $state
+				 $state $(fix_bang $proto $sports $multiport $cli $dports)
 			fi
 
 			[ -n "$nonat" ] && \
@@ -5401,7 +5401,7 @@ process_rule() # $1 = target
 			    $cli $sports $dports $ratelimit $user -j RETURN
 
 			    [ "$logtarget" != NONAT ] && \
-				run_iptables2 -A $chain $proto $multiport $cli $sports \
+				run_iptables2 -A $chain $state $proto $multiport $cli $sports \
 				$dports $ratelimit $user -j $target
 		    fi
 		fi
@@ -5419,7 +5419,7 @@ process_rule() # $1 = target
 		    for adr in $(separate_list $addr); do
 			if [ -n "$loglevel" ]; then
 			    log_rule_limit $loglevel $chain $logchain $logtarget "$ratelimit" "$logtag" -A $user \
-				$(fix_bang $proto $multiport $cli $dest_interface $sports $dports -m conntrack --ctorigdst $adr) $state
+				 $state $(fix_bang $proto $multiport $cli $dest_interface $sports $dports -m conntrack --ctorigdst $adr)
 			fi
 
 			if [ "$logtarget" != LOG ]; then
@@ -5437,7 +5437,7 @@ process_rule() # $1 = target
 		else
 		    if [ -n "$loglevel" ]; then
 			log_rule_limit $loglevel $chain $logchain $logtarget "$ratelimit" "$logtag" -A $user \
-			    $(fix_bang $proto $multiport $cli $dest_interface $sports $dports) $state
+			     $state $(fix_bang $proto $multiport $cli $dest_interface $sports $dports)
 		    fi
 
 		    if [ "$logtarget" != LOG ]; then