* src/ejabberdctl.template: The parameter 'kernel inetrc' is used

even with -sname to guarantee the same behaviour that when using
-name (EJAB-317)

SVN Revision: 1029

diff --git a/ChangeLog b/ChangeLog
index 2fc1a79926d467e53e7b3b47d7ca098f7d8c1fb1..78414194a4f653e9770d722d45b377e81ba67732 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-12-06  Badlop  <badlop@process-one.net>
 
+       * src/ejabberdctl.template: The parameter 'kernel inetrc' is used
+       even with -sname to guarantee the same behaviour that when using
+       -name (EJAB-317)
+
        * doc/guide.tex: Improvements in sections: Start, Creating Initial
        Account, Module Overview, Managing an ejabberd server, and
        Debugging

diff --git a/src/ejabberdctl.template b/src/ejabberdctl.template
index 9d05b559e1629379f03ef162abfbe3ab50807d7c..aa8505b9600ef2bd7d42e4c2472dc6d121616ad1 100644 (file)
--- a/src/ejabberdctl.template
+++ b/src/ejabberdctl.template
@@ -35,7 +35,7 @@ if [ $# -ne 0 ] ; then
 fi
 
 if [ "$ERLANG_NODE" = "${ERLANG_NODE%.*}" ] ; then
-    SNAME="-kernel inetrc \""$EJABBERD_INETRC"\" -sname"
+    SNAME=-sname
 else
     SNAME=-name
 fi
@@ -43,7 +43,7 @@ fi
 # Compatibility in ZSH
 #setopt shwordsplit 2>/dev/null
 
-ERLANG_OPTS="$POLL $SMP $PROCESSES $ERL_MAX_ETS_TABLES"
+ERLANG_OPTS="$POLL $SMP $PROCESSES $ERL_MAX_ETS_TABLES -kernel inetrc \""$EJABBERD_INETRC"\" "
 
 start ()
 {