summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorkstailey <kstailey@cvs.openbsd.org>1997-11-29 02:03:44 +0000
committerkstailey <kstailey@cvs.openbsd.org>1997-11-29 02:03:44 +0000
commit1d94037a7d1c1367be4627f319db375db12389f8 (patch)
treeb7f3af0e963eb6924875397eadc3068a6e219307 /etc
parent6ff91764f33dc873ffee54461a5dcf54b0b0e841 (diff)
NAT requires IPF
Diffstat (limited to 'etc')
-rw-r--r--etc/netstart4
-rw-r--r--etc/rc.conf4
2 files changed, 4 insertions, 4 deletions
diff --git a/etc/netstart b/etc/netstart
index 5dd41fa52fb..dea526c875a 100644
--- a/etc/netstart
+++ b/etc/netstart
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: netstart,v 1.31 1997/11/04 09:15:31 deraadt Exp $
+# $OpenBSD: netstart,v 1.32 1997/11/29 02:03:43 kstailey Exp $
# /etc/myname contains my symbolic name
#
@@ -24,7 +24,7 @@ fi
# Configure NAT before configuring network interfaces
#
-if [ X"${nat}" = X"YES" -a -f "${nat_rules}" ]; then
+if [ "${nat}" = "YES" -a "${ipfilter}" = "YES" -a -f "${nat_rules}" ]; then
echo 'configuring NAT'
ipnat -CF -f ${nat_rules}
else
diff --git a/etc/rc.conf b/etc/rc.conf
index f14ab43838e..7f55be3277e 100644
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: rc.conf,v 1.3 1997/11/23 11:54:16 maja Exp $
+# $OpenBSD: rc.conf,v 1.4 1997/11/29 02:03:43 kstailey Exp $
# set these to "NO" to turn them off. otherwise, they're used as flags
routed_flags=NO # for 'normal' use: routed_flags=-q
@@ -23,7 +23,7 @@ gated=NO
kerberos_server=NO
amd=NO
ipfilter=NO
-nat=NO
+nat=NO # for "YES" ipfilter must also be "YES"
portmap=YES # almost always needed
inetd=YES # almost always needed
lpd=NO # printing daemons