25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-11-26 16:26:24 +01:00

ejabberdctl doesn't support parameters with blankspaces (EJAB-1458)

Revert "Escape output from ctlexec() to erl script (thanks to Dan Scott)(EJAB-1399)"

This reverts commit 6dea2d2307.
This commit is contained in:
Badlop 2011-02-09 13:30:01 +01:00
parent d3c4eab46f
commit df0754ade9

View File

@ -328,21 +328,13 @@ ctlexec ()
{ {
CONN_NAME=$1; shift CONN_NAME=$1; shift
COMMAND=$@ COMMAND=$@
$EXEC_CMD "$ERL \
CTLEXEC="$ERL \
$NAME ${CONN_NAME} \ $NAME ${CONN_NAME} \
-noinput \ -noinput \
-hidden \ -hidden \
-pa $EJABBERD_EBIN_PATH \ -pa $EJABBERD_EBIN_PATH \
$KERNEL_OPTS \ $KERNEL_OPTS \
-s ejabberd_ctl -extra $ERLANG_NODE" -s ejabberd_ctl -extra $ERLANG_NODE $COMMAND"
# quote input from the command line
for i in $COMMAND; do
CTLEXEC="$CTLEXEC '$i'";
done
$EXEC_CMD "$CTLEXEC"
} }
# display ctl usage # display ctl usage