From 581a8100ea198afbf6867ccca6ba566642c687a8 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Wed, 17 Dec 2008 22:19:49 +0000
Subject: [PATCH] Delete 'balance' and USE_DEFAULT_RT from Shorewall6

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9104 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Samples6/three-interfaces/shorewall6.conf |  2 --
 Samples6/two-interfaces/shorewall6.conf   |  2 --
 Shorewall-perl/Shorewall/Config.pm        |  1 -
 Shorewall-perl/Shorewall/Providers.pm     |  1 +
 Shorewall6/shorewall6.conf                |  2 --
 manpages6/shorewall6-providers.xml        | 26 ++++-------------------
 6 files changed, 5 insertions(+), 29 deletions(-)

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 @@
           <para>The name of an existing table to duplicate to create this
           routing table. May be <option>main</option> 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 <ulink
-          url="shorewall6.conf.html">shorewall6.conf(5)</ulink>.</para>
+          the table to copy by using the COPY column below.</para>
         </listitem>
       </varlistentry>
 
@@ -154,22 +152,6 @@
               </listitem>
             </varlistentry>
 
-            <varlistentry>
-              <term><emphasis
-              role="bold">balance[=<replaceable>weight</replaceable>]</emphasis></term>
-
-              <listitem>
-                <para>The providers that have <option>balance</option>
-                specified will get outbound traffic load-balanced among them.
-                By default, all interfaces with <option>balance</option>
-                specified will have the same weight (1). You can change the
-                weight of an interface by specifiying
-                <option>balance=</option><replaceable>weight</replaceable>
-                where <replaceable>weight</replaceable> is the weight of the
-                route out of this interface.</para>
-              </listitem>
-            </varlistentry>
-
             <varlistentry>
               <term><emphasis role="bold">loose</emphasis></term>
 
@@ -267,9 +249,9 @@
 
           <para>eth2 connects to a local network.</para>
 
-          <programlisting>        #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</programlisting>
+          <programlisting>        #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</programlisting>
         </listitem>
       </varlistentry>
     </variablelist>