From 0b6c7d615567b042351b5ae44077fd48bf44c0d9 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Wed, 17 Jun 2015 07:50:38 +0000 Subject: [PATCH] Really make daemon_class read-only; it's set to "daemon" of a matching login class. --- etc/rc.d/rc.subr | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/etc/rc.d/rc.subr b/etc/rc.d/rc.subr index 7623c0e6339..9287dbadaca 100644 --- a/etc/rc.d/rc.subr +++ b/etc/rc.d/rc.subr @@ -1,4 +1,4 @@ -# $OpenBSD: rc.subr,v 1.95 2015/05/02 09:36:27 ajacoutot Exp $ +# $OpenBSD: rc.subr,v 1.96 2015/06/17 07:50:38 ajacoutot Exp $ # # Copyright (c) 2010, 2011, 2014 Antoine Jacoutot # Copyright (c) 2010, 2011 Ingo Schwarze @@ -270,11 +270,10 @@ eval _rcflags=\${${_name}_flags} eval _rcuser=\${${_name}_user} eval _rctimeout=\${${_name}_timeout} +# set default values getcap -f /etc/login.conf ${_name} 1>/dev/null 2>&1 && \ - daemon_class=${_name} - -# set default values; duplicated in rcctl(8) -[ -z "${daemon_class}" ] && daemon_class=daemon + daemon_class=${_name} || daemon_class=daemon +# duplicated in rcctl(8) [ -z "${daemon_user}" ] && daemon_user=root [ -z "${daemon_timeout}" ] && daemon_timeout=30 -- 2.20.1