Allow root to run join_cluster and leave_cluster

Prefix the call to joincluster and leavecluster in ejabberdctl by
$EXEC_CMD. Avoid using sh -c in these scripts.

Should fix #676.

diff --git a/ejabberdctl.template b/ejabberdctl.template
index 4704c85c4a56b7c141535c1fa2bd4ad568ed4abb..04ede34718a9004224d2cf625a51b9f41a9b68de 100755 (executable)
--- a/ejabberdctl.template
+++ b/ejabberdctl.template
@@ -444,11 +444,11 @@ check_start()
 # cluster setup
 join_cluster()
 {
-    $EJABBERD_BIN_PATH/joincluster $*
+    $EXEC_CMD "$EJABBERD_BIN_PATH/joincluster $*"
 }
 leave_cluster()
 {
-    $EJABBERD_BIN_PATH/leavecluster $*
+    $EXEC_CMD "$EJABBERD_BIN_PATH/leavecluster $*"
 }
 
 # allow sync calls

diff --git a/tools/joincluster b/tools/joincluster
index ff2e0380f512cdf5e5246048a263ca690cc576cd..99b96bdb3cc59532025daa5e4f70fb13fff1e383 100755 (executable)
--- a/tools/joincluster
+++ b/tools/joincluster
@@ -145,7 +145,7 @@ start() ->
 EOF
 
 $ERLC -o $PA $CLUSTERSETUP_ERL
-sh -c "$ERL $NAME $ERLANG_NODE -pa $PA $KERNEL_OPTS -mnesia extra_db_nodes \"['$REMOTE']\" dir \"\\\"$SPOOL_DIR\\\"\" -s mnesia -s $CLUSTERSETUP start"
+$ERL $NAME $ERLANG_NODE -pa $PA $KERNEL_OPTS -mnesia extra_db_nodes "['$REMOTE']" dir "\"$SPOOL_DIR\"" -s mnesia -s $CLUSTERSETUP start
 cd -
 rm -Rf $PA
 

diff --git a/tools/leavecluster b/tools/leavecluster
index b2dfea0c7213c659b51b23425b7bb77ce752f11e..688b6032ba0d9a9dc9841fe50dd6c1381533a52b 100755 (executable)
--- a/tools/leavecluster
+++ b/tools/leavecluster
@@ -101,7 +101,7 @@ start() ->
 EOF
 
 $ERLC -o $PA $CLUSTERSETUP_ERL
-sh -c "$ERL $NAME $ERLANG_NODE -pa $PA $KERNEL_OPTS -mnesia dir \"\\\"$SPOOL_DIR\\\"\" -s mnesia -s $CLUSTERSETUP start"
+$ERL $NAME $ERLANG_NODE -pa $PA $KERNEL_OPTS -mnesia dir "\"$SPOOL_DIR\"" -s mnesia -s $CLUSTERSETUP start
 cd -
 rm -Rf $PA