Merge branch 'master' of ssh://shorewall.git.sourceforge.net/gitroot/shorewall/shorewall

This commit is contained in:
Tom Eastep 2012-01-17 13:12:01 -08:00
commit 7d1bb30175

View File

@ -1069,7 +1069,6 @@ sub start_providers() {
} }
sub finish_providers() { sub finish_providers() {
if ( $balancing ) {
my $table = MAIN_TABLE; my $table = MAIN_TABLE;
if ( $config{USE_DEFAULT_RT} ) { if ( $config{USE_DEFAULT_RT} ) {
@ -1083,6 +1082,7 @@ sub finish_providers() {
$table = BALANCE_TABLE; $table = BALANCE_TABLE;
} }
if ( $balancing ) {
emit ( 'if [ -n "$DEFAULT_ROUTE" ]; then' ); emit ( 'if [ -n "$DEFAULT_ROUTE" ]; then' );
if ( $family == F_IPV4 ) { if ( $family == F_IPV4 ) {
emit ( " run_ip route replace default scope global table $table \$DEFAULT_ROUTE" ); emit ( " run_ip route replace default scope global table $table \$DEFAULT_ROUTE" );