]> granicus.if.org Git - ejabberd/commitdiff
ejabberdctl doesn't support parameters with blankspaces (EJAB-1458)
authorBadlop <badlop@process-one.net>
Wed, 9 Feb 2011 12:30:01 +0000 (13:30 +0100)
committerBadlop <badlop@process-one.net>
Thu, 22 Sep 2011 14:18:04 +0000 (16:18 +0200)
Revert "Escape output from ctlexec() to erl script (thanks to Dan Scott)(EJAB-1399)"

This reverts commit 6dea2d230714b556118fab6710141a88cc8aad23.

src/ejabberdctl.template

index d2f20fa791b6dfaaf732a98a7baf5fbb45cff046..0960f9affa45c7010e7f97015ba8344a9ebebaf9 100644 (file)
@@ -315,21 +315,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