diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2014-08-21 10:06:15 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2014-08-21 10:06:15 +0000 |
| commit | 0a83e31c69f4a4eee2fc849eddff907100657a4d (patch) | |
| tree | 701e7371b29e2e3c80d1dbbea43d25be1bb1cc4d /etc/rc.d | |
| parent | 71f6feb02a831c4983276c5a689b48b1aa76b8d7 (diff) | |
Drop sanitation, _rc_parse_conf does this for us already.
ok schwarze@
Diffstat (limited to 'etc/rc.d')
| -rw-r--r-- | etc/rc.d/rc.subr | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/etc/rc.d/rc.subr b/etc/rc.d/rc.subr index bb67c73d68a..979b1e2b777 100644 --- a/etc/rc.d/rc.subr +++ b/etc/rc.d/rc.subr @@ -1,4 +1,4 @@ -# $OpenBSD: rc.subr,v 1.81 2014/08/17 14:41:03 ajacoutot Exp $ +# $OpenBSD: rc.subr,v 1.82 2014/08/21 10:06:14 ajacoutot Exp $ # # Copyright (c) 2010, 2011, 2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org> @@ -284,11 +284,7 @@ getcap -f /etc/login.conf ${_name} 1>/dev/null 2>&1 && \ [ -n "${_rcuser}" ] && daemon_user=${_rcuser} [ -n "${_rctimeout}" ] && daemon_timeout=${_rctimeout} -# sanitize -daemon_flags=$(printf ' %s' ${daemon_flags}) -daemon_flags=${daemon_flags## } readonly daemon_class -unset _rcflags _rcuser - +unset _rcflags _rcuser _rctimeout pexp="${daemon}${daemon_flags:+ ${daemon_flags}}" rcexec="su -l -c ${daemon_class} -s /bin/sh ${daemon_user} -c" |