Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

* src/tls/tls_drv.c: Fix to support OpenSSL older than 

0.9.8f (EJAB-877)(thanks to Jonathan Schleifer)
* doc/guide.tex: It is again supported OpenSSL older than 0.9.8f
* doc/guide.html: Likewise

SVN Revision: 1979
This commit is contained in:
Badlop 2009-03-09 19:17:53 +00:00
parent 10b22b52ef
commit 74c202a714
4 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,5 +1,10 @@
2009-03-09 Badlop <badlop@process-one.net> 2009-03-09 Badlop <badlop@process-one.net>
* src/tls/tls_drv.c: Fix to support OpenSSL older than
0.9.8f (EJAB-877)(thanks to Jonathan Schleifer)
* doc/guide.tex: It is again supported OpenSSL older than 0.9.8f
* doc/guide.html: Likewise
* src/mod_proxy65/mod_proxy65_service.erl: if an ip option is not * src/mod_proxy65/mod_proxy65_service.erl: if an ip option is not
defined, the module takes an IP address of a local defined, the module takes an IP address of a local
hostname (thanks to Evgeniy Khramtsov) hostname (thanks to Evgeniy Khramtsov)

14
doc/guide.html
View File

@ -329,7 +329,7 @@ GNU Make
</LI><LI CLASS="li-itemize">GCC </LI><LI CLASS="li-itemize">GCC
</LI><LI CLASS="li-itemize">Libexpat 1.95 or higher </LI><LI CLASS="li-itemize">Libexpat 1.95 or higher
</LI><LI CLASS="li-itemize">Erlang/OTP R10B-9 or higher. </LI><LI CLASS="li-itemize">Erlang/OTP R10B-9 or higher.
</LI><LI CLASS="li-itemize">OpenSSL 0.9.8f or higher, for STARTTLS, SASL and SSL encryption. Optional, highly recommended. </LI><LI CLASS="li-itemize">OpenSSL 0.9.6 or higher, for STARTTLS, SASL and SSL encryption. Optional, highly recommended.
</LI><LI CLASS="li-itemize">Zlib 1.2.3 or higher, for Stream Compression support (<A HREF="http://www.xmpp.org/extensions/xep-0138.html">XEP-0138</A>). Optional. </LI><LI CLASS="li-itemize">Zlib 1.2.3 or higher, for Stream Compression support (<A HREF="http://www.xmpp.org/extensions/xep-0138.html">XEP-0138</A>). Optional.
</LI><LI CLASS="li-itemize">Erlang mysql library. Optional. For MySQL authentication or storage. See section <A HREF="#compilemysql">3.2.1</A>. </LI><LI CLASS="li-itemize">Erlang mysql library. Optional. For MySQL authentication or storage. See section <A HREF="#compilemysql">3.2.1</A>.
</LI><LI CLASS="li-itemize">Erlang pgsql library. Optional. For PostgreSQL authentication or storage. See section <A HREF="#compilepgsql">3.2.3</A>. </LI><LI CLASS="li-itemize">Erlang pgsql library. Optional. For PostgreSQL authentication or storage. See section <A HREF="#compilepgsql">3.2.3</A>.
@ -436,7 +436,7 @@ MS Visual C++ 6.0 Compiler
</LI><LI CLASS="li-itemize"><A HREF="http://sourceforge.net/project/showfiles.php?group_id=10127&package_id=11277">Expat 2.0.0 or higher</A> </LI><LI CLASS="li-itemize"><A HREF="http://sourceforge.net/project/showfiles.php?group_id=10127&package_id=11277">Expat 2.0.0 or higher</A>
</LI><LI CLASS="li-itemize"><A HREF="http://www.gnu.org/software/libiconv/">GNU Iconv 1.9.2</A> </LI><LI CLASS="li-itemize"><A HREF="http://www.gnu.org/software/libiconv/">GNU Iconv 1.9.2</A>
(optional) (optional)
</LI><LI CLASS="li-itemize"><A HREF="http://www.slproweb.com/products/Win32OpenSSL.html">Shining Light OpenSSL 0.9.8f or higher</A> </LI><LI CLASS="li-itemize"><A HREF="http://www.slproweb.com/products/Win32OpenSSL.html">Shining Light OpenSSL 0.9.8d or higher</A>
(to enable SSL connections) (to enable SSL connections)
</LI><LI CLASS="li-itemize"><A HREF="http://www.zlib.net/">Zlib 1.2.3 or higher</A> </LI><LI CLASS="li-itemize"><A HREF="http://www.zlib.net/">Zlib 1.2.3 or higher</A>
</LI></UL><P> <A NAME="windowscom"></A> </P><!--TOC subsubsection Compilation--> </LI></UL><P> <A NAME="windowscom"></A> </P><!--TOC subsubsection Compilation-->
@ -1148,7 +1148,7 @@ if you define several domains in ejabberd.cfg (see section <A HREF="#hostnames">
you probably want that each virtual host uses a different configuration of database, authentication and storage, you probably want that each virtual host uses a different configuration of database, authentication and storage,
so that usernames do not conflict and mix between different virtual hosts. so that usernames do not conflict and mix between different virtual hosts.
For that purpose, the options described in the next sections For that purpose, the options described in the next sections
must be set inside a <TT>host_cofig</TT> for each vhost (see section <A HREF="#virtualhost">3.1.2</A>). must be set inside a <TT>host_config</TT> for each vhost (see section <A HREF="#virtualhost">3.1.2</A>).
For example: For example:
</P><PRE CLASS="verbatim">{host_config, "public.example.org", [ </P><PRE CLASS="verbatim">{host_config, "public.example.org", [
{odbc_server, {pgsql, "localhost", "database-public-example-org", "ejabberd", "password"}}, {odbc_server, {pgsql, "localhost", "database-public-example-org", "ejabberd", "password"}},
@ -2340,7 +2340,7 @@ In the body you can set a newline with the characters: <CODE>\n</CODE>
list of JIDs which will be notified each time a new account is registered. list of JIDs which will be notified each time a new account is registered.
</DD><DT CLASS="dt-description"><B><TT>iqdisc</TT></B></DT><DD CLASS="dd-description"> This specifies </DD><DT CLASS="dt-description"><B><TT>iqdisc</TT></B></DT><DD CLASS="dd-description"> This specifies
the processing discipline for In-Band Registration (<TT>jabber:iq:register</TT>) IQ queries (see section&#XA0;<A HREF="#modiqdiscoption">3.3.2</A>). the processing discipline for In-Band Registration (<TT>jabber:iq:register</TT>) IQ queries (see section&#XA0;<A HREF="#modiqdiscoption">3.3.2</A>).
</DD></DL><P>This module reads also another option defined globably for the server: </DD></DL><P>This module reads also another option defined globally for the server:
<TT>{registration_timeout, Timeout}</TT>. <TT>{registration_timeout, Timeout}</TT>.
This option limits the frequency of registration from a given IP or username. This option limits the frequency of registration from a given IP or username.
So, a user can&#X2019;t register a new account from the same IP address or JID during So, a user can&#X2019;t register a new account from the same IP address or JID during
@ -2805,7 +2805,7 @@ they are automatically renamed to <TT>"*-old.log"</TT>. See section <A HREF="#lo
Store internal Mnesia database to a binary backup file. Store internal Mnesia database to a binary backup file.
</DD><DT CLASS="dt-description"><B><TT>restore ejabberd.backup</TT></B></DT><DD CLASS="dd-description"> </DD><DT CLASS="dt-description"><B><TT>restore ejabberd.backup</TT></B></DT><DD CLASS="dd-description">
Restore immediately from a binary backup file the internal Mnesia database. Restore immediately from a binary backup file the internal Mnesia database.
This will comsume quite some memory for big servers. This will consume quite some memory for big servers.
</DD><DT CLASS="dt-description"><B><TT>install-fallback ejabberd.backup</TT></B></DT><DD CLASS="dd-description"> </DD><DT CLASS="dt-description"><B><TT>install-fallback ejabberd.backup</TT></B></DT><DD CLASS="dd-description">
The binary backup file is installed as fallback: The binary backup file is installed as fallback:
it will be used to restore the database at the next ejabberd start. it will be used to restore the database at the next ejabberd start.
@ -2827,9 +2827,9 @@ This allows to administer a remote node.</P><P>The <TT>ejabberdctl</TT> script c
This file includes detailed information about each configurable option.</P><P>The <TT>ejabberdctl</TT> script returns a numerical status code. This file includes detailed information about each configurable option.</P><P>The <TT>ejabberdctl</TT> script returns a numerical status code.
Success is represented by <TT>0</TT>, Success is represented by <TT>0</TT>,
error is represented by <TT>1</TT>, error is represented by <TT>1</TT>,
and other codes may be used for specifical results. and other codes may be used for specific results.
This can be used by other scripts to determine automatically This can be used by other scripts to determine automatically
if a command succedded or failed, if a command succeeded or failed,
for example using: <TT>echo $?</TT></P><P> <A NAME="erlangconfiguration"></A> </P><!--TOC subsection Erlang Runtime System--> for example using: <TT>echo $?</TT></P><P> <A NAME="erlangconfiguration"></A> </P><!--TOC subsection Erlang Runtime System-->
<H3 CLASS="subsection"><!--SEC ANCHOR --><A NAME="htoc61">4.1.2</A>&#XA0;&#XA0;<A HREF="#erlangconfiguration">Erlang Runtime System</A></H3><!--SEC END --><P> <A NAME="erlangconfiguration"></A> </P><P><TT>ejabberd</TT> is an Erlang/OTP application that runs inside an Erlang runtime system. <H3 CLASS="subsection"><!--SEC ANCHOR --><A NAME="htoc61">4.1.2</A>&#XA0;&#XA0;<A HREF="#erlangconfiguration">Erlang Runtime System</A></H3><!--SEC END --><P> <A NAME="erlangconfiguration"></A> </P><P><TT>ejabberd</TT> is an Erlang/OTP application that runs inside an Erlang runtime system.
This system is configured using environment variables and command line parameters. This system is configured using environment variables and command line parameters.

14
doc/guide.tex
View File

@ -299,7 +299,7 @@ To compile \ejabberd{} on a `Unix-like' operating system, you need:
\item GCC \item GCC
\item Libexpat 1.95 or higher \item Libexpat 1.95 or higher
\item Erlang/OTP R10B-9 or higher. \item Erlang/OTP R10B-9 or higher.
\item OpenSSL 0.9.8f or higher, for STARTTLS, SASL and SSL encryption. Optional, highly recommended. \item OpenSSL 0.9.6 or higher, for STARTTLS, SASL and SSL encryption. Optional, highly recommended.
\item Zlib 1.2.3 or higher, for Stream Compression support (\xepref{0138}). Optional. \item Zlib 1.2.3 or higher, for Stream Compression support (\xepref{0138}). Optional.
\item Erlang mysql library. Optional. For MySQL authentication or storage. See section \ref{compilemysql}. \item Erlang mysql library. Optional. For MySQL authentication or storage. See section \ref{compilemysql}.
\item Erlang pgsql library. Optional. For PostgreSQL authentication or storage. See section \ref{compilepgsql}. \item Erlang pgsql library. Optional. For PostgreSQL authentication or storage. See section \ref{compilepgsql}.
@ -469,7 +469,7 @@ To compile \ejabberd{} on a Microsoft Windows system, you need:
\item \item
\footahref{http://www.gnu.org/software/libiconv/}{GNU Iconv 1.9.2} \footahref{http://www.gnu.org/software/libiconv/}{GNU Iconv 1.9.2}
(optional) (optional)
\item \footahref{http://www.slproweb.com/products/Win32OpenSSL.html}{Shining Light OpenSSL 0.9.8f or higher} \item \footahref{http://www.slproweb.com/products/Win32OpenSSL.html}{Shining Light OpenSSL 0.9.8d or higher}
(to enable SSL connections) (to enable SSL connections)
\item \footahref{http://www.zlib.net/}{Zlib 1.2.3 or higher} \item \footahref{http://www.zlib.net/}{Zlib 1.2.3 or higher}
\end{itemize} \end{itemize}
@ -1425,7 +1425,7 @@ if you define several domains in ejabberd.cfg (see section \ref{hostnames}),
you probably want that each virtual host uses a different configuration of database, authentication and storage, you probably want that each virtual host uses a different configuration of database, authentication and storage,
so that usernames do not conflict and mix between different virtual hosts. so that usernames do not conflict and mix between different virtual hosts.
For that purpose, the options described in the next sections For that purpose, the options described in the next sections
must be set inside a \term{host\_cofig} for each vhost (see section \ref{virtualhost}). must be set inside a \term{host\_config} for each vhost (see section \ref{virtualhost}).
For example: For example:
\begin{verbatim} \begin{verbatim}
{host_config, "public.example.org", [ {host_config, "public.example.org", [
@ -2986,7 +2986,7 @@ Options:
\iqdiscitem{In-Band Registration (\ns{jabber:iq:register})} \iqdiscitem{In-Band Registration (\ns{jabber:iq:register})}
\end{description} \end{description}
This module reads also another option defined globably for the server: This module reads also another option defined globally for the server:
\term{\{registration\_timeout, Timeout\}}. \ind{options!registratimeout} \term{\{registration\_timeout, Timeout\}}. \ind{options!registratimeout}
This option limits the frequency of registration from a given IP or username. This option limits the frequency of registration from a given IP or username.
So, a user can't register a new account from the same IP address or JID during So, a user can't register a new account from the same IP address or JID during
@ -3576,7 +3576,7 @@ The more interesting ones are:
Store internal Mnesia database to a binary backup file. Store internal Mnesia database to a binary backup file.
\titem {restore ejabberd.backup} \titem {restore ejabberd.backup}
Restore immediately from a binary backup file the internal Mnesia database. Restore immediately from a binary backup file the internal Mnesia database.
This will comsume quite some memory for big servers. This will consume quite some memory for big servers.
\titem {install-fallback ejabberd.backup} \titem {install-fallback ejabberd.backup}
The binary backup file is installed as fallback: The binary backup file is installed as fallback:
it will be used to restore the database at the next ejabberd start. it will be used to restore the database at the next ejabberd start.
@ -3606,9 +3606,9 @@ This file includes detailed information about each configurable option.
The \term{ejabberdctl} script returns a numerical status code. The \term{ejabberdctl} script returns a numerical status code.
Success is represented by \term{0}, Success is represented by \term{0},
error is represented by \term{1}, error is represented by \term{1},
and other codes may be used for specifical results. and other codes may be used for specific results.
This can be used by other scripts to determine automatically This can be used by other scripts to determine automatically
if a command succedded or failed, if a command succeeded or failed,
for example using: \term{echo \$?} for example using: \term{echo \$?}

4
src/tls/tls_drv.c
View File

@ -40,6 +40,10 @@ typedef struct {
typedef unsigned __int32 uint32_t; typedef unsigned __int32 uint32_t;
#endif #endif
#ifndef SSL_OP_NO_TICKET
#define SSL_OP_NO_TICKET 0
#endif
/* /*
* str_hash is based on the public domain code from * str_hash is based on the public domain code from
* http://www.burtleburtle.net/bob/hash/doobs.html * http://www.burtleburtle.net/bob/hash/doobs.html