From 1ec36b20cac3723c72d07198a9bb4750e4f49494 Mon Sep 17 00:00:00 2001 From: ajacoutot <> Date: Wed, 27 Apr 2016 12:58:12 +0000 Subject: [PATCH] Revert matching on the daemon user for now; it breaks sndiod handling which does start as root but does not have a root master process and instead changed its uid. reported by deraadt@ --- src/etc/rc.d/rc.subr | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/etc/rc.d/rc.subr b/src/etc/rc.d/rc.subr index c9dcb0b9..ed6caffd 100644 --- a/src/etc/rc.d/rc.subr +++ b/src/etc/rc.d/rc.subr @@ -1,4 +1,4 @@ -# $OpenBSD: rc.subr,v 1.110 2016/04/26 17:00:20 ajacoutot Exp $ +# $OpenBSD: rc.subr,v 1.111 2016/04/27 12:58:12 ajacoutot Exp $ # # Copyright (c) 2010, 2011, 2014-2016 Antoine Jacoutot # Copyright (c) 2010, 2011 Ingo Schwarze @@ -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() {