From f6f840bebfdba426988ff3e394dafe51c8d3d0b6 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Mon, 20 Sep 2010 08:15:24 -0700
Subject: [PATCH] Misc cleanup for 4.4.13

1. Replace statement with equivalent function call in promote_blacklist_rules()
2. Bump version of Tunnels.pm
3. Fix typo in comment in Zones.pm

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/Perl/Shorewall/Chains.pm  | 2 +-
 Shorewall/Perl/Shorewall/Tunnels.pm | 2 +-
 Shorewall/Perl/Shorewall/Zones.pm   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Shorewall/Perl/Shorewall/Chains.pm b/Shorewall/Perl/Shorewall/Chains.pm
index e869b75bb..a41566cc9 100644
--- a/Shorewall/Perl/Shorewall/Chains.pm
+++ b/Shorewall/Perl/Shorewall/Chains.pm
@@ -3746,7 +3746,7 @@ sub promote_blacklist_rules() {
 		    #
 		    unless ( $chain2ref->{blacklist} ) {
 			unshift @{$chain2ref->{rules}}, $rule;
-			$chainbref->{references}{$chain2ref->{name}}++;
+			add_reference $chain2ref, $chainbref;
 			$chain2ref->{blacklist} = 1;
 		    }
 		}
diff --git a/Shorewall/Perl/Shorewall/Tunnels.pm b/Shorewall/Perl/Shorewall/Tunnels.pm
index 451c8b774..b0553eba6 100644
--- a/Shorewall/Perl/Shorewall/Tunnels.pm
+++ b/Shorewall/Perl/Shorewall/Tunnels.pm
@@ -34,7 +34,7 @@ use strict;
 our @ISA = qw(Exporter);
 our @EXPORT = qw( setup_tunnels );
 our @EXPORT_OK = ( );
-our $VERSION = '4.4_9';
+our $VERSION = '4.4_13';
 
 #
 # Here starts the tunnel stuff -- we really should get rid of this crap...
diff --git a/Shorewall/Perl/Shorewall/Zones.pm b/Shorewall/Perl/Shorewall/Zones.pm
index 62d6f4b1e..b3bce190b 100644
--- a/Shorewall/Perl/Shorewall/Zones.pm
+++ b/Shorewall/Perl/Shorewall/Zones.pm
@@ -1811,7 +1811,7 @@ sub find_hosts_by_option( $ ) {
 }
 
 #
-# Retruns a reference to a list of zones with the passed in/out option
+# Returns a reference to a list of zones with the passed in/out option
 #
 
 sub find_zones_by_option( $$ ) {