- reverted last change

svn-id: @991

diff --git a/doc/sysconfig.docb b/doc/sysconfig.docb
index 95b9853990182b810c02247d2615e85ea5b95d91..818a0c98a668cac78f811c3fc57aef43291af07f 100644 (file)
--- a/doc/sysconfig.docb
+++ b/doc/sysconfig.docb
@@ -179,21 +179,6 @@
     <para>
       NAT will translate address &lt;address> to &lt;addressreal>.</para>
   </refsect1>
-
-  <refsect1>
-    <title><filename>/etc/sysconfig/masquerade</filename></title>
-    <para>
-      Configuration file for masquerade.
-      Contain lines of the form:</para>
-    <para>
-<literal>&lt;address> by &lt;interface> to &lt;destination></literal></para>
-    <para>
-      Where &lt;address> is source address or class, &lt;interface> is
-      interface by whom packets will be sent and &lt;destination>
-      is destination address or class (usually 0.0.0.0/0).
-      All address classes should be in form of 192.168.1.0/24.</para>
-  </refsect1>
-
   <refsect1>
     <title><filename>/etc/sysconfig/static-routes</filename></title>
     <para>Contains lines of the form:</para>

diff --git a/doc/sysconfig.txt b/doc/sysconfig.txt
index 24bd824810110875d016bbc75fda97145415f9b3..554080da4cb75cae62980a45a56844d2a6d649be 100644 (file)
--- a/doc/sysconfig.txt
+++ b/doc/sysconfig.txt
@@ -1,4 +1,4 @@
-$Id: sysconfig.txt,v 1.5 2002/02/02 17:30:20 adasi Exp $
+$Id: sysconfig.txt,v 1.6 2002/02/03 16:17:23 adasi Exp $
 
 Files in /etc/sysconfig
 =======================
@@ -73,17 +73,6 @@ Files in /etc/sysconfig
 
   NAT will translate address <address> to <addressreal>.
 
-/etc/sysconfig/masquerade
-
-  Configuration file for masquerade.
-  Contain lines of the form:
-    <address> by <interface> to <destination>
-
-  Where <address> is source address or class, <interface> is 
-  interface by whom packets will be sent and <destination> 
-  is destination address or class (usually 0.0.0.0/0).
-  All address classes should be in form of 192.168.1.0/24.
-
 /etc/sysconfig/static-routes:
 
   Contains lines of the form:

diff --git a/rc.d/init.d/functions.network b/rc.d/init.d/functions.network
index 1d4509984776a99b1df453e3524207abe9897693..37227b7f9e904de21e03ac96344f693d0a70d754 100755 (executable)
--- a/rc.d/init.d/functions.network
+++ b/rc.d/init.d/functions.network
@@ -1,5 +1,5 @@
 #
-# $Id: functions.network,v 1.67 2002/02/02 17:13:01 adasi Exp $
+# $Id: functions.network,v 1.68 2002/02/03 16:14:32 adasi Exp $
 # 
 # This is not a shell script; it provides functions to network scripts
 # that source it.
@@ -160,19 +160,6 @@ if [ -r /etc/sysconfig/static-nat ]; then
 fi
 }
 
-# Setup Masquerade
-setup_masq()
-{
-typeset src by iface to dst
-if [ -r /etc/sysconfig/masquerade ]; then
-        grep "^[0-9]" /etc/sysconfig/masquerade | while read src by iface to dst; do
-                if [ "$1" = "on" ]; then
-                        /sbin/ipchains -A forward -i $iface -j MASQ -s $src -d $dst
-                elif [ "$1" = "off"]; then
-                        /sbin/ipchains -D forward -i $iface -j MASQ -s $src -d $dst
-        fi
-        done
-fi
 }
 # Setup static ARP
 static_arp()

diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index a721ed17646b2c22939faf6440e8945d91ba0836..efd603a94d857bc988c036b8c02e8855d993453c 100644 (file)
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -8,7 +8,7 @@
 #
 # probe:       true
 
-# $Id: network,v 1.50 2002/02/02 17:13:01 adasi Exp $
+# $Id: network,v 1.51 2002/02/03 16:14:31 adasi Exp $
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
@@ -67,7 +67,6 @@ set_up_loopback
 setup_forwarding on
 setup_nat on
 setup_routes on
-setup_masq on
 # Setup IPX
 if is_yes "$IPX"; then
        if [ -n $IPXAUTOPRIMARY ] ; then
@@ -111,8 +110,6 @@ setup_routes off
 
 # Set down NAT rules
 setup_nat off
-# Set down masquerade rules
-setup_masq off
 # Set DOWN loopback interface
 set_down_loopback
 }