From 4525f9a62b8875e2561ef3c21d2825fed5ef6a5c Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@cvs.openbsd.org>
Date: Sun, 19 Jun 2016 11:14:21 +0000
Subject: Temporarily turn caching off; there's a small regression when
 enabling multiple daemons at once; being worked on.

---
 usr.sbin/rcctl/rcctl.sh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/usr.sbin/rcctl/rcctl.sh b/usr.sbin/rcctl/rcctl.sh
index ad347ed7d76..27574b1f9d3 100644
--- a/usr.sbin/rcctl/rcctl.sh
+++ b/usr.sbin/rcctl/rcctl.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: rcctl.sh,v 1.99 2016/06/19 10:54:20 ajacoutot Exp $
+# $OpenBSD: rcctl.sh,v 1.100 2016/06/19 11:14:20 ajacoutot Exp $
 #
 # Copyright (c) 2014, 2015 Antoine Jacoutot <ajacoutot@openbsd.org>
 # Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -150,13 +150,13 @@ svc_is_base()
 	local _svc=$1
 	[ -n "${_svc}" ] || return
 
-	[ "${_cached_svc_is_base[${_svc}]}" ] && \
-		return ${_cached_svc_is_base[${_svc}]}
+#	[ -n "${cached_svc_is_base[${_svc}]}" ] && \
+#		return ${cached_svc_is_base[${_svc}]}
 
 	grep -qw "^${_svc}_flags" /etc/rc.conf
 
-	_cached_svc_is_base[${_svc}]=$?
-	return ${_cached_svc_is_base[${_svc}]}
+	cached_svc_is_base[${_svc}]=$?
+	return ${cached_svc_is_base[${_svc}]}
 }
 
 svc_is_meta()
@@ -164,13 +164,13 @@ svc_is_meta()
 	local _svc=$1
 	[ -n "${_svc}" ] || return
 
-	[ "${_cached_svc_is_meta[${_svc}]}" ] && \
-		return ${_cached_svc_is_meta[${_svc}]}
+#	[ -n "${cached_svc_is_meta[${_svc}]}" ] && \
+#		return ${cached_svc_is_meta[${_svc}]}
 
 	[ -r "/etc/rc.d/${_svc}" ] && ! grep -qw "^rc_cmd" /etc/rc.d/${_svc}
 
-	_cached_svc_is_meta[${_svc}]=$?
-	return ${_cached_svc_is_meta[${_svc}]}
+	cached_svc_is_meta[${_svc}]=$?
+	return ${cached_svc_is_meta[${_svc}]}
 }
 
 svc_is_special()
@@ -178,13 +178,13 @@ svc_is_special()
 	local _svc=$1
 	[ -n "${_svc}" ] || return
 
-	[ "${_cached_svc_is_special[${_svc}]}" ] && \
-		return ${_cached_svc_is_special[${_svc}]}
+#	[ -n "${cached_svc_is_special[${_svc}]}" ] && \
+#		return ${cached_svc_is_special[${_svc}]}
 
 	echo ${_special_svcs} | grep -qw -- ${_svc}
 
-	_cached_svc_is_special[${_svc}]=$?
-	return ${_cached_svc_is_special[${_svc}]}
+	cached_svc_is_special[${_svc}]=$?
+	return ${cached_svc_is_special[${_svc}]}
 }
 
 svc_ls()
-- 
cgit v1.2.3