===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc.conf,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- src/etc/rc.conf	2013/04/21 10:30:58	1.177
+++ src/etc/rc.conf	2013/04/29 14:11:32	1.178
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.177 2013/04/21 10:30:58 deraadt Exp $
+#	$OpenBSD: rc.conf,v 1.178 2013/04/29 14:11:32 ajacoutot Exp $
 
 # DO NOT EDIT THIS FILE!!
 #
@@ -132,9 +132,7 @@
 # started in the specified order and stopped in reverse order
 pkg_scripts=
 
-unset inetd_flags rwhod_flags portmap_flags kdc_flags kadmind_flags
-unset kpasswdd_flags nfsd_flags mountd_flags lockd_flags
-unset statd_flags amd_flags ypbind_flags sndiod_flags
+unset kadmind_flags kdc_flags kpasswdd_flags mountd_flags nfsd_flags ypbind_flags
 
 [ -f /etc/rc.conf.local ] && . /etc/rc.conf.local
 
@@ -151,16 +149,9 @@
 fi
 
 # backward compatibility
-: ${inetd_flags=$([ X"${inetd-YES}" = XYES ] || echo NO)}
-: ${rwhod_flags=$([ X"${rwhod-NO}" = XYES ] || echo NO)}
-: ${portmap_flags=$([ X"${portmap-NO}" = XYES ] || echo NO)}
-: ${kdc_flags=$([ X"${krb5_master_kdc-NO}" = XYES -o X"${krb5_slave_kdc-NO}" = XYES ] || echo NO)}
 : ${kadmind_flags=$([ X"${krb5_master_kdc-NO}" = XYES ] || echo NO)}
+: ${kdc_flags=$([ X"${krb5_master_kdc-NO}" = XYES -o X"${krb5_slave_kdc-NO}" = XYES ] || echo NO)}
 : ${kpasswdd_flags=$([ X"${krb5_master_kdc-NO}" = XYES ] || echo NO)}
-: ${nfsd_flags=$([ X"${nfs_server-NO}" = XYES ] && echo "-tun 4" || echo NO)}
 : ${mountd_flags=$([ X"${nfs_server-NO}" = XYES ] || echo NO)}
-: ${lockd_flags=$([ X"${lockd-NO}" = XYES ] || echo NO)}
-: ${statd_flags=$([ X"${lockd-NO}" = XYES ] || echo NO)}
-: ${amd_flags=$([ X"${amd-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)}
-: ${sndiod_flags=${aucat_flags-}}