--- rpms/ejabberd/contribs7/ejabberd-ejabberdctl_fix.diff	2008/11/25 16:20:11	1.3
+++ rpms/ejabberd/contribs7/ejabberd-ejabberdctl_fix.diff	2009/08/24 18:19:21	1.4
@@ -1,12 +1,13 @@
---- src/ejabberdctl.template	2008-05-20 14:22:03.000000000 +0400
-+++ src/ejabberdctl.template	2008-06-22 19:41:03.000000000 +0400
-@@ -9,12 +9,13 @@
+--- src/ejabberdctl.template.fix_user	2008-08-27 13:37:52.000000000 +0400
++++ src/ejabberdctl.template	2008-10-02 09:24:52.000000000 +0400
+@@ -9,13 +9,14 @@
  
  # define default environment variables
  NODE=ejabberd
 -HOST=localhost
 +HOST=`hostname -s`
  ERLANG_NODE=$NODE@$HOST
+ ERL=@erl@
 -ROOTDIR=@rootdir@
 +ROOTDIR=
 +MAINDIR=
@@ -17,7 +18,7 @@
  
  # read custom configuration
  CONFIG=$ROOTDIR/etc/ejabberd/ejabberdctl.cfg
-@@ -42,10 +43,10 @@
+@@ -43,10 +44,10 @@
  ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_PROCESSES"
  
  # define additional environment variables
@@ -36,14 +37,15 @@
  # common control function
  ctl ()
  {
-+    /sbin/runuser -s /bin/bash - ejabberd -c " \
-     erl \
+-    $ERL \
++    ERL_COMMAND="$ERL \
        $NAME ejabberdctl \
        -noinput \
        -pa $EJABBERD_EBIN \
 -      -s ejabberd_ctl -extra $ERLANG_NODE $@
 +      -s ejabberd_ctl -extra $ERLANG_NODE $@ \
 +      "
++    /sbin/runuser -s /bin/bash - ejabberd -c "$ERL_COMMAND"
      result=$?
      case $result in
      0) :;;