* doc/guide.tex: Remove 'ssl' option from documentation and

configuration load (EJAB-461)
* src/ejabberd_listener.erl: Likewise

* src/msgs/cs.msg: Small typo (thanks to Lukas Polivka alias
Spike411)

* src/ejabberd.cfg.example: Small change in order of options

SVN Revision: 1073

diff --git a/ChangeLog b/ChangeLog
index 737346b66dea912a12c74d5895748d67b7696794..4c4200bbb1eeb5cfaec5ff6055274ca6f89bb0bd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,19 @@
+2007-12-17  Badlop  <badlop@process-one.net>
+
+       * doc/guide.tex: Remove 'ssl' option from documentation and
+       configuration load (EJAB-461)
+       * src/ejabberd_listener.erl: Likewise
+
+       * src/msgs/cs.msg: Small typo (thanks to Lukas Polivka alias
+       Spike411)
+
+       * src/ejabberd.cfg.example: Small change in order of options
+
 2007-12-15  Badlop  <badlop@process-one.net>
 
        * src/mod_irc/iconv.erl: Changed order of handle_info
        clause (EJAB-290)
-       * src/stringprep/stringprep.erl: Likesise
+       * src/stringprep/stringprep.erl: Likewise
 
        * src/eldap/eldap.erl: Removed handle_sync_event clause because it
        is never called (EJAB-290)

diff --git a/doc/guide.tex b/doc/guide.tex
index 06825295cae9047a8f3d2dd3d475aaf4c66813ef..c083fcdd07a62968fd5061fedd58171fd1739372 100644 (file)
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -582,7 +582,7 @@ Example:
 \end{verbatim}
 \end{itemize}
 
-\subsection{Listened Sockets}
+\subsection{Listening Ports}
 \label{listened}
 \ind{options!listen}
 
@@ -603,7 +603,7 @@ The available modules, their purpose and the options allowed by each one are:
   \begin{tabular}{|l|l|p{87mm}|}
   \hline \texttt{ejabberd\_c2s}& Description& Handles c2s connections.\\
     \cline{2-3} & Options& \texttt{access}, \texttt{certfile}, \texttt{inet6},
-    \texttt{ip}, \texttt{max\_stanza\_size}, \texttt{shaper}, \texttt{ssl},
+    \texttt{ip}, \texttt{max\_stanza\_size}, \texttt{shaper},
     \texttt{starttls}, \texttt{starttls\_required}, \texttt{tls},
     \texttt{zlib}\\
   \hline \texttt{ejabberd\_s2s\_in}& Description& Handles incoming s2s
@@ -669,10 +669,6 @@ This is a detailed description of each option allowed by the listening modules:
   \titem{\{shaper, <access rule>\}} \ind{options!shaper}This option defines a
     shaper for the port (see section~\ref{shapers}). The default value
     is \term{none}.
-  \titem{ssl} \ind{options!ssl}\ind{SSL}This option specifies that traffic on
-    the port will be encrypted using SSL. You should also set the
-    \option{certfile} option. It is recommended to use the \term{tls} option
-    instead of this one.
   \titem{starttls} \ind{options!starttls}\ind{STARTTLS}This option
     specifies that STARTTLS encryption is available on connections to the port.
     You should also set the \option{certfile} option.

diff --git a/src/ejabberd.cfg.example b/src/ejabberd.cfg.example
index 032c0f154431a66b5e1f9b16f93b8e41e4464468..8e957f38dda34355fd382b9187f9f8f82e10dbdd 100644 (file)
--- a/src/ejabberd.cfg.example
+++ b/src/ejabberd.cfg.example
@@ -126,7 +126,7 @@
   %%{5223, ejabberd_c2s, [
   %%                   {access, c2s},
   %%                   {shaper, c2s_shaper},
-  %%                   tls, {certfile, "/path/to/ssl.pem"},
+  %%                   {certfile, "/path/to/ssl.pem"}, tls,
   %%                   {max_stanza_size, 65536}
   %%                  ]},
 

diff --git a/src/ejabberd_listener.erl b/src/ejabberd_listener.erl
index a7b1503d7eec1c3619f18a207301ed352607b3a4..808896e206db51e309c487df33204e5667dcd76b 100644 (file)
--- a/src/ejabberd_listener.erl
+++ b/src/ejabberd_listener.erl
@@ -43,15 +43,20 @@ init(_) ->
 
 
 start(Port, Module, Opts) ->
+    SSLError = "There is a problem with your ejabberd configuration file: the option 'ssl' for listening sockets is no longer available. To get SSL encryption use the option 'tls'.",
     case lists:keysearch(ssl, 1, Opts) of
-       {value, {ssl, SSLOpts}} ->
-           {ok, proc_lib:spawn_link(?MODULE, init_ssl,
-                                    [Port, Module, Opts, SSLOpts])};
+       {value, {ssl, _SSLOpts}} ->
+           %%{ok, proc_lib:spawn_link(?MODULE, init_ssl,
+           %%               [Port, Module, Opts, SSLOpts])};
+           ?ERROR_MSG(SSLError, []),
+           {error, SSLError};
        _ ->
            case lists:member(ssl, Opts) of
                true ->
-                   {ok, proc_lib:spawn_link(?MODULE, init_ssl,
-                                            [Port, Module, Opts, []])};
+                   %%{ok, proc_lib:spawn_link(?MODULE, init_ssl,
+                   %%               [Port, Module, Opts, []])};
+                   ?ERROR_MSG(SSLError, []),
+                   {error, SSLError};
                false ->
                    {ok, proc_lib:spawn_link(?MODULE, init,
                                             [Port, Module, Opts])}

diff --git a/src/msgs/cs.msg b/src/msgs/cs.msg
index 5ec105d9043d8f124f16df37e2049d2b3ef27736..5e532c1695f1824520584084477ef6cad0b98e94 100644 (file)
--- a/src/msgs/cs.msg
+++ b/src/msgs/cs.msg
@@ -106,7 +106,7 @@
 {"Specified nickname is already registered", "Zadaná přezdívka je již zaregistrována"}.
 
 % mod_muc/mod_muc_room.erl
-{" has set the subject to: ", "změnil(a) téma na: "}.
+{" has set the subject to: ", " změnil(a) téma na: "}.
 {"You need an x:data capable client to configure room", "Ke konfiguraci místnosti potřebujete klienta podporujícího x:data"}.
 {"Configuration for ", "Konfigurace pro "}.
 {"Room title", "Název místnosti"}.