diff options
| author | Badlop <badlop@process-one.net> | 2011-02-09 13:30:01 +0100 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2011-09-22 16:18:44 +0200 |
| commit | df0754ade92728a2b85f1b811bca0c8a62a8c2cc (patch) | |
| tree | 86f3a9a51cbee679feea09336f7551fedfd0b000 /src | |
| parent | Fix Denial of Service when user sends malformed publish stanza (thanks to Ole... (diff) | |
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 6dea2d230714b556118fab6710141a88cc8aad23.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberdctl.template | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/ejabberdctl.template b/src/ejabberdctl.template index 012777e92..7d0d4d1a9 100644 --- a/src/ejabberdctl.template +++ b/src/ejabberdctl.template @@ -328,21 +328,13 @@ ctlexec () { CONN_NAME=$1; shift COMMAND=$@ - - CTLEXEC="$ERL \ + $EXEC_CMD "$ERL \ $NAME ${CONN_NAME} \ -noinput \ -hidden \ -pa $EJABBERD_EBIN_PATH \ $KERNEL_OPTS \ - -s ejabberd_ctl -extra $ERLANG_NODE" - - # quote input from the command line - for i in $COMMAND; do - CTLEXEC="$CTLEXEC '$i'"; - done - - $EXEC_CMD "$CTLEXEC" + -s ejabberd_ctl -extra $ERLANG_NODE $COMMAND" } # display ctl usage |