From 1294ef4df4d507c1faf9c06dabae1cb74c3412a8 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Wed, 7 Apr 2010 19:56:08 -0700 Subject: [PATCH] Backport reference count fix to 4.4.8 Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Chains.pm | 1 + Shorewall/changelog.txt | 4 ++++ Shorewall/releasenotes.txt | 8 +++++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Shorewall/Perl/Shorewall/Chains.pm b/Shorewall/Perl/Shorewall/Chains.pm index 5ed15f42a..9d6e6ea20 100644 --- a/Shorewall/Perl/Shorewall/Chains.pm +++ b/Shorewall/Perl/Shorewall/Chains.pm @@ -1424,6 +1424,7 @@ sub replace_references1( $$$ ) { # s/ -p [^ ]+ / / if / -p / && $matches =~ / -p /; s/\s+-([jg]) $chainref->{name}(\b)/$matches -$1 ${target}$2/; + add_reference( $fromref, $chain_table{$table}{$target} ); $count++; } } diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index 91896cfcd..cf97a4544 100644 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -1,3 +1,7 @@ +Changes in Shorewall 4.4.8.2 + +1) Fix OPTIMIZE 4 bug. + Changes in Shorewall 4.4.8.1 1) Correct handling of a logical interface name in the EXTERNAL column diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index 248b9c672..b5a823a34 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -218,7 +218,13 @@ VI. PROBLEMS CORRECTED AND NEW FEATURES IN PRIOR RELEASES I I I. P R O B L E M S C O R R E C T E D I N T H I S R E L E A S E ---------------------------------------------------------------------------- -4.4.8.1 +4.4.8.2 + +1) If an unnecessary NONAT rule is included in /etc/shorewall/rules, + 'shorewall start' and/or 'shorewall restart' can fail with invalid + iptables-restore input. + +4.4.8.1 1) Logical interface names in the EXTERNAL column of /etc/shorewall/proxyarp were previously not mapped to their