From 49f4d1d744c85db4b7bfe10b66b87b7614e74b01 Mon Sep 17 00:00:00 2001
From: ajacoutot <>
Date: Tue, 5 Apr 2011 11:47:32 +0000
Subject: [PATCH] Quote $daemon_flags to prevent echo(1) picking them as input
 flags.

from Piotr Sikora
ok robert@
---
 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 e6a0556f..4d972c4a 100644
--- a/src/etc/rc.d/rc.subr
+++ b/src/etc/rc.d/rc.subr
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc.subr,v 1.30 2011/03/25 10:03:26 ajacoutot Exp $
+#	$OpenBSD: rc.subr,v 1.31 2011/04/05 11:47:32 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=$(echo ${daemon_flags} | tr -s "[:space:]")
+daemon_flags=$(echo "${daemon_flags}" | tr -s "[:space:]")
 pexp="${daemon}${daemon_flags:+ ${daemon_flags}}"
 rcexec="su -l -c ${daemon_class} -s /bin/sh ${daemon_user} -c"