From 43f35dae0ecb8fce043bfa00e479ca18dd50ad99 Mon Sep 17 00:00:00 2001
From: ajacoutot <>
Date: Thu, 28 Apr 2016 09:15:16 +0000
Subject: [PATCH] Experiment on matching on the daemon_user is over. It needs
 more work. portmap isn't happy with it as reported by naddy@

---
 src/etc/rc.d/rc.subr |  8 ++++----
 src/etc/rc.d/sndiod  | 14 +-------------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/etc/rc.d/rc.subr b/src/etc/rc.d/rc.subr
index 412406c5..be54d90c 100644
--- a/src/etc/rc.d/rc.subr
+++ b/src/etc/rc.d/rc.subr
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc.subr,v 1.112 2016/04/27 17:29:50 ajacoutot Exp $
+#	$OpenBSD: rc.subr,v 1.113 2016/04/28 09:15:16 ajacoutot Exp $
 #
 # Copyright (c) 2010, 2011, 2014-2016 Antoine Jacoutot <ajacoutot@openbsd.org>
 # Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -155,15 +155,15 @@ rc_start() {
 }
 
 rc_check() {
-	pgrep -T "${daemon_rtable}" -U "${daemon_user}" -q -xf "${pexp}"
+	pgrep -T "${daemon_rtable}" -q -xf "${pexp}"
 }
 
 rc_reload() {
-	pkill -T "${daemon_rtable}" -U "${daemon_user}" -HUP -xf "${pexp}"
+	pkill -T "${daemon_rtable}" -HUP -xf "${pexp}"
 }
 
 rc_stop() {
-	pkill -T "${daemon_rtable}" -U "${daemon_user}" -xf "${pexp}"
+	pkill -T "${daemon_rtable}" -xf "${pexp}"
 }
 
 rc_cmd() {
diff --git a/src/etc/rc.d/sndiod b/src/etc/rc.d/sndiod
index 50b2baf6..ca2e0d25 100644
--- a/src/etc/rc.d/sndiod
+++ b/src/etc/rc.d/sndiod
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: sndiod,v 1.3 2016/04/27 17:29:08 ajacoutot Exp $
+# $OpenBSD: sndiod,v 1.4 2016/04/28 09:15:16 ajacoutot Exp $
 
 daemon="/usr/bin/sndiod"
 
@@ -8,16 +8,4 @@ daemon="/usr/bin/sndiod"
 
 rc_reload=NO
 
-rc_check() {
-	pgrep -T "${daemon_rtable}" -U _sndio -q -xf "${pexp}"
-}
-
-rc_reload() {
-	pkill -T "${daemon_rtable}" -U _sndio -HUP -xf "${pexp}"
-}
-
-rc_stop() {
-	pkill -T "${daemon_rtable}" -U _sndio -xf "${pexp}"
-}
-
 rc_cmd $1