Fix log rule number generation

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1648 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb

STABLE2/changelog.txt

@@ -62,3 +62,5 @@ Changes in 2.0.9
 Changes in 2.0.10
 
 1) Corrected GATEWAY handling for 'pptpserver's
+
+2) Correct log rule number generation.

STABLE2/firewall

@@ -1146,18 +1146,19 @@ log_rule_limit() # $1 = log level, $2 = chain, $3 = disposition , $4 = rate limi
     local limit="${4:-$LOGLIMIT}"
     local tag=${5:+$5 }
     local prefix
+    local base=$(chain_base $displayChain)
 
     shift;shift;shift;shift;shift
 
     if [ -n "$LOGRULENUMBERS" ]; then
-	eval rulenum=\$${chain}_logrules
+	eval rulenum=\$${base}_logrules
 
-	[ -z "$rulenum" ] && rulenum=1
+	rulenum=${rulenum:-1}
 
 	prefix="$(printf "$LOGFORMAT" $chain $rulenum $disposition)${tag}"
 
 	rulenum=$(($rulenum + 1))
-	eval ${chain}_logrules=$rulenum
+	eval ${base}_logrules=$rulenum
     else
 	prefix="$(printf "$LOGFORMAT" $chain $disposition)${tag}"
     fi

STABLE2/releasenotes.txt

@@ -135,8 +135,5 @@ Problems corrected in version 2.0.10
 1) The GATEWAY column was previously ignored in 'pptpserver' entries in
    /etc/shorewall/tunnels.
 
-
-
-
-
-
+2) When log rule numbers are included in the LOGFORMAT, duplicate
+   rule numbers could previously be generated.