From 50c1896c37086d3557d18f504b4f11e9a0156c7e Mon Sep 17 00:00:00 2001 From: teastep Date: Fri, 11 Jul 2008 16:53:50 +0000 Subject: [PATCH] Copy INTERFACE when COPY column non-empty git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@8622 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall-common/changelog.txt | 4 +++- Shorewall-common/releasenotes.txt | 5 +++++ Shorewall-perl/Shorewall/Providers.pm | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Shorewall-common/changelog.txt b/Shorewall-common/changelog.txt index 7b1c9050a..a4deaab51 100644 --- a/Shorewall-common/changelog.txt +++ b/Shorewall-common/changelog.txt @@ -6,7 +6,9 @@ Changes in 4.2.0-Beta3 3) Implement USE_DEFAULT_RT -4) Add -f option to the restart command. +4) Add -f option to the restart command. + +5) Fix COPY column. Changes in 4.2.0-Beta2 diff --git a/Shorewall-common/releasenotes.txt b/Shorewall-common/releasenotes.txt index 529f57fe6..871aecc9e 100644 --- a/Shorewall-common/releasenotes.txt +++ b/Shorewall-common/releasenotes.txt @@ -86,6 +86,11 @@ Problems corrected in Shorewall-perl-4.2.0 Beta3. is a saved configuration, the setting of ip forwarding will not be changed. +2) Previously, when the COPY column of /etc/shorewall/providers + contained one or more interface names, Shorewall-perl was not + adding the interface in the INTERFACE column to those interfaces + being copied. This has been corrected. + Other Changes in Shoreall 4.2.0 Beta 3. 1) Beginning with Shorewall 4.0.0, the -f option was no longer the diff --git a/Shorewall-perl/Shorewall/Providers.pm b/Shorewall-perl/Shorewall/Providers.pm index 7074e7102..aa0345103 100644 --- a/Shorewall-perl/Shorewall/Providers.pm +++ b/Shorewall-perl/Shorewall/Providers.pm @@ -332,6 +332,7 @@ sub add_a_provider( $$$$$$$$ ) { $copy = $interface; } else { $copy =~ tr/,/|/; + $copy = "$interface|$copy"; } copy_and_edit_table( $duplicate, $number ,$copy , $realm);