summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1998-02-07 20:51:51 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1998-02-07 20:51:51 +0000
commit0e4dd16744ca5918503acd651582f58301d828a1 (patch)
treedd5c36992589c9492431ea707df2a6b95f1624f2 /etc
parent416b5a3feb12e3bb44b58084d647365d8d82b97f (diff)
ipforward is in sysctl.conf now
Diffstat (limited to 'etc')
-rw-r--r--etc/netstart6
-rw-r--r--etc/rc.conf3
2 files changed, 2 insertions, 7 deletions
diff --git a/etc/netstart b/etc/netstart
index dabe496de5f..d0f7267733e 100644
--- a/etc/netstart
+++ b/etc/netstart
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: netstart,v 1.34 1997/12/21 01:17:21 deraadt Exp $
+# $OpenBSD: netstart,v 1.35 1998/02/07 20:51:50 deraadt Exp $
# /etc/myname contains my symbolic name
#
@@ -31,10 +31,6 @@ else
nat=NO
fi
-if [ X"${ipforward}" = X"YES" ]; then
- sysctl -w net.inet.ip.forwarding=1
-fi
-
# set the address for the loopback interface
ifconfig lo0 inet localhost
diff --git a/etc/rc.conf b/etc/rc.conf
index e18dbe5c2d8..b0ffec36177 100644
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: rc.conf,v 1.10 1998/02/05 09:54:37 deraadt Exp $
+# $OpenBSD: rc.conf,v 1.11 1998/02/07 20:51:50 deraadt Exp $
# set these to "NO" to turn them off. otherwise, they're used as flags
routed_flags=NO # for 'normal' use: routed_flags="-q"
@@ -28,7 +28,6 @@ portmap=YES # almost always needed
inetd=YES # almost always needed
lpd=NO # printing daemons
check_quotas=YES # NO may be desireable in some YP environments
-ipforward=NO # route packets between interfaces
# miscellaneous other flags
# only used if the appropriate server is marked YES above