From 6505f95e1ce3e4baa5003bf843f5d6150f597750 Mon Sep 17 00:00:00 2001
From: ajacoutot <>
Date: Sat, 17 Nov 2012 07:51:35 +0000
Subject: [PATCH] Remove pre-rc.d(8) backward compatibility. See
 faq/current.html for more information.

The local_rcconf variable is not used anywhere anymore so drop it.

suggested by deraadt@
ok sthen@
---
 src/etc/rc.conf | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index 2879dcd9..20b11c8f 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.173 2012/11/04 21:47:22 kettenis Exp $
+#	$OpenBSD: rc.conf,v 1.174 2012/11/17 07:51:35 ajacoutot Exp $
 
 # DO NOT EDIT THIS FILE!!
 #
@@ -132,13 +132,7 @@ shlib_dirs=			# extra directories for ldconfig, separated
 # started in the specified order and stopped in reverse order
 pkg_scripts=
 
-local_rcconf="/etc/rc.conf.local"
-
-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
-
-[ -f ${local_rcconf} ] && . ${local_rcconf} # Do not edit this line
+[ -f /etc/rc.conf.local ] && . /etc/rc.conf.local
 
 # special care needed for spamlogd to avoid starting it up and failing
 # all the time
@@ -151,18 +145,3 @@ fi
 if [ X"${pf}" = X"NO" ]; then
 	pflogd_flags=NO
 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)}
-: ${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)}
-: ${ypbind_flags=$([ X"`domainname`" != X"" -a -d /var/yp/binding ] || echo NO)}
-: ${sndiod_flags=${aucat_flags-}}