Fix 'loose'+'balance'+'USE_DEFAULT_RT=Yes' bug

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@8693 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2008-09-06 15:45:24 +00:00
parent 6aebeb9f4c
commit 4ea348205a
3 changed files with 17 additions and 9 deletions

View File

@ -1,3 +1,7 @@
Changes in 4.2.0-RC2
1) Don't clear 'balance' when 'loose' and USE_DEFAULT_RT.
Changes in 4.2.0-RC1
1) Add NONAT option to entries in /etc/shorewall/masq.

View File

@ -1,4 +1,4 @@
Shorewall 4.2.0 RC 1.
Shorewall 4.2.0 RC 2.
----------------------------------------------------------------------------
R E L E A S E 4 . 2 H I G H L I G H T S
@ -78,16 +78,16 @@ Migration Issues.
7) DYNAMIC_ZONES=Yes is no longer supported by Shorewall-perl. Use
ipset-based zones instead.
Problems corrected in Shorewall 4.2.0 RC 1.
Problems corrected in Shorewall 4.2.0 RC 2.
1) Shorewall-perl was incorrectly ignoring the 'balance' option in
/etc/shorewall/providers when 'loose' was specified after 'balance'
and USE_DEFAULT_RT=Yes in shorewall.conf.
Other Changes in Shoreall 4.2.0 RC 2
None.
Other Changes in Shoreall 4.2.0 RC 1
1) If 'NONAT' is specified in the ADDRESS column of an entry in
/etc/shorewall/masq, then traffic matching that entry is not
passed to the entries that follow.
New Features in Shorewall 4.2.
1) Shorewall 4.2 contains support for multiple Internet providers
@ -935,3 +935,8 @@ New Features in Shorewall 4.2.
46) A macro supporting RNDC (BIND remote management protocol) traffic
has been added. It can be used as any other macro (e.g., RNDC/ACCEPT)
in the rules file.
47) If 'NONAT' is specified in the ADDRESS column of an entry in
/etc/shorewall/masq, then traffic matching that entry is not
passed to the entries that follow.

View File

@ -279,7 +279,6 @@ sub add_a_provider( $$$$$$$$ ) {
$balance = 1;
} elsif ( $option eq 'loose' ) {
$loose = 1;
$balance = 0 if $config{USE_DEFAULT_RT};
} elsif ( $option eq 'optional' ) {
set_interface_option $interface, 'optional', 1;
$optional = 1;