From fd7d07cd7523cdd367b7994bba5436c397d886e7 Mon Sep 17 00:00:00 2001 From: teastep Date: Wed, 2 May 2007 18:49:56 +0000 Subject: [PATCH] Make SOURCE and DEST reserved names git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6197 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall-common/changelog.txt | 2 ++ Shorewall-common/releasenotes.txt | 4 ++++ Shorewall-perl/Shorewall/Zones.pm | 4 +++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Shorewall-common/changelog.txt b/Shorewall-common/changelog.txt index 5c6f2cffc..7c49c5275 100644 --- a/Shorewall-common/changelog.txt +++ b/Shorewall-common/changelog.txt @@ -12,6 +12,8 @@ Changes in 3.9.6 6) Add RCP_COMMAND and RSH_COMMAND options in shorewall.conf +7) Apply Luigi's MARK patch. + Changes in 3.9.5 1) Fix dynamic zone problem. diff --git a/Shorewall-common/releasenotes.txt b/Shorewall-common/releasenotes.txt index cbcdcfc61..b1032cd40 100644 --- a/Shorewall-common/releasenotes.txt +++ b/Shorewall-common/releasenotes.txt @@ -68,6 +68,10 @@ Other changes in Shorewall 3.9.6. destination - The directory on the remote system that the files are to be copied into. +2) The accounting, masq, rules and tos files now have a 'MARK' column + similar to the column of the same name in the tcrules file. This + column allows filtering by MARK and CONNMARK value. + Migration Considerations: 1) You cannot simply upgrade your existing Shorewall package. You must diff --git a/Shorewall-perl/Shorewall/Zones.pm b/Shorewall-perl/Shorewall/Zones.pm index e2f62ae22..3d9608600 100644 --- a/Shorewall-perl/Shorewall/Zones.pm +++ b/Shorewall-perl/Shorewall/Zones.pm @@ -107,7 +107,9 @@ our $firewall_zone; our %interfaces; my %reservedName = ( all => 1, - none => 1 ); + none => 1, + SOURCE => 1, + DEST => 1 ); # # Parse the passed option list and return a reference to a hash as follows: