From 825be14a4490e324654c51c7a55989f021694531 Mon Sep 17 00:00:00 2001 From: ajacoutot <> Date: Wed, 6 Apr 2011 06:09:28 +0000 Subject: [PATCH] Remove leading/trailing spaces from daemon_flags. ok schwarze@ --- src/etc/rc.d/rc.subr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/etc/rc.d/rc.subr b/src/etc/rc.d/rc.subr index 0110e0a9..386c9787 100644 --- a/src/etc/rc.d/rc.subr +++ b/src/etc/rc.d/rc.subr @@ -1,4 +1,4 @@ -# $OpenBSD: rc.subr,v 1.32 2011/04/05 13:57:57 guenther Exp $ +# $OpenBSD: rc.subr,v 1.33 2011/04/06 06:09:28 ajacoutot Exp $ # Default functions and variables used by rc.d(8) scripts. @@ -116,6 +116,6 @@ getcap -f /etc/login.conf ${_name} 1>/dev/null 2>&1 && \ [ -n "${_rcflags}" ] && daemon_flags=${_rcflags} [ -n "${_rcuser}" ] && daemon_user=${_rcuser} -daemon_flags=$(printf '%s\n' "${daemon_flags}" | tr -s "[:space:]") +daemon_flags=$(printf '%s\n' "${daemon_flags}" | tr -s "[:space:]" | sed 's/^[ \t]*//;s/[ \t]*$//') pexp="${daemon}${daemon_flags:+ ${daemon_flags}}" rcexec="su -l -c ${daemon_class} -s /bin/sh ${daemon_user} -c"