===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc.conf,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- src/etc/rc.conf	2001/05/23 16:32:03	1.60
+++ src/etc/rc.conf	2001/05/30 02:11:09	1.61
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.60 2001/05/23 16:32:03 aaron Exp $
+#	$OpenBSD: rc.conf,v 1.61 2001/05/30 02:11:09 deraadt Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 routed_flags=NO		# for normal use: "-q"
@@ -50,8 +50,6 @@
 kerberos_server=NO	# kerberos server. run 'info kth-krb' for assistance.
 kerberos_slave=NO	# kerberos slave server.
 amd=NO
-ipfilter=NO
-ipnat=NO		# for "YES" ipfilter must also be "YES"
 portmap=YES		# almost always needed
 inetd=YES		# almost always needed
 lpd=NO			# printing daemons
@@ -72,9 +70,6 @@
 nfsd_flags="-tun 4"		# Crank the 4 for a busy NFS fileserver
 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
-ipnat_rules=/etc/ipnat.rules	# Rules for Network Address Translation
-ipmon_flags=-Ds			# To disable logging, use ipmon_flags=NO
 syslogd_flags=			# add more flags, ie. "-u -a /chroot/dev/log"
 named_user=named		# Named should not run as root unless necessary
 named_chroot=/var/named		# Where to chroot named if not empty