summaryrefslogtreecommitdiff
path: root/src/ejabberdctl.template
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2011-02-09 13:30:01 +0100
committerBadlop <badlop@process-one.net>2011-02-09 16:38:54 +0100
commit6dea2d230714b556118fab6710141a88cc8aad23 (patch)
treec2bacc62df771aff7b3ed52f714a60fddd1e1be6 /src/ejabberdctl.template
parentRemove erroneous comment (EJAB-645) (diff)
Escape output from ctlexec() to erl script (thanks to Dan Scott)(EJAB-1399)
Diffstat (limited to 'src/ejabberdctl.template')
-rw-r--r--src/ejabberdctl.template12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/ejabberdctl.template b/src/ejabberdctl.template
index 67eafbfb..a21c6527 100644
--- a/src/ejabberdctl.template
+++ b/src/ejabberdctl.template
@@ -312,13 +312,21 @@ ctlexec ()
{
CONN_NAME=$1; shift
COMMAND=$@
- $EXEC_CMD "$ERL \
+
+ CTLEXEC="$ERL \
$NAME ${CONN_NAME} \
-noinput \
-hidden \
-pa $EJABBERD_EBIN_PATH \
$KERNEL_OPTS \
- -s ejabberd_ctl -extra $ERLANG_NODE $COMMAND"
+ -s ejabberd_ctl -extra $ERLANG_NODE"
+
+ # quote input from the command line
+ for i in $COMMAND; do
+ CTLEXEC="$CTLEXEC '$i'";
+ done
+
+ $EXEC_CMD "$CTLEXEC"
}
# display ctl usage