===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc.conf,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- src/etc/rc.conf	2014/07/11 21:58:32	1.191
+++ src/etc/rc.conf	2014/07/12 10:14:03	1.192
@@ -1,6 +1,4 @@
-#!/bin/sh -
-#
-#	$OpenBSD: rc.conf,v 1.191 2014/07/11 21:58:32 tedu Exp $
+#	$OpenBSD: rc.conf,v 1.192 2014/07/12 10:14:03 robert Exp $
 
 # DO NOT EDIT THIS FILE!!
 #
@@ -24,7 +22,7 @@
 rarpd_flags=NO		# for normal use: "-a"
 bootparamd_flags=NO	# for normal use: ""
 rbootd_flags=NO		# for normal use: ""
-sshd_flags=""		# for normal use: ""
+sshd_flags=		# for normal use: ""
 named_flags=NO		# for normal use: ""
 nsd_flags=NO		# for normal use: "-c /var/nsd/etc/nsd.conf"
 unbound_flags=NO	# for normal use: "-c /var/unbound/etc/unbound.conf"
@@ -54,8 +52,8 @@
 ifstated_flags=NO	# for normal use: ""
 relayd_flags=NO		# for normal use: ""
 snmpd_flags=NO		# for normal use: ""
-smtpd_flags=""		# for normal use: ""
-sndiod_flags=""		# for normal use: ""
+smtpd_flags=		# for normal use: ""
+sndiod_flags=		# for normal use: ""
 ldapd_flags=NO		# for normal use: ""
 npppd_flags=NO		# for normal use: ""
 inetd_flags=NO		# for normal use: ""
@@ -66,7 +64,7 @@
 tftpproxy_flags=NO	# for normal use: ""
 ldomd_flags=NO		# for normal use: ""
 identd_flags=NO		# for normal use: "-e"
-cron_flags=""		# for normal use: ""
+cron_flags=		# for normal use: ""
 
 # use -u to disable chroot, see nginx(8)
 nginx_flags=NO		# for normal use: ""
@@ -76,7 +74,7 @@
 sendmail_flags=NO
 spamd_flags=NO		# for normal use: "" and see spamd(8)
 spamd_black=NO		# set to YES to run spamd without greylisting
-spamlogd_flags=""	# use eg. "-i interface" and see spamlogd(8)
+spamlogd_flags=		# use eg. "-i interface" and see spamlogd(8)
 
 # Set to NO if ftpd is running out of inetd
 ftpd_flags=NO		# for non-inetd use: ""
@@ -119,24 +117,3 @@
 # rc.d(8) packages scripts
 # started in the specified order and stopped in reverse order
 pkg_scripts=
-
-unset mountd_flags nfsd_flags ypbind_flags
-
-[ -f /etc/rc.conf.local ] && . /etc/rc.conf.local
-
-# special care needed for spamlogd to avoid starting it up and failing
-# all the time
-if [  X"${spamd_flags}" = X"NO" -o X"${spamd_black}" != X"NO" ]; then
-	spamlogd_flags=NO
-fi
-
-# special care needed for pflogd to avoid starting it up and failing
-# if pf is not enabled
-if [ X"${pf}" = X"NO" ]; then
-	pflogd_flags=NO
-fi
-
-# backward compatibility
-: ${mountd_flags=$([ X"${nfs_server-NO}" = XYES ] || echo NO)}
-: ${nfsd_flags=$([ X"${nfs_server-NO}" = XYES ] && echo "-tun 4" || echo NO)}
-: ${ypbind_flags=$([ X"`domainname`" != X"" -a -d /var/yp/binding ] || echo NO)}