From ac3ee43601a95d65682b6f95a7e8a24af6ac98f5 Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Sat, 28 Mar 1998 00:11:00 +0000
Subject: [PATCH] s/^nat/ipnat/

---
 src/etc/netstart | 8 ++++----
 src/etc/rc.conf  | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/etc/netstart b/src/etc/netstart
index 855de16a..9849f98d 100644
--- a/src/etc/netstart
+++ b/src/etc/netstart
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: netstart,v 1.36 1998/02/23 20:47:35 niklas Exp $
+#	$OpenBSD: netstart,v 1.37 1998/03/28 00:11:00 deraadt Exp $
 
 # /etc/myname contains my symbolic name
 #
@@ -24,11 +24,11 @@ fi
 
 # Configure NAT before configuring network interfaces
 #
-if [ "${nat}" = "YES" -a "${ipfilter}" = "YES" -a -f "${nat_rules}" ]; then
+if [ "${ipnat}" = "YES" -a "${ipfilter}" = "YES" -a -f "${ipnat_rules}" ]; then
 	echo 'configuring NAT'
-	ipnat -CF -f ${nat_rules}
+	ipnat -CF -f ${ipnat_rules}
 else
-	nat=NO
+	ipnat=NO
 fi
 
 # set the address for the loopback interface
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index 64bb95e1..9f195482 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.17 1998/03/25 07:25:21 deraadt Exp $
+#	$OpenBSD: rc.conf,v 1.18 1998/03/28 00:10:59 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"
@@ -26,7 +26,7 @@ kerberos_server=NO	# kerberos server. run 'info kth-krb' for assistance.
 kerberos_slave=NO	# kerberos slave server.
 amd=NO
 ipfilter=NO
-nat=NO			# for "YES" ipfilter must also be "YES"
+ipnat=NO		# for "YES" ipfilter must also be "YES"
 portmap=YES		# almost always needed
 inetd=YES		# almost always needed
 lpd=NO			# printing daemons
@@ -42,6 +42,6 @@ nfsiod_flags="-n 4"		# Crank the 4 for a busy NFS client
 amd_dir=/tmp_mnt		# AMD's mount directory
 amd_master=/etc/amd/master	# AMD 'master' map
 ipfilter_rules=/etc/ipf.rules	# Rules for IP packet filtering
-nat_rules=/etc/ipnat.rules	# Rules for Network Address Translation
+ipnat_rules=/etc/ipnat.rules	# Rules for Network Address Translation
 ipmon_flags=-s			# To disable logging, use ipmon_flags=NO
 syslogd_flags=			# add more flags, ie. -u -a /chroot/dev/log