- removed references to IPV*_FORWARDING

svn-id: @1053

diff --git a/doc/sysconfig.docb b/doc/sysconfig.docb
index c65a85c51406941f74c06c3198c2dfe5254806e1..50352365fc807224b9cf45b15d9e182bc4ea832f 100644 (file)
--- a/doc/sysconfig.docb
+++ b/doc/sysconfig.docb
@@ -82,14 +82,6 @@
              same value as here.</para></note>
        </listitem>
       </varlistentry>
-      <varlistentry><term>FORWARD_IPV4=yes|no</term>
-       <listitem><para>(The current Red Hat Linux installation
-         sets this to no by default for RFC compliance, but if
-         FORWARD_IPV4 is not set at all, forwarding is *enabled*
-         for compatibility with the configuration files used on
-         Red Hat Linux versions 4.2 and earlier.)</para>
-       </listitem>
-      </varlistentry>
       <varlistentry><term>IGNORE_ICMP_BCAST_IPV4=yes|no</term>
        <listitem><para>(Please note that if you accept ICMP echo
            requests with a broadcast/multicast destination address your network

diff --git a/doc/sysconfig.txt b/doc/sysconfig.txt
index dd608b66ed3724616b37c284cd6371437f3e10de..c8b3f784765f330771559b71680c39b9658c5dca 100644 (file)
--- a/doc/sysconfig.txt
+++ b/doc/sysconfig.txt
@@ -1,4 +1,4 @@
-$Id: sysconfig.txt,v 1.9 2002/06/19 18:13:07 klakier Exp $
+$Id: sysconfig.txt,v 1.10 2002/12/17 14:01:07 baggins Exp $
 
 Files in /etc/sysconfig
 =======================
@@ -46,11 +46,6 @@ Files in /etc/sysconfig
   NISDOMAIN=<nis domain name, e.g. "mydomain.org">
     Note: set this only if you use NIS system. DNS domainname 
     should be set in /etc/resolv.conf
-  FORWARD_IPV4=yes|no (The current Red Hat Linux installation
-    sets this to no by default for RFC compliance, but if
-    FORWARD_IPV4 is not set at all, forwarding is *enabled*
-    for compatibility with the configuration files used on
-    Red Hat Linux versions 4.2 and earlier.)
   IGNORE_ICMP_BCAST_IPV4=yes|no (Please note that if you accept ICMP echo
     requests with a broadcast/multicast destination address your network
     may be used as an exploder for denial of service packet flooding attacks

diff --git a/po/pl.po b/po/pl.po
index d7c05d5ce4a5215d99415640e86c49784941c95a..867c2947521a6849966e3b0f4107a1f4d641cd2a 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,7 +1,7 @@
 # Polish translation of rc-scripts.
 # Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 # Arkadiusz Miskiewicz <misiek@pld.org.pl>, 1999, 2000.
-# $Id: pl.po,v 1.46 2002/05/11 09:34:58 misiek Exp $
+# $Id: pl.po,v 1.47 2002/12/17 14:01:09 baggins Exp $
 #
 
 msgid ""
@@ -381,22 +381,6 @@ msgstr "Ustawianie statycznych wpis
 msgid "Setting static RARP entries"
 msgstr "Ustawianie statycznych wpisów RARP"
 
-#: ./rc.d/init.d/functions.network:228
-msgid "Enabling IPv4 packet forwarding"
-msgstr "Wlaczanie forwardowania pakietów IPv4"
-
-#: ./rc.d/init.d/functions.network:230
-msgid "Disabling IPv4 packet forwarding"
-msgstr "Wylaczanie forwardowania pakietów IPv4"
-
-#: ./rc.d/init.d/functions.network:237
-msgid "Enabling IPv6 packet forwarding"
-msgstr "Wlaczanie forwardowania pakietów IPv6"
-
-#: ./rc.d/init.d/functions.network:239
-msgid "Disabling IPv6 packet forwarding"
-msgstr "Wylaczanie forwardowania pakietów IPv6"
-
 #: ./rc.d/init.d/network:23
 #: ./rc.d/init.d/network:43
 #: ./sysconfig/network-scripts/ifdown-br:36

diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index f21cfb3c620f86b1a67fcbfcf68534113f029164..6ef9fa37afdc2fc8877f6885f4a6ca73b40dff89 100644 (file)
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -8,7 +8,7 @@
 #
 # probe:       true
 
-# $Id: network,v 1.57 2002/08/23 22:13:17 zagrodzki Exp $
+# $Id: network,v 1.58 2002/12/17 14:01:10 baggins Exp $
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
@@ -48,7 +48,6 @@ fi
 # initialize networking:
 # - check IPv4, IPv6, IPX can be handled by system
 # - setup default IPv{4,6} interfaces policy like:
-#   - forwarding,
 #   - spoofig protection,
 #   - icmp echo ignore broadcasts,
 # - setup lo interface
@@ -64,7 +63,6 @@ run_cmd "Setting network parameters" sysctl -p /etc/sysctl.conf
 set_up_loopback
 
 # Setup configuration
-setup_forwarding on
 setup_nat on
 setup_routes on
 setup_ip_rules on
@@ -106,7 +104,6 @@ static_arp
 # - down lo interface.
 network_deinit()
 {
-setup_forwarding off
 setup_routes off
 setup_ip_rules off
 

diff --git a/sysconfig/network-scripts/functions.network b/sysconfig/network-scripts/functions.network
index b8e570774061360ef7958e88cc875212c8d63dbd..856da945c052aaef68de6d1057997759c2d40719 100644 (file)
--- a/sysconfig/network-scripts/functions.network
+++ b/sysconfig/network-scripts/functions.network
@@ -1,5 +1,5 @@
 #
-# $Id: functions.network,v 1.6 2002/11/08 23:45:05 alchemyx Exp $
+# $Id: functions.network,v 1.7 2002/12/17 14:01:11 baggins Exp $
 # 
 # This is not a shell script; it provides functions to network scripts
 # that source it.
@@ -143,27 +143,6 @@ else
 fi
 }
 
-setup_forwarding ()
-{
-if is_yes "$IPV4_NETWORKING" && is_yes "$IPV4_FORWARDING" && [ -f /proc/sys/net/ipv4/ip_forward ];
-then
-       if [ "$1" = "on" ]; then
-               run_cmd "Enabling IPv4 packet forwarding" sysctl -w net.ipv4.ip_forward=1
-       else
-               run_cmd "Disabling IPv4 packet forwarding" sysctl -w net.ipv4.ip_forward=0
-       fi
-fi
-
-if is_yes "$IPV6_NETWORKING" && is_yes "$IPV6_FORWARDING" && [ -f /proc/sys/net/ipv6/conf/all/forwarding ];
-then
-       if [ "$1" = "on" ]; then
-               run_cmd "Enabling IPv6 packet forwarding" sysctl -w net.ipv6.conf.all.forwarding=1
-       else
-               run_cmd "Disabling IPv6 packet forwarding" sysctl -w net.ipv6.conf.all.forwarding=0
-       fi
-fi
-}
-
 # Set up all IP && IP parameter variables
 setup_ip_param ()
 {
@@ -264,24 +243,21 @@ fi
 
 # IPv6 gateway && IPv6 globalroute
 if is_yes "$IPV6_NETWORKING"; then
-       if is_no "${IPV6_FORWARDING}" ; then
-           if [ -z "${GATEWAY6DEV}" -o "${GATEWAY6DEV}" = "${DEVICE}" ]; then
-               # set up default gateway
-               if [ -n "${GATEWAY6}" ]; then
-                       ip -6 route add default via ${GATEWAY6} dev ${DEVICE} ${IP6SRCADDR} onlink
-                       DEFGW6=${GATEWAY6}
-               elif [ "${GATEWAY6DEV}" = "${DEVICE}" ]; then
-                       ip -6 route add default dev ${DEVICE} ${IP6SRCADDR}
-               fi
+       if [ -z "${GATEWAY6DEV}" -o "${GATEWAY6DEV}" = "${DEVICE}" ]; then
+           # set up default gateway
+           if [ -n "${GATEWAY6}" ]; then
+               ip -6 route add default via ${GATEWAY6} dev ${DEVICE} ${IP6SRCADDR} onlink
+               DEFGW6=${GATEWAY6}
+           elif [ "${GATEWAY6DEV}" = "${DEVICE}" ]; then
+               ip -6 route add default dev ${DEVICE} ${IP6SRCADDR}
            fi
-        else
-            if [ -z "${IPV6_GLOBALROUTEDEV}" -o "${IPV6_GLOBALROUTEDEV}" = "${DEVICE}" ]; then
-               # set up default route
-               if [ -n "${IPV6_GLOBALROUTEGW}" ]; then
-                   ip -6 route add 2000::/3 via ${IPV6_GLOBALROUTEGW} dev ${DEVICE} ${IP6SRCADDR} onlink
-               elif [ "${IPV6_GLOBALROUTEDEV}" = "${DEVICE}" ]; then
-                   ip -6 route add 2000::/3 dev ${DEVICE} ${IP6SRCADDR}
-               fi
+       fi
+        if [ -z "${IPV6_GLOBALROUTEDEV}" -o "${IPV6_GLOBALROUTEDEV}" = "${DEVICE}" ]; then
+           # set up default route
+           if [ -n "${IPV6_GLOBALROUTEGW}" ]; then
+               ip -6 route add 2000::/3 via ${IPV6_GLOBALROUTEGW} dev ${DEVICE} ${IP6SRCADDR} onlink
+           elif [ "${IPV6_GLOBALROUTEDEV}" = "${DEVICE}" ]; then
+               ip -6 route add 2000::/3 dev ${DEVICE} ${IP6SRCADDR}
            fi
         fi
 fi