From 7689831cd7da331437526e84df06440e4fdb17e6 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sun, 4 Jul 2010 09:29:16 -0700 Subject: [PATCH] Minor cleanup of 4.4.11 Beta 3. Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Nat.pm | 2 +- Shorewall/releasenotes.txt | 5 +++++ manpages/shorewall-netmap.xml | 6 +++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Nat.pm b/Shorewall/Perl/Shorewall/Nat.pm index eb25983f2..c65b72c27 100644 --- a/Shorewall/Perl/Shorewall/Nat.pm +++ b/Shorewall/Perl/Shorewall/Nat.pm @@ -36,7 +36,7 @@ use strict; our @ISA = qw(Exporter); our @EXPORT = qw( setup_masq setup_nat setup_netmap add_addresses ); our @EXPORT_OK = (); -our $VERSION = '4.4_9'; +our $VERSION = '4.4_11'; our @addresses_to_add; our %addresses_to_add; diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index 2c549cab4..feeeb9fb4 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -301,6 +301,11 @@ None. As always when a new capability has been introduced, be sure to regenerate your capabilities file(s) after installing this release. +3) A new column (NET3) has been added to the /etc/shorewall/netmap + file. This new column can qualify the INTERFACE column by + specifying a SOURCE network (DNAT rule) or DEST network (SNAT rule) + associated with the interface. + ---------------------------------------------------------------------------- V I. P R O B L E M S C O R R E C T E D A N D N E W F E A T U R E S I N P R I O R R E L E A S E S diff --git a/manpages/shorewall-netmap.xml b/manpages/shorewall-netmap.xml index e7d8e1a2f..4b1a2a6d8 100644 --- a/manpages/shorewall-netmap.xml +++ b/manpages/shorewall-netmap.xml @@ -93,9 +93,9 @@ network-address - If specified, qualifies INTERFACE. It specifies a SOURCE - network for DNAT rules and a DESTINATON network for SNAT - rules. + Added in Shorewall 4.4.11. If specified, qualifies INTERFACE. + It specifies a SOURCE network for DNAT rules and a DESTINATON + network for SNAT rules.