From ed37e5ea73948cf05726058b7bfdc92101507aa7 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Sat, 21 May 2022 12:42:21 +0000
Subject: [PATCH] ${rcexec} -> rc_exec

---
 etc/rc.d/amd    | 4 ++--
 etc/rc.d/bgpd   | 6 +++---
 etc/rc.d/httpd  | 6 +++---
 etc/rc.d/iked   | 6 +++---
 etc/rc.d/iscsid | 4 ++--
 etc/rc.d/nsd    | 4 ++--
 etc/rc.d/relayd | 6 +++---
 etc/rc.d/spamd  | 4 ++--
 etc/rc.d/vmd    | 6 +++---
 9 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/etc/rc.d/amd b/etc/rc.d/amd
index 3bfe9dc555e..dbfb3d92503 100644
--- a/etc/rc.d/amd
+++ b/etc/rc.d/amd
@@ -1,6 +1,6 @@
 #!/bin/ksh
 #
-# $OpenBSD: amd,v 1.9 2018/01/11 21:09:26 rpe Exp $
+# $OpenBSD: amd,v 1.10 2022/05/21 12:42:21 ajacoutot Exp $
 
 daemon="/usr/sbin/amd"
 
@@ -16,7 +16,7 @@ rc_pre() {
 }
 
 rc_start() {
-	${rcexec} "cd /etc/amd; ${daemon} ${daemon_flags}"
+	rc_exec "cd /etc/amd; ${daemon} ${daemon_flags}"
 }
 
 rc_cmd $1
diff --git a/etc/rc.d/bgpd b/etc/rc.d/bgpd
index b7e3e1657ad..0ad58ea468c 100644
--- a/etc/rc.d/bgpd
+++ b/etc/rc.d/bgpd
@@ -1,6 +1,6 @@
 #!/bin/ksh
 #
-# $OpenBSD: bgpd,v 1.5 2019/01/21 01:41:16 claudio Exp $
+# $OpenBSD: bgpd,v 1.6 2022/05/21 12:42:21 ajacoutot Exp $
 
 daemon="/usr/sbin/bgpd"
 
@@ -8,8 +8,8 @@ daemon="/usr/sbin/bgpd"
 
 # child will not return a config parsing error to the parent
 rc_pre() {
-	# use rcexec here since daemon_flags may contain arguments with spaces
-	${rcexec} "${daemon} -n ${daemon_flags}"
+	# use rc_exec here since daemon_flags may contain arguments with spaces
+	rc_exec "${daemon} -n ${daemon_flags}"
 }
 
 rc_cmd $1
diff --git a/etc/rc.d/httpd b/etc/rc.d/httpd
index bdd98f9b7d7..3747e45418b 100644
--- a/etc/rc.d/httpd
+++ b/etc/rc.d/httpd
@@ -1,6 +1,6 @@
 #!/bin/ksh
 #
-# $OpenBSD: httpd,v 1.7 2019/01/21 01:41:16 claudio Exp $
+# $OpenBSD: httpd,v 1.8 2022/05/21 12:42:21 ajacoutot Exp $
 
 daemon="/usr/sbin/httpd"
 
@@ -8,8 +8,8 @@ daemon="/usr/sbin/httpd"
 
 # child will not return a config parsing error to the parent
 rc_pre() {
-	# use rcexec here since daemon_flags may contain arguments with spaces
-	${rcexec} "${daemon} -n ${daemon_flags}"
+	# use rc_exec here since daemon_flags may contain arguments with spaces
+	rc_exec "${daemon} -n ${daemon_flags}"
 }
 
 rc_cmd $1
diff --git a/etc/rc.d/iked b/etc/rc.d/iked
index d9a0d285557..383ffe767e7 100644
--- a/etc/rc.d/iked
+++ b/etc/rc.d/iked
@@ -1,6 +1,6 @@
 #!/bin/ksh
 #
-# $OpenBSD: iked,v 1.7 2019/01/21 01:41:16 claudio Exp $
+# $OpenBSD: iked,v 1.8 2022/05/21 12:42:21 ajacoutot Exp $
 
 daemon="/sbin/iked"
 
@@ -13,8 +13,8 @@ rc_pre() {
 	[[ ${sasyncd_flags} != NO ]] &&
 		daemon_flags="-S ${daemon_flags}"
 
-	# use rcexec here since daemon_flags may contain arguments with spaces
-	${rcexec} "${daemon} -n ${daemon_flags}"
+	# use rc_exec here since daemon_flags may contain arguments with spaces
+	rc_exec "${daemon} -n ${daemon_flags}"
 }
 
 rc_cmd $1
diff --git a/etc/rc.d/iscsid b/etc/rc.d/iscsid
index 831cbb64e5e..ab26cd1e397 100644
--- a/etc/rc.d/iscsid
+++ b/etc/rc.d/iscsid
@@ -1,6 +1,6 @@
 #!/bin/ksh
 #
-# $OpenBSD: iscsid,v 1.2 2018/01/11 19:52:12 rpe Exp $
+# $OpenBSD: iscsid,v 1.3 2022/05/21 12:42:21 ajacoutot Exp $
 
 daemon="/usr/sbin/iscsid"
 control="/usr/sbin/iscsictl"
@@ -11,7 +11,7 @@ rc_reload=NO
 rc_stop=NO
 
 rc_start() {
-	${rcexec} "${daemon} ${daemon_flags} && ${control} reload"
+	rc_exec "${daemon} ${daemon_flags} && ${control} reload"
 }
 
 rc_cmd $1
diff --git a/etc/rc.d/nsd b/etc/rc.d/nsd
index 70c705e30c2..015f9204293 100644
--- a/etc/rc.d/nsd
+++ b/etc/rc.d/nsd
@@ -1,6 +1,6 @@
 #!/bin/ksh
 #
-# $OpenBSD: nsd,v 1.11 2019/05/12 18:52:43 tim Exp $
+# $OpenBSD: nsd,v 1.12 2022/05/21 12:42:21 ajacoutot Exp $
 
 daemon="/usr/sbin/nsd-control"
 daemon_flags="-c /var/nsd/etc/nsd.conf"
@@ -10,7 +10,7 @@ daemon_flags="-c /var/nsd/etc/nsd.conf"
 rc_usercheck=NO
 
 rc_start() {
-	${rcexec} "${daemon} ${daemon_flags} start"
+	rc_exec "${daemon} ${daemon_flags} start"
 }
 
 rc_check() {
diff --git a/etc/rc.d/relayd b/etc/rc.d/relayd
index a2688e8f705..0548ac538ca 100644
--- a/etc/rc.d/relayd
+++ b/etc/rc.d/relayd
@@ -1,6 +1,6 @@
 #!/bin/ksh
 #
-# $OpenBSD: relayd,v 1.6 2019/01/21 01:41:16 claudio Exp $
+# $OpenBSD: relayd,v 1.7 2022/05/21 12:42:21 ajacoutot Exp $
 
 daemon="/usr/sbin/relayd"
 
@@ -8,8 +8,8 @@ daemon="/usr/sbin/relayd"
 
 # Child will not return a config parsing error to the parent.
 rc_pre() {
-	# use rcexec here since daemon_flags may contain arguments with spaces
-	${rcexec} "${daemon} -n ${daemon_flags}"
+	# use rc_exec here since daemon_flags may contain arguments with spaces
+	rc_exec "${daemon} -n ${daemon_flags}"
 }
 
 rc_cmd $1
diff --git a/etc/rc.d/spamd b/etc/rc.d/spamd
index 10971e347f3..47486ce6d7f 100644
--- a/etc/rc.d/spamd
+++ b/etc/rc.d/spamd
@@ -1,6 +1,6 @@
 #!/bin/ksh
 #
-# $OpenBSD: spamd,v 1.10 2018/01/11 21:09:26 rpe Exp $
+# $OpenBSD: spamd,v 1.11 2022/05/21 12:42:21 ajacoutot Exp $
 
 daemon="/usr/libexec/spamd"
 
@@ -17,7 +17,7 @@ rc_pre() {
 }
 
 rc_start() {
-	${rcexec} "${daemon} ${daemon_flags}" || return 1
+	rc_exec "${daemon} ${daemon_flags}" || return 1
 	/usr/libexec/spamd-setup -D ${spamd_setup_flags}
 }
 
diff --git a/etc/rc.d/vmd b/etc/rc.d/vmd
index 4f8e8a7ae73..2356ecf6f5e 100644
--- a/etc/rc.d/vmd
+++ b/etc/rc.d/vmd
@@ -1,6 +1,6 @@
 #!/bin/ksh
 #
-# $OpenBSD: vmd,v 1.10 2019/01/21 01:41:16 claudio Exp $
+# $OpenBSD: vmd,v 1.11 2022/05/21 12:42:21 ajacoutot Exp $
 
 daemon="/usr/sbin/vmd"
 
@@ -8,8 +8,8 @@ daemon="/usr/sbin/vmd"
 
 # Child will not return a config parsing error to the parent.
 rc_pre() {
-	# use rcexec here since daemon_flags may contain arguments with spaces
-	${rcexec} "${daemon} -n ${daemon_flags}"
+	# use rc_exec here since daemon_flags may contain arguments with spaces
+	rc_exec "${daemon} -n ${daemon_flags}"
 }
 
 rc_stop() {
-- 
2.20.1