diff --git a/Samples6/three-interfaces/shorewall6.conf b/Samples6/three-interfaces/shorewall6.conf index 93a221c88..2326a00d8 100644 --- a/Samples6/three-interfaces/shorewall6.conf +++ b/Samples6/three-interfaces/shorewall6.conf @@ -135,8 +135,6 @@ AUTO_COMMENT=Yes MANGLE_ENABLED=Yes -USE_DEFAULT_RT=Yes - ############################################################################### # P A C K E T D I S P O S I T I O N ############################################################################### diff --git a/Samples6/two-interfaces/shorewall6.conf b/Samples6/two-interfaces/shorewall6.conf index 3f938315d..585efb9b8 100644 --- a/Samples6/two-interfaces/shorewall6.conf +++ b/Samples6/two-interfaces/shorewall6.conf @@ -135,8 +135,6 @@ AUTO_COMMENT=Yes MANGLE_ENABLED=Yes -USE_DEFAULT_RT=Yes - ############################################################################### # P A C K E T D I S P O S I T I O N ############################################################################### diff --git a/Shorewall-perl/Shorewall/Config.pm b/Shorewall-perl/Shorewall/Config.pm index 21f504b3f..b0c1e22b8 100644 --- a/Shorewall-perl/Shorewall/Config.pm +++ b/Shorewall-perl/Shorewall/Config.pm @@ -500,7 +500,6 @@ sub initialize( $ ) { DONT_LOAD => '', AUTO_COMMENT => undef, MANGLE_ENABLED => undef , - USE_DEFAULT_RT => undef , # # Packet Disposition # diff --git a/Shorewall-perl/Shorewall/Providers.pm b/Shorewall-perl/Shorewall/Providers.pm index 8ee15bffa..8d0a54e9e 100644 --- a/Shorewall-perl/Shorewall/Providers.pm +++ b/Shorewall-perl/Shorewall/Providers.pm @@ -284,6 +284,7 @@ sub add_a_provider( $$$$$$$$ ) { } elsif ( $option =~ /^balance=(\d+)$/ ) { $balance = $1; } elsif ( $option eq 'balance' ) { + fatal_error q('balance' is not available in IPv6) if $family == F_IPV6; $balance = 1; } elsif ( $option eq 'loose' ) { $loose = 1; diff --git a/Shorewall6/shorewall6.conf b/Shorewall6/shorewall6.conf index a30bfe8ac..a6b00376d 100644 --- a/Shorewall6/shorewall6.conf +++ b/Shorewall6/shorewall6.conf @@ -135,8 +135,6 @@ AUTO_COMMENT=Yes MANGLE_ENABLED=Yes -USE_DEFAULT_RT=Yes - ############################################################################### # P A C K E T D I S P O S I T I O N ############################################################################### diff --git a/manpages6/shorewall6-providers.xml b/manpages6/shorewall6-providers.xml index da2a59b67..1fdf3ed27 100644 --- a/manpages6/shorewall6-providers.xml +++ b/manpages6/shorewall6-providers.xml @@ -97,9 +97,7 @@ The name of an existing table to duplicate to create this routing table. May be or the name of a previously listed provider. You may select only certain entries from - the table to copy by using the COPY column below. This column should - contain a dash ("-') when USE_DEFAULT_RT=Yes in shorewall6.conf(5). + the table to copy by using the COPY column below. @@ -154,22 +152,6 @@ - - balance[=weight] - - - The providers that have - specified will get outbound traffic load-balanced among them. - By default, all interfaces with - specified will have the same weight (1). You can change the - weight of an interface by specifiying - weight - where weight is the weight of the - route out of this interface. - - - loose @@ -267,9 +249,9 @@ eth2 connects to a local network. - #NAME NUMBER MARK DUPLICATE INTERFACE GATEWAY OPTIONS COPY - ISP1 1 1 main eth0 2001:ce7c:92b4:1::2 track,balance eth2 - ISP2 2 2 main eth1 2001:d64c:83c9:12::8b track,balance eth2 + #NAME NUMBER MARK DUPLICATE INTERFACE GATEWAY OPTIONS COPY + ISP1 1 1 main eth0 2001:ce7c:92b4:1::2 track eth2 + ISP2 2 2 main eth1 2001:d64c:83c9:12::8b track eth2