doc/release_notes_2.1.0.txt src/ejabberd_piefxis.erl src/mod_ping.erl src/mod_pubsub/mod_pubsub_odbc.erl src/mod_pubsub/node_flat_odbc.erl src/mod_pubsub/node_hometree_odbc.erl src/mod_pubsub/node_pep_odbc.erl src/mod_pubsub/nodetree_tree_odbc.erl src/mod_pubsub/pubsub_db_odbc.erl src/mod_pubsub/pubsub_odbc.patch src/mod_pubsub/pubsub_subscription_odbc.erl src/stun/Makefile.in src/stun/Makefile.win32 src/stun/ejabberd_stun.erl src/stun/stun.hrl src/stun/stun_codec.erl @@ -27,6 +27,7 @@ To compile ejabberd you need: (mod_irc). Optional. Not needed on systems with GNU Libc. - erls3 (https://github.com/cstar/erls3/tree) and erlsdb (https://github.com/cstar/erlsdb/tree) - ImageMagick’s Convert program. Optional. For CAPTCHA challenges. + - exmpp 0.9.1 or higher. Optional. For import/export XEP-0227 files. 1. Compile and install on *nix systems README @@ -84,7 +84,7 @@ Kevin Smith, Current maintainer of the Psi project</BLOCKQUOTE> +<A NAME="intro"></A><TT>ejabberd</TT> is a free and open source instant messaging server written in <A HREF="http://www.erlang.org/">Erlang/OTP</A>.<TT>ejabberd</TT> is cross-platform, distributed, fault-tolerant, and based on open standards to achieve real-time communication.<TT>ejabberd</TT> is designed to be a rock-solid and feature rich XMPP server.<TT>ejabberd</TT> is suitable for small deployments, whether they need to be scalable or not, as well as extremely big deployments. <H2 CLASS="section"><A NAME="htoc1">1</A>&#XA0;&#XA0;Key Features</H2> <A NAME="keyfeatures"></A> <TT>ejabberd</TT> is: doc/dev.html @@ -61,7 +61,7 @@ SPAN{width:20%; float:right; text-align:left; margin-left:auto;} </DIV><BLOCKQUOTE CLASS="quotation">I can thoroughly recommend ejabberd for ease of setup &#X2013; Kevin Smith, Current maintainer of the Psi project</BLOCKQUOTE>Introduction <A NAME="intro"></A><BLOCKQUOTE CLASS="quotation">I just tried out ejabberd and was impressed both by ejabberd itself and the language it is written in, Erlang. &#X2014; -Joeri</BLOCKQUOTE><TT>ejabberd</TT> is a free and open source instant messaging server written in <A HREF="http://www.erlang.org/">Erlang</A>.<TT>ejabberd</TT> is cross-platform, distributed, fault-tolerant, and based on open standards to achieve real-time communication.<TT>ejabberd</TT> is designed to be a rock-solid and feature rich XMPP server.<TT>ejabberd</TT> is suitable for small deployments, whether they need to be scalable or not, as well as extremely big deployments. +Joeri</BLOCKQUOTE><TT>ejabberd</TT> is a free and open source instant messaging server written in <A HREF="http://www.erlang.org/">Erlang/OTP</A>.<TT>ejabberd</TT> is cross-platform, distributed, fault-tolerant, and based on open standards to achieve real-time communication.<TT>ejabberd</TT> is designed to be a rock-solid and feature rich XMPP server.<TT>ejabberd</TT> is suitable for small deployments, whether they need to be scalable or not, as well as extremely big deployments. <H2 CLASS="section"><A NAME="htoc1"></A>Key Features</H2> <A NAME="keyfeatures"></A> <BLOCKQUOTE CLASS="quotation">Erlang seems to be tailor-made for writing stable, robust servers. &#X2014; doc/features.html @@ -124,100 +124,102 @@ BLOCKQUOTE.figure DIV.center DIV.center HR{display:none;} </LI><LI CLASS="li-toc"><A HREF="#htoc26">3.1.6&#XA0;&#XA0;Shapers</A> </LI><LI CLASS="li-toc"><A HREF="#htoc27">3.1.7&#XA0;&#XA0;Default Language</A> </LI><LI CLASS="li-toc"><A HREF="#htoc28">3.1.8&#XA0;&#XA0;CAPTCHA</A> -</LI><LI CLASS="li-toc"><A HREF="#htoc29">3.1.9&#XA0;&#XA0;Include Additional Configuration Files</A> -</LI><LI CLASS="li-toc"><A HREF="#htoc30">3.1.10&#XA0;&#XA0;Option Macros in Configuration File</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc29">3.1.9&#XA0;&#XA0;STUN</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc30">3.1.10&#XA0;&#XA0;Include Additional Configuration Files</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc31">3.1.11&#XA0;&#XA0;Option Macros in Configuration File</A> </LI></UL> -</LI><LI CLASS="li-toc"><A HREF="#htoc31">3.2&#XA0;&#XA0;Database and LDAP Configuration</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc32">3.2&#XA0;&#XA0;Database and LDAP Configuration</A> <UL CLASS="toc"><LI CLASS="li-toc"> -<A HREF="#htoc32">3.2.1&#XA0;&#XA0;MySQL</A> -</LI><LI CLASS="li-toc"><A HREF="#htoc33">3.2.2&#XA0;&#XA0;Microsoft SQL Server</A> -</LI><LI CLASS="li-toc"><A HREF="#htoc34">3.2.3&#XA0;&#XA0;PostgreSQL</A> -</LI><LI CLASS="li-toc"><A HREF="#htoc35">3.2.4&#XA0;&#XA0;ODBC Compatible</A> -</LI><LI CLASS="li-toc"><A HREF="#htoc36">3.2.5&#XA0;&#XA0;LDAP</A> +<A HREF="#htoc33">3.2.1&#XA0;&#XA0;MySQL</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc34">3.2.2&#XA0;&#XA0;Microsoft SQL Server</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc35">3.2.3&#XA0;&#XA0;PostgreSQL</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc36">3.2.4&#XA0;&#XA0;ODBC Compatible</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc37">3.2.5&#XA0;&#XA0;LDAP</A> </LI></UL> -</LI><LI CLASS="li-toc"><A HREF="#htoc37">3.3&#XA0;&#XA0;Modules Configuration</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc38">3.3&#XA0;&#XA0;Modules Configuration</A> <UL CLASS="toc"><LI CLASS="li-toc"> -<A HREF="#htoc38">3.3.1&#XA0;&#XA0;Modules Overview</A> -</LI><LI CLASS="li-toc"><A HREF="#htoc39">3.3.2&#XA0;&#XA0;Common Options</A> -</LI><LI CLASS="li-toc"><A HREF="#htoc40">3.3.3&#XA0;&#XA0;<TT>mod_announce</TT></A> -</LI><LI CLASS="li-toc"><A HREF="#htoc41">3.3.4&#XA0;&#XA0;<TT>mod_disco</TT></A> -</LI><LI CLASS="li-toc"><A HREF="#htoc42">3.3.5&#XA0;&#XA0;<TT>mod_echo</TT></A> -</LI><LI CLASS="li-toc"><A HREF="#htoc43">3.3.6&#XA0;&#XA0;<TT>mod_http_bind</TT></A> -</LI><LI CLASS="li-toc"><A HREF="#htoc44">3.3.7&#XA0;&#XA0;<TT>mod_http_fileserver</TT></A> -</LI><LI CLASS="li-toc"><A HREF="#htoc45">3.3.8&#XA0;&#XA0;<TT>mod_irc</TT></A> -</LI><LI CLASS="li-toc"><A HREF="#htoc46">3.3.9&#XA0;&#XA0;<TT>mod_last</TT></A> -</LI><LI CLASS="li-toc"><A HREF="#htoc47">3.3.10&#XA0;&#XA0;<TT>mod_muc</TT></A> -</LI><LI CLASS="li-toc"><A HREF="#htoc48">3.3.11&#XA0;&#XA0;<TT>mod_muc_log</TT></A> -</LI><LI CLASS="li-toc"><A HREF="#htoc49">3.3.12&#XA0;&#XA0;<TT>mod_offline</TT></A> -</LI><LI CLASS="li-toc"><A HREF="#htoc50">3.3.13&#XA0;&#XA0;<TT>mod_privacy</TT></A> -</LI><LI CLASS="li-toc"><A HREF="#htoc51">3.3.14&#XA0;&#XA0;<TT>mod_private</TT></A> -</LI><LI CLASS="li-toc"><A HREF="#htoc52">3.3.15&#XA0;&#XA0;<TT>mod_proxy65</TT></A> -</LI><LI CLASS="li-toc"><A HREF="#htoc53">3.3.16&#XA0;&#XA0;<TT>mod_pubsub</TT></A> -</LI><LI CLASS="li-toc"><A HREF="#htoc54">3.3.17&#XA0;&#XA0;<TT>mod_register</TT></A> -</LI><LI CLASS="li-toc"><A HREF="#htoc55">3.3.18&#XA0;&#XA0;<TT>mod_roster</TT></A> -</LI><LI CLASS="li-toc"><A HREF="#htoc56">3.3.19&#XA0;&#XA0;<TT>mod_service_log</TT></A> -</LI><LI CLASS="li-toc"><A HREF="#htoc57">3.3.20&#XA0;&#XA0;<TT>mod_shared_roster</TT></A> -</LI><LI CLASS="li-toc"><A HREF="#htoc58">3.3.21&#XA0;&#XA0;<TT>mod_stats</TT></A> -</LI><LI CLASS="li-toc"><A HREF="#htoc59">3.3.22&#XA0;&#XA0;<TT>mod_time</TT></A> -</LI><LI CLASS="li-toc"><A HREF="#htoc60">3.3.23&#XA0;&#XA0;<TT>mod_vcard</TT></A> -</LI><LI CLASS="li-toc"><A HREF="#htoc61">3.3.24&#XA0;&#XA0;<TT>mod_vcard_ldap</TT></A> -</LI><LI CLASS="li-toc"><A HREF="#htoc62">3.3.25&#XA0;&#XA0;<TT>mod_version</TT></A> +<A HREF="#htoc39">3.3.1&#XA0;&#XA0;Modules Overview</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc40">3.3.2&#XA0;&#XA0;Common Options</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc41">3.3.3&#XA0;&#XA0;<TT>mod_announce</TT></A> +</LI><LI CLASS="li-toc"><A HREF="#htoc42">3.3.4&#XA0;&#XA0;<TT>mod_disco</TT></A> +</LI><LI CLASS="li-toc"><A HREF="#htoc43">3.3.5&#XA0;&#XA0;<TT>mod_echo</TT></A> +</LI><LI CLASS="li-toc"><A HREF="#htoc44">3.3.6&#XA0;&#XA0;<TT>mod_http_bind</TT></A> +</LI><LI CLASS="li-toc"><A HREF="#htoc45">3.3.7&#XA0;&#XA0;<TT>mod_http_fileserver</TT></A> +</LI><LI CLASS="li-toc"><A HREF="#htoc46">3.3.8&#XA0;&#XA0;<TT>mod_irc</TT></A> +</LI><LI CLASS="li-toc"><A HREF="#htoc47">3.3.9&#XA0;&#XA0;<TT>mod_last</TT></A> +</LI><LI CLASS="li-toc"><A HREF="#htoc48">3.3.10&#XA0;&#XA0;<TT>mod_muc</TT></A> +</LI><LI CLASS="li-toc"><A HREF="#htoc49">3.3.11&#XA0;&#XA0;<TT>mod_muc_log</TT></A> +</LI><LI CLASS="li-toc"><A HREF="#htoc50">3.3.12&#XA0;&#XA0;<TT>mod_offline</TT></A> +</LI><LI CLASS="li-toc"><A HREF="#htoc51">3.3.13&#XA0;&#XA0;<TT>mod_ping</TT></A> +</LI><LI CLASS="li-toc"><A HREF="#htoc52">3.3.14&#XA0;&#XA0;<TT>mod_privacy</TT></A> +</LI><LI CLASS="li-toc"><A HREF="#htoc53">3.3.15&#XA0;&#XA0;<TT>mod_private</TT></A> +</LI><LI CLASS="li-toc"><A HREF="#htoc54">3.3.16&#XA0;&#XA0;<TT>mod_proxy65</TT></A> +</LI><LI CLASS="li-toc"><A HREF="#htoc55">3.3.17&#XA0;&#XA0;<TT>mod_pubsub</TT></A> +</LI><LI CLASS="li-toc"><A HREF="#htoc56">3.3.18&#XA0;&#XA0;<TT>mod_register</TT></A> +</LI><LI CLASS="li-toc"><A HREF="#htoc57">3.3.19&#XA0;&#XA0;<TT>mod_roster</TT></A> +</LI><LI CLASS="li-toc"><A HREF="#htoc58">3.3.20&#XA0;&#XA0;<TT>mod_service_log</TT></A> +</LI><LI CLASS="li-toc"><A HREF="#htoc59">3.3.21&#XA0;&#XA0;<TT>mod_shared_roster</TT></A> +</LI><LI CLASS="li-toc"><A HREF="#htoc60">3.3.22&#XA0;&#XA0;<TT>mod_stats</TT></A> +</LI><LI CLASS="li-toc"><A HREF="#htoc61">3.3.23&#XA0;&#XA0;<TT>mod_time</TT></A> +</LI><LI CLASS="li-toc"><A HREF="#htoc62">3.3.24&#XA0;&#XA0;<TT>mod_vcard</TT></A> +</LI><LI CLASS="li-toc"><A HREF="#htoc63">3.3.25&#XA0;&#XA0;<TT>mod_vcard_ldap</TT></A> +</LI><LI CLASS="li-toc"><A HREF="#htoc64">3.3.26&#XA0;&#XA0;<TT>mod_version</TT></A> </LI></UL> </LI></UL> -</LI><LI CLASS="li-toc"><A HREF="#htoc63">Chapter&#XA0;4&#XA0;&#XA0;Managing an <TT>ejabberd</TT> Server</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc65">Chapter&#XA0;4&#XA0;&#XA0;Managing an <TT>ejabberd</TT> Server</A> <UL CLASS="toc"><LI CLASS="li-toc"> -<A HREF="#htoc64">4.1&#XA0;&#XA0;<TT>ejabberdctl</TT></A> +<A HREF="#htoc66">4.1&#XA0;&#XA0;<TT>ejabberdctl</TT></A> <UL CLASS="toc"><LI CLASS="li-toc"> -<A HREF="#htoc65">4.1.1&#XA0;&#XA0;ejabberdctl Commands</A> -</LI><LI CLASS="li-toc"><A HREF="#htoc66">4.1.2&#XA0;&#XA0;Erlang Runtime System</A> +<A HREF="#htoc67">4.1.1&#XA0;&#XA0;ejabberdctl Commands</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc68">4.1.2&#XA0;&#XA0;Erlang Runtime System</A> </LI></UL> -</LI><LI CLASS="li-toc"><A HREF="#htoc67">4.2&#XA0;&#XA0;<TT>ejabberd</TT> Commands</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc69">4.2&#XA0;&#XA0;<TT>ejabberd</TT> Commands</A> <UL CLASS="toc"><LI CLASS="li-toc"> -<A HREF="#htoc68">4.2.1&#XA0;&#XA0;List of ejabberd Commands</A> -</LI><LI CLASS="li-toc"><A HREF="#htoc69">4.2.2&#XA0;&#XA0;Restrict Execution with AccessCommands</A> +<A HREF="#htoc70">4.2.1&#XA0;&#XA0;List of ejabberd Commands</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc71">4.2.2&#XA0;&#XA0;Restrict Execution with AccessCommands</A> </LI></UL> -</LI><LI CLASS="li-toc"><A HREF="#htoc70">4.3&#XA0;&#XA0;Web Admin</A> -</LI><LI CLASS="li-toc"><A HREF="#htoc71">4.4&#XA0;&#XA0;Ad-hoc Commands</A> -</LI><LI CLASS="li-toc"><A HREF="#htoc72">4.5&#XA0;&#XA0;Change Computer Hostname</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc72">4.3&#XA0;&#XA0;Web Admin</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc73">4.4&#XA0;&#XA0;Ad-hoc Commands</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc74">4.5&#XA0;&#XA0;Change Computer Hostname</A> </LI></UL> -</LI><LI CLASS="li-toc"><A HREF="#htoc73">Chapter&#XA0;5&#XA0;&#XA0;Securing <TT>ejabberd</TT></A> +</LI><LI CLASS="li-toc"><A HREF="#htoc75">Chapter&#XA0;5&#XA0;&#XA0;Securing <TT>ejabberd</TT></A> <UL CLASS="toc"><LI CLASS="li-toc"> -<A HREF="#htoc74">5.1&#XA0;&#XA0;Firewall Settings</A> -</LI><LI CLASS="li-toc"><A HREF="#htoc75">5.2&#XA0;&#XA0;epmd</A> -</LI><LI CLASS="li-toc"><A HREF="#htoc76">5.3&#XA0;&#XA0;Erlang Cookie</A> -</LI><LI CLASS="li-toc"><A HREF="#htoc77">5.4&#XA0;&#XA0;Erlang Node Name</A> -</LI><LI CLASS="li-toc"><A HREF="#htoc78">5.5&#XA0;&#XA0;Securing Sensible Files</A> +<A HREF="#htoc76">5.1&#XA0;&#XA0;Firewall Settings</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc77">5.2&#XA0;&#XA0;epmd</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc78">5.3&#XA0;&#XA0;Erlang Cookie</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc79">5.4&#XA0;&#XA0;Erlang Node Name</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc80">5.5&#XA0;&#XA0;Securing Sensible Files</A> </LI></UL> -</LI><LI CLASS="li-toc"><A HREF="#htoc79">Chapter&#XA0;6&#XA0;&#XA0;Clustering</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc81">Chapter&#XA0;6&#XA0;&#XA0;Clustering</A> <UL CLASS="toc"><LI CLASS="li-toc"> -<A HREF="#htoc80">6.1&#XA0;&#XA0;How it Works</A> +<A HREF="#htoc82">6.1&#XA0;&#XA0;How it Works</A> <UL CLASS="toc"><LI CLASS="li-toc"> -<A HREF="#htoc81">6.1.1&#XA0;&#XA0;Router</A> -</LI><LI CLASS="li-toc"><A HREF="#htoc82">6.1.2&#XA0;&#XA0;Local Router</A> -</LI><LI CLASS="li-toc"><A HREF="#htoc83">6.1.3&#XA0;&#XA0;Session Manager</A> -</LI><LI CLASS="li-toc"><A HREF="#htoc84">6.1.4&#XA0;&#XA0;s2s Manager</A> +<A HREF="#htoc83">6.1.1&#XA0;&#XA0;Router</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc84">6.1.2&#XA0;&#XA0;Local Router</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc85">6.1.3&#XA0;&#XA0;Session Manager</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc86">6.1.4&#XA0;&#XA0;s2s Manager</A> </LI></UL> -</LI><LI CLASS="li-toc"><A HREF="#htoc85">6.2&#XA0;&#XA0;Clustering Setup</A> -</LI><LI CLASS="li-toc"><A HREF="#htoc86">6.3&#XA0;&#XA0;Service Load-Balancing</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc87">6.2&#XA0;&#XA0;Clustering Setup</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc88">6.3&#XA0;&#XA0;Service Load-Balancing</A> <UL CLASS="toc"><LI CLASS="li-toc"> -<A HREF="#htoc87">6.3.1&#XA0;&#XA0;Components Load-Balancing</A> -</LI><LI CLASS="li-toc"><A HREF="#htoc88">6.3.2&#XA0;&#XA0;Domain Load-Balancing Algorithm</A> -</LI><LI CLASS="li-toc"><A HREF="#htoc89">6.3.3&#XA0;&#XA0;Load-Balancing Buckets</A> +<A HREF="#htoc89">6.3.1&#XA0;&#XA0;Components Load-Balancing</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc90">6.3.2&#XA0;&#XA0;Domain Load-Balancing Algorithm</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc91">6.3.3&#XA0;&#XA0;Load-Balancing Buckets</A> </LI></UL> </LI></UL> -</LI><LI CLASS="li-toc"><A HREF="#htoc90">Chapter&#XA0;7&#XA0;&#XA0;Debugging</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc92">Chapter&#XA0;7&#XA0;&#XA0;Debugging</A> <UL CLASS="toc"><LI CLASS="li-toc"> -<A HREF="#htoc91">7.1&#XA0;&#XA0;Log Files</A> -</LI><LI CLASS="li-toc"><A HREF="#htoc92">7.2&#XA0;&#XA0;Debug Console</A> -</LI><LI CLASS="li-toc"><A HREF="#htoc93">7.3&#XA0;&#XA0;Watchdog Alerts</A> +<A HREF="#htoc93">7.1&#XA0;&#XA0;Log Files</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc94">7.2&#XA0;&#XA0;Debug Console</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc95">7.3&#XA0;&#XA0;Watchdog Alerts</A> </LI></UL> -</LI><LI CLASS="li-toc"><A HREF="#htoc94">Appendix&#XA0;A&#XA0;&#XA0;Internationalization and Localization</A> -</LI><LI CLASS="li-toc"><A HREF="#htoc95">Appendix&#XA0;B&#XA0;&#XA0;Release Notes</A> -</LI><LI CLASS="li-toc"><A HREF="#htoc96">Appendix&#XA0;C&#XA0;&#XA0;Acknowledgements</A> -</LI><LI CLASS="li-toc"><A HREF="#htoc97">Appendix&#XA0;D&#XA0;&#XA0;Copyright Information</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc96">Appendix&#XA0;A&#XA0;&#XA0;Internationalization and Localization</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc97">Appendix&#XA0;B&#XA0;&#XA0;Release Notes</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc98">Appendix&#XA0;C&#XA0;&#XA0;Acknowledgements</A> +</LI><LI CLASS="li-toc"><A HREF="#htoc99">Appendix&#XA0;D&#XA0;&#XA0;Copyright Information</A> </LI></UL> <H1 CLASS="chapter"><A NAME="htoc1">Chapter&#XA0;1</A>&#XA0;&#XA0;Introduction</H1> -<A NAME="intro"></A><TT>ejabberd</TT> is a free and open source instant messaging server written in <A HREF="http://www.erlang.org/">Erlang</A>.<TT>ejabberd</TT> is cross-platform, distributed, fault-tolerant, and based on open standards to achieve real-time communication.<TT>ejabberd</TT> is designed to be a rock-solid and feature rich XMPP server.<TT>ejabberd</TT> is suitable for small deployments, whether they need to be scalable or not, as well as extremely big deployments. +<A NAME="intro"></A><TT>ejabberd</TT> is a free and open source instant messaging server written in <A HREF="http://www.erlang.org/">Erlang/OTP</A>.<TT>ejabberd</TT> is cross-platform, distributed, fault-tolerant, and based on open standards to achieve real-time communication.<TT>ejabberd</TT> is designed to be a rock-solid and feature rich XMPP server.<TT>ejabberd</TT> is suitable for small deployments, whether they need to be scalable or not, as well as extremely big deployments. <H2 CLASS="section"><A NAME="htoc2">1.1</A>&#XA0;&#XA0;Key Features</H2> <A NAME="keyfeatures"></A> <TT>ejabberd</TT> is: @@ -268,12 +270,12 @@ Internal Authentication. </LI><LI CLASS="li-itemize">Others <UL CLASS="itemize"><LI CLASS="li-itemize"> Support for virtual hosting. -</LI><LI CLASS="li-itemize">Compressing XML streams with Stream Compression (<A HREF="http://www.xmpp.org/extensions/xep-0138.html">XEP-0138</A>). -</LI><LI CLASS="li-itemize">Statistics via Statistics Gathering (<A HREF="http://www.xmpp.org/extensions/xep-0039.html">XEP-0039</A>). +</LI><LI CLASS="li-itemize">Compressing XML streams with Stream Compression (<A HREF="http://xmpp.org/extensions/xep-0138.html">XEP-0138</A>). +</LI><LI CLASS="li-itemize">Statistics via Statistics Gathering (<A HREF="http://xmpp.org/extensions/xep-0039.html">XEP-0039</A>). </LI><LI CLASS="li-itemize">IPv6 support both for c2s and s2s connections. -</LI><LI CLASS="li-itemize"><A HREF="http://www.xmpp.org/extensions/xep-0045.html">Multi-User Chat</A> module with support for clustering and HTML logging. </LI><LI CLASS="li-itemize">Users Directory based on users vCards. -</LI><LI CLASS="li-itemize"><A HREF="http://www.xmpp.org/extensions/xep-0060.html">Publish-Subscribe</A> component with support for <A HREF="http://www.xmpp.org/extensions/xep-0163.html">Personal Eventing via Pubsub</A>. -</LI><LI CLASS="li-itemize">Support for web clients: <A HREF="http://www.xmpp.org/extensions/xep-0025.html">HTTP Polling</A> and <A HREF="http://www.xmpp.org/extensions/xep-0206.html">HTTP Binding (BOSH)</A> services. +</LI><LI CLASS="li-itemize"><A HREF="http://xmpp.org/extensions/xep-0045.html">Multi-User Chat</A> module with support for clustering and HTML logging. </LI><LI CLASS="li-itemize">Users Directory based on users vCards. +</LI><LI CLASS="li-itemize"><A HREF="http://xmpp.org/extensions/xep-0060.html">Publish-Subscribe</A> component with support for <A HREF="http://xmpp.org/extensions/xep-0163.html">Personal Eventing via Pubsub</A>. +</LI><LI CLASS="li-itemize">Support for web clients: <A HREF="http://xmpp.org/extensions/xep-0025.html">HTTP Polling</A> and <A HREF="http://xmpp.org/extensions/xep-0206.html">HTTP Binding (BOSH)</A> services. </LI><LI CLASS="li-itemize">IRC transport. </LI><LI CLASS="li-itemize">Component support: interface with networks such as AIM, ICQ and MSN installing special tranports. </LI></UL> @@ -340,12 +342,13 @@ GNU Make </LI><LI CLASS="li-itemize">Libexpat 1.95 or higher </LI><LI CLASS="li-itemize">Erlang/OTP R10B-9 or higher. The recommended version is R12B-5. Support for R13 is experimental. </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://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 pgsql library. Optional. For PostgreSQL authentication or storage. See section <A HREF="#compilepgsql">3.2.3</A>. </LI><LI CLASS="li-itemize">PAM library. Optional. For Pluggable Authentication Modules (PAM). See section <A HREF="#pam">3.1.4</A>. </LI><LI CLASS="li-itemize">GNU Iconv 1.8 or higher, for the IRC Transport (mod_irc). Optional. Not needed on systems with GNU Libc. See section <A HREF="#modirc">3.3.8</A>. </LI><LI CLASS="li-itemize">ImageMagick&#X2019;s Convert program. Optional. For CAPTCHA challenges. See section <A HREF="#captcha">3.1.8</A>. +</LI><LI CLASS="li-itemize">exmpp 0.9.1 or higher. Optional. For import/export user data with <A HREF="http://xmpp.org/extensions/xep-0227.html">XEP-0227</A> XML files. </LI></UL> <A NAME="download"></A>  <H3 CLASS="subsection"><A NAME="htoc10">2.4.2</A>&#XA0;&#XA0;<A HREF="#download">Download Source Code</A></H3> <A NAME="download"></A> Released versions of <TT>ejabberd</TT> are available in the ProcessOne <TT>ejabberd</TT> downloads page: @@ -501,7 +504,7 @@ There are two ways to register a Jabber account: <OL CLASS="enumerate" type=a><LI CLASS="li-enumerate"> Using <TT>ejabberdctl</TT> (see section&#XA0;<A HREF="#ejabberdctl">4.1</A>): <PRE CLASS="verbatim">ejabberdctl register admin1 example.org FgT5bk3 -</PRE></LI><LI CLASS="li-enumerate">Using a Jabber client and In-Band Registration (see section&#XA0;<A HREF="#modregister">3.3.17</A>). +</PRE></LI><LI CLASS="li-enumerate">Using a Jabber client and In-Band Registration (see section&#XA0;<A HREF="#modregister">3.3.18</A>). </LI></OL> </LI><LI CLASS="li-enumerate">Edit the <TT>ejabberd</TT> configuration file to give administration rights to the Jabber account you created: <PRE CLASS="verbatim">{acl, admins, {user, "admin1", "example.org"}}. @@ -535,7 +538,7 @@ edit the configuration file, or remove all its content.The configuration the name of an option, and any further elements are that option&#X2019;s values. If the configuration file do not contain for instance the &#X2018;hosts&#X2019; option, the old host name(s) stored in the database will be used.You can override the old values stored in the database by adding next lines to -the configuration file: +the beginning of the configuration file: <PRE CLASS="verbatim">override_global. override_local. override_acls. @@ -544,22 +547,18 @@ cluster), local options (which are specific for this particular <TT>ejabberd</TT and ACLs will be removed before new ones are added. <A NAME="hostnames"></A>  <H3 CLASS="subsection"><A NAME="htoc21">3.1.1</A>&#XA0;&#XA0;<A HREF="#hostnames">Host Names</A></H3> <A NAME="hostnames"></A> The option <TT>hosts</TT> defines a list containing one or more domains that -<TT>ejabberd</TT> will serve.Examples: +<TT>ejabberd</TT> will serve.The syntax is: +<DL CLASS="description"><DT CLASS="dt-description"><TT>{hosts, [HostName, ...]}.</TT></DT></DL>Examples: <UL CLASS="itemize"><LI CLASS="li-itemize"> Serving one domain: <PRE CLASS="verbatim">{hosts, ["example.org"]}. -</PRE></LI><LI CLASS="li-itemize">Serving one domain, and backwards compatible with older <TT>ejabberd</TT> -versions: -<PRE CLASS="verbatim">{host, "example.org"}. -</PRE></LI><LI CLASS="li-itemize">Serving two domains: -<PRE CLASS="verbatim">{hosts, ["example.net", "example.com"]}. +</PRE></LI><LI CLASS="li-itemize">Serving three domains: +<PRE CLASS="verbatim">{hosts, ["example.net", "example.com", "jabber.somesite.org"]}. </PRE></LI></UL> <A NAME="virtualhost"></A>  <H3 CLASS="subsection"><A NAME="htoc22">3.1.2</A>&#XA0;&#XA0;<A HREF="#virtualhost">Virtual Hosting</A></H3> <A NAME="virtualhost"></A> Options can be defined separately for every virtual host using the -<TT>host_config</TT> option. It has the following -syntax: -<PRE CLASS="verbatim">{host_config, <hostname>, [<option>, <option>, ...]}. -</PRE>Examples: +<TT>host_config</TT> option.The syntax is: +<DL CLASS="description"><DT CLASS="dt-description"><TT>{host_config, HostName, [Option, ...]}</TT></DT></DL>Examples: <UL CLASS="itemize"><LI CLASS="li-itemize"> Domain <TT>example.net</TT> is using the internal authentication method while domain <TT>example.com</TT> is using the LDAP server running on the @@ -587,11 +586,10 @@ while domain <TT>example.com</TT> is using the LDAP servers running on the domai </PRE></LI></UL>To define specific ejabberd modules in a virtual host, you can define the global <TT>modules</TT> option with the common modules, and later add specific modules to certain virtual hosts. -To accomplish that, instead of defining each option in <TT>host_config</TT> with the syntax -<PRE CLASS="verbatim">{<option-name>, <option-value>} -</PRE>use this syntax: -<PRE CLASS="verbatim">{{add, <option-name>}, <option-value>} -</PRE>In this example three virtual hosts have some similar modules, but there are also +To accomplish that, instead of defining each option in <TT>host_config</TT> with the general syntax +<DL CLASS="description"><DT CLASS="dt-description"><TT>{OptionName, OptionValue}</TT></DT></DL> +use this syntax: +<DL CLASS="description"><DT CLASS="dt-description"><TT>{{add, OptionName}, OptionValue}</TT></DT></DL>In this example three virtual hosts have some similar modules, but there are also other different modules for some specific virtual hosts: <PRE CLASS="verbatim">%% This ejabberd server has three vhosts: {hosts, ["one.example.org", "two.example.org", "three.example.org"]}. @@ -627,31 +625,25 @@ other different modules for some specific virtual hosts: ]}. </PRE> <A NAME="listened"></A>  <H3 CLASS="subsection"><A NAME="htoc23">3.1.3</A>&#XA0;&#XA0;<A HREF="#listened">Listening Ports</A></H3> <A NAME="listened"></A> -The option <TT>listen</TT> defines for which addresses and ports <TT>ejabberd</TT> +The option <TT>listen</TT> defines for which ports, addresses and network protocols <TT>ejabberd</TT> will listen and what services will be run on them. Each element of the list is a tuple with the following elements: <UL CLASS="itemize"><LI CLASS="li-itemize"> -Port number. Optionally also the IP address. +Port number. Optionally also the IP address and/or a transport protocol. </LI><LI CLASS="li-itemize">Listening module that serves this port. </LI><LI CLASS="li-itemize">Options for the TCP socket and for the listening module. -</LI></UL>With the basic syntax the ports will listen on all IPv4 network addresses: -<PRE CLASS="verbatim">{listen, [ - {<port-number>, <module>, [<options>]}, - {<port-number>, <module>, [<options>]}, - ... - {<port-number>, <module>, [<options>]} - ]}. -</PRE>It is possible to specify the IP address for a port using the full syntax: -<PRE CLASS="verbatim"> {{<port-number>, <ip-address>}, <module>, [<options>]} -</PRE> <A NAME="listened-port"></A>  -<H4 CLASS="subsubsection"><A HREF="#listened-port">Port Number and IP Address</A></H4> <A NAME="listened-port"></A> The port number defines which port to listen for incoming connections. +</LI></UL>The option syntax is: +<DL CLASS="description"><DT CLASS="dt-description"><TT>{listen, [Listener, ...]}.</TT></DT></DL>To define a listener there are several syntax. +<DL CLASS="description"><DT CLASS="dt-description"><TT>{PortNumber, Module, [Option, ...]}</TT></DT></DL><DL CLASS="description"><DT CLASS="dt-description"><TT>{{PortNumber, IPaddress}, Module, [Option, ...]}</TT></DT></DL><DL CLASS="description"><DT CLASS="dt-description"><TT>{{PortNumber, TransportProtocol}, Module, [Option, ...]}</TT></DT></DL><DL CLASS="description"><DT CLASS="dt-description"><TT>{{PortNumber, IPaddress, TransportProtocol}, Module, [Option, ...]}</TT></DT></DL> <A NAME="listened-port"></A>  +<H4 CLASS="subsubsection"><A HREF="#listened-port">Port Number, IP Address and Transport Protocol</A></H4> <A NAME="listened-port"></A> The port number defines which port to listen for incoming connections. It can be a Jabber/XMPP standard port (see section <A HREF="#firewall">5.1</A>) or any other valid port number.The IP address can be represented with a string or an Erlang tuple with decimal or hexadecimal numbers. The socket will listen only in that network interface. It is possible to specify a generic address, so <TT>ejabberd</TT> will listen in all addresses. -Depending in the type of the IP address, IPv4 or IPv6 will be used.Some example values for IP address: +Depending in the type of the IP address, IPv4 or IPv6 will be used. +When not specified the IP address, it will listen on all IPv4 network addresses.Some example values for IP address: <UL CLASS="itemize"><LI CLASS="li-itemize"> <CODE>"0.0.0.0"</CODE> to listen in all IPv4 network interfaces. This is the default value when no IP is specified. </LI><LI CLASS="li-itemize"><CODE>"::"</CODE> to listen in all IPv6 network interfaces @@ -660,7 +652,8 @@ Depending in the type of the IP address, IPv4 or IPv6 will be used.Some e </LI><LI CLASS="li-itemize"><CODE>{10, 11, 12, 13}</CODE> is the IPv4 address <CODE>10.11.12.13</CODE> </LI><LI CLASS="li-itemize"><CODE>{0, 0, 0, 0, 0, 65535, 32512, 1}</CODE> is the IPv6 address <CODE>::FFFF:127.0.0.1/128</CODE> </LI><LI CLASS="li-itemize"><CODE>{16#fdca, 16#8ab6, 16#a243, 16#75ef, 0, 0, 0, 1}</CODE> is the IPv6 address <CODE>FDCA:8AB6:A243:75EF::1/128</CODE> -</LI></UL> <A NAME="listened-module"></A>  +</LI></UL>The transport protocol can be <TT>tcp</TT> or <TT>udp</TT>. +Default is <TT>tcp</TT>. <A NAME="listened-module"></A>  <H4 CLASS="subsubsection"><A HREF="#listened-module">Listening Module</A></H4> <A NAME="listened-module"></A> The available modules, their purpose and the options allowed by each one are: <DL CLASS="description"><DT CLASS="dt-description"> @@ -675,9 +668,13 @@ Handles incoming s2s connections. Options: <TT>max_stanza_size</TT> </DD><DT CLASS="dt-description"><TT>ejabberd_service</TT></DT><DD CLASS="dd-description"> Interacts with an <A HREF="http://www.ejabberd.im/tutorials-transports">external component</A> -(as defined in the Jabber Component Protocol (<A HREF="http://www.xmpp.org/extensions/xep-0114.html">XEP-0114</A>). +(as defined in the Jabber Component Protocol (<A HREF="http://xmpp.org/extensions/xep-0114.html">XEP-0114</A>). Options: <TT>access</TT>, <TT>hosts</TT>, <TT>shaper</TT>, <TT>service_check_from</TT> +</DD><DT CLASS="dt-description"><TT>ejabberd_stun</TT></DT><DD CLASS="dd-description"> +Handles STUN Binding requests as defined in +<A HREF="http://tools.ietf.org/html/rfc5389">RFC 5389</A>. + Options: <TT>certfile</TT> </DD><DT CLASS="dt-description"><TT>ejabberd_http</TT></DT><DD CLASS="dd-description"> Handles incoming HTTP connections. Options: <TT>captcha</TT>, <TT>certfile</TT>, <TT>http_bind</TT>, <TT>http_poll</TT>, @@ -685,19 +682,19 @@ Handles incoming HTTP connections. </DD></DL> <A NAME="listened-options"></A>  <H4 CLASS="subsubsection"><A HREF="#listened-options">Options</A></H4> <A NAME="listened-options"></A> This is a detailed description of each option allowed by the listening modules: <DL CLASS="description"><DT CLASS="dt-description"> -<TT>{access, <access rule>}</TT></DT><DD CLASS="dd-description"> This option defines +<TT>{access, AccessName}</TT></DT><DD CLASS="dd-description"> This option defines access to the port. The default value is <TT>all</TT>. </DD><DT CLASS="dt-description"><TT>{certfile, Path}</TT></DT><DD CLASS="dd-description"> Full path to a file containing the default SSL certificate. To define a certificate file specific for a given domain, use the global option <TT>domain_certfile</TT>. -</DD><DT CLASS="dt-description"><TT>service_check_from</TT></DT><DD CLASS="dd-description"> +</DD><DT CLASS="dt-description"><TT>{service_check_from, true|false}</TT></DT><DD CLASS="dd-description"> This option can be used with <TT>ejabberd_service</TT> only. It is used to disable control on the from field on packets send by an external components. The option can be either <TT>true</TT> or -<TT>false</TT>. The default value is <TT>true</TT> which conforms to <A HREF="http://www.xmpp.org/extensions/xep-0114.html">XEP-0114</A>. -</DD><DT CLASS="dt-description"><TT>{hosts, [Hostnames], [HostOptions]}</TT></DT><DD CLASS="dd-description"> +<TT>false</TT>. The default value is <TT>true</TT> which conforms to <A HREF="http://xmpp.org/extensions/xep-0114.html">XEP-0114</A>. +</DD><DT CLASS="dt-description"><TT>{hosts, [Hostname, ...], [HostOption, ...]}</TT></DT><DD CLASS="dd-description"> The external Jabber component that connects to this <TT>ejabberd_service</TT> can serve one or more hostnames. -In <TT>HostOptions</TT> you can define options for the component; +As <TT>HostOption</TT> you can define options for the component; currently the only allowed option is the password required to the component when attempt to connect to ejabberd: <TT>{password, Secret}</TT>. Note that you cannot define in a single <TT>ejabberd_service</TT> components of @@ -706,7 +703,7 @@ as seen in an example below. </DD><DT CLASS="dt-description"><TT>captcha</TT></DT><DD CLASS="dd-description"> Simple web page that allows a user to fill a CAPTCHA challenge (see section <A HREF="#captcha">3.1.8</A>). </DD><DT CLASS="dt-description"><TT>http_bind</TT></DT><DD CLASS="dd-description"> -This option enables HTTP Binding (<A HREF="http://www.xmpp.org/extensions/xep-0124.html">XEP-0124</A> and <A HREF="http://www.xmpp.org/extensions/xep-0206.html">XEP-0206</A>) support. HTTP Bind +This option enables HTTP Binding (<A HREF="http://xmpp.org/extensions/xep-0124.html">XEP-0124</A> and <A HREF="http://xmpp.org/extensions/xep-0206.html">XEP-0206</A>) support. HTTP Bind enables access via HTTP requests to <TT>ejabberd</TT> from behind firewalls which do not allow outgoing sockets on port 5222.Remember that you must also install and enable the module mod_http_bind.If HTTP Bind is enabled, it will be available at <CODE>http://server:port/http-bind/</CODE>. Be aware that support for HTTP Bind @@ -717,7 +714,7 @@ interesting to host a web-based Jabber client such as <A HREF="http://www.ejabberd.im/jwchat-localserver">embedded local web server</A> or <A HREF="http://www.ejabberd.im/jwchat-apache">Apache</A>). </DD><DT CLASS="dt-description"><TT>http_poll</TT></DT><DD CLASS="dd-description"> -This option enables HTTP Polling (<A HREF="http://www.xmpp.org/extensions/xep-0025.html">XEP-0025</A>) support. HTTP Polling +This option enables HTTP Polling (<A HREF="http://xmpp.org/extensions/xep-0025.html">XEP-0025</A>) support. HTTP Polling enables access via HTTP requests to <TT>ejabberd</TT> from behind firewalls which do not allow outgoing sockets on port 5222.If HTTP Polling is enabled, it will be available at <CODE>http://server:port/http-poll/</CODE>. Be aware that support for HTTP Polling @@ -736,17 +733,17 @@ value is <TT>infinity</TT>. Recommended values are 65536 for c2s connections and 131072 for s2s connections. s2s max stanza size must always much higher than c2s limit. Change this value with extreme care as it can cause unwanted disconnect if set too low. -</DD><DT CLASS="dt-description"><TT>{request_handlers, [{Path, Module}]}</TT></DT><DD CLASS="dd-description"> To define one or several handlers that will serve HTTP requests. +</DD><DT CLASS="dt-description"><TT>{request_handlers, [ {Path, Module}, ...]}</TT></DT><DD CLASS="dd-description"> To define one or several handlers that will serve HTTP requests. The Path is a list of strings; so the URIs that start with that Path will be served by Module. For example, if you want <TT>mod_foo</TT> to serve the URIs that start with <TT>/a/b/</TT>, and you also want <TT>mod_http_bind</TT> to serve the URIs <TT>/http-bind/</TT>, use this option: <TT>{request_handlers, [{["a", "b"], mod_foo}, {["http-bind"], mod_http_bind}]}</TT> </DD><DT CLASS="dt-description"><TT>{service_check_from, true|false}</TT></DT><DD CLASS="dd-description"> By enabling this option, <TT>ejabberd</TT> allows the component to send packets with any arbitrary domain in the &#X2019;from&#X2019; attribute. -Note that <A HREF="http://www.xmpp.org/extensions/xep-0114.html">XEP-0114</A> requires that the domain must match the hostname of the component. +Note that <A HREF="http://xmpp.org/extensions/xep-0114.html">XEP-0114</A> requires that the domain must match the hostname of the component. Only enable this option if you are completely sure you need to enable it. Default value: false. -</DD><DT CLASS="dt-description"><TT>{shaper, <access rule>}</TT></DT><DD CLASS="dd-description"> This option defines a +</DD><DT CLASS="dt-description"><TT>{shaper, none|ShaperName}</TT></DT><DD CLASS="dd-description"> This option defines a shaper for the port (see section&#XA0;<A HREF="#shapers">3.1.6</A>). The default value is <TT>none</TT>. </DD><DT CLASS="dt-description"><TT>starttls</TT></DT><DD CLASS="dd-description"> This option @@ -764,7 +761,7 @@ This was the traditional encryption method in the early Jabber software, commonly on port 5223 for client-to-server communications. But this method is nowadays deprecated and not recommended. The preferable encryption method is STARTTLS on port 5222, as defined -<A HREF="http://www.xmpp.org/specs/rfc3920.html#tls">RFC 3920: XMPP Core</A>, +<A HREF="http://xmpp.org/specs/rfc3920.html#tls">RFC 3920: XMPP Core</A>, which can be enabled in <TT>ejabberd</TT> with the option <TT>starttls</TT>. If this option is set, you should also set the <TT>certfile</TT> option. </DD><DT CLASS="dt-description"><TT>web_admin</TT></DT><DD CLASS="dd-description"> This option @@ -773,7 +770,7 @@ at <CODE>http://server:port/admin/</CODE>. Login and password are the username a password of one of the registered users who are granted access by the &#X2018;configure&#X2019; access rule. </DD><DT CLASS="dt-description"><TT>zlib</TT></DT><DD CLASS="dd-description"> This -option specifies that Zlib stream compression (as defined in <A HREF="http://www.xmpp.org/extensions/xep-0138.html">XEP-0138</A>) +option specifies that Zlib stream compression (as defined in <A HREF="http://xmpp.org/extensions/xep-0138.html">XEP-0138</A>) is available on connections to the port. Client connections cannot use stream compression and stream encryption simultaneously. Hence, if you specify both <TT>starttls</TT> (or <TT>tls</TT>) and <TT>zlib</TT>, the latter @@ -791,6 +788,10 @@ Full path to the file containing the SSL certificate for a specific domain. Specify which address families to try, in what order, and connect timeout in milliseconds. By default it first tries connecting with IPv4, if that fails it tries using IPv6, with a timeout of 10000 milliseconds. +</DD><DT CLASS="dt-description"><TT>{s2s_dns_options, [ {Property, Value}, ...]}</TT></DT><DD CLASS="dd-description"> +Define properties to use for DNS resolving. +Allowed Properties are: <TT>timeout</TT> in seconds which default value is <TT>10</TT> +and <TT>retries</TT> which default value is <TT>2</TT>. </DD><DT CLASS="dt-description"><TT>{s2s_default_policy, allow|deny}</TT></DT><DD CLASS="dd-description"> The default policy for incoming and outgoing s2s connections to other Jabber servers. The default value is <TT>allow</TT>. @@ -810,6 +811,7 @@ However, the c2s and s2s connections to the domain <TT>example.com</TT> use the and also allows plain connections for old clients. </LI><LI CLASS="li-itemize">Port 5223 listens for c2s connections with the old SSL. </LI><LI CLASS="li-itemize">Port 5269 listens for s2s connections with STARTTLS. The socket is set for IPv6 instead of IPv4. +</LI><LI CLASS="li-itemize">Port 3478 listens for STUN requests over UDP. </LI><LI CLASS="li-itemize">Port 5280 listens for HTTP requests, and serves the HTTP Poll service. </LI><LI CLASS="li-itemize">Port 5281 listens for HTTP requests, and serves the Web Admin using HTTPS as explained in section&#XA0;<A HREF="#webadmin">4.3</A>. The socket only listens connections to the IP address 127.0.0.1. @@ -832,6 +834,7 @@ section&#XA0;<A HREF="#webadmin">4.3</A>. The socket only listens connections to {shaper, s2s_shaper}, {max_stanza_size, 131072} ]}, + {{3478, udp}, ejabberd_stun, []}, {5280, ejabberd_http, [ http_poll ]}, @@ -966,10 +969,9 @@ you have to make the transports log and do XDB by themselves: </xdb> </PRE> <A NAME="auth"></A>  <H3 CLASS="subsection"><A NAME="htoc24">3.1.4</A>&#XA0;&#XA0;<A HREF="#auth">Authentication</A></H3> <A NAME="auth"></A> -The option <TT>auth_method</TT> defines the authentication method that is used -for user authentication: -<PRE CLASS="verbatim">{auth_method, [<method>]}. -</PRE>The following authentication methods are supported by <TT>ejabberd</TT>: +The option <TT>auth_method</TT> defines the authentication methods that are used +for user authentication. The syntax is: +<DL CLASS="description"><DT CLASS="dt-description"><TT>{auth_method, [Method, ...]}.</TT></DT></DL>The following authentication methods are supported by <TT>ejabberd</TT>: <UL CLASS="itemize"><LI CLASS="li-itemize"> internal (default) &#X2014; See section&#XA0;<A HREF="#internalauth">3.1.4</A>. </LI><LI CLASS="li-itemize">external &#X2014; There are <A HREF="http://www.ejabberd.im/extauth">some @@ -981,10 +983,8 @@ example authentication scripts</A>. </LI><LI CLASS="li-itemize">pam &#X2014; See section&#XA0;<A HREF="#pam">3.1.4</A>. </LI></UL>Account creation is only supported by internal and odbc methods. <A NAME="internalauth"></A>  <H4 CLASS="subsubsection"><A HREF="#internalauth">Internal</A></H4> <A NAME="internalauth"></A> -<TT>ejabberd</TT> uses its internal Mnesia database as the default authentication method.<UL CLASS="itemize"><LI CLASS="li-itemize"> -<TT>auth_method</TT>: The value <TT>internal</TT> will enable the internal -authentication method. -</LI></UL>Examples: +<TT>ejabberd</TT> uses its internal Mnesia database as the default authentication method. +The value <TT>internal</TT> will enable the internal authentication method.Examples: <UL CLASS="itemize"><LI CLASS="li-itemize"> To use internal authentication on <TT>example.org</TT> and LDAP authentication on <TT>example.net</TT>: @@ -994,25 +994,23 @@ authentication on <TT>example.net</TT>: <PRE CLASS="verbatim">{auth_method, internal}. </PRE></LI></UL> <A NAME="saslanonymous"></A>  <H4 CLASS="subsubsection"><A HREF="#saslanonymous">SASL Anonymous and Anonymous Login</A></H4> <A NAME="saslanonymous"></A> -The anonymous authentication method can be configured with the following +The value <TT>anonymous</TT> will enable the internal authentication method.The anonymous authentication method can be configured with the following options. Remember that you can use the <TT>host_config</TT> option to set virtual host specific options (see section&#XA0;<A HREF="#virtualhost">3.1.2</A>). Note that there also is a detailed tutorial regarding <A HREF="http://support.process-one.net/doc/display/MESSENGER/Anonymous+users+support">SASL -Anonymous and anonymous login configuration</A>.<UL CLASS="itemize"><LI CLASS="li-itemize"> -<TT>auth_method</TT>: The value <TT>anonymous</TT> will enable the anonymous -authentication method. -</LI><LI CLASS="li-itemize"><TT>allow_multiple_connections</TT>: This value for this option can be -either <TT>true</TT> or <TT>false</TT> and is only used when the anonymous mode is +Anonymous and anonymous login configuration</A>.<DL CLASS="description"><DT CLASS="dt-description"> +<TT>{allow_multiple_connections, false|true}</TT></DT><DD CLASS="dd-description"> This option is only used +when the anonymous mode is enabled. Setting it to <TT>true</TT> means that the same username can be taken multiple times in anonymous login mode if different resource are used to connect. This option is only useful in very special occasions. The default value is <TT>false</TT>. -</LI><LI CLASS="li-itemize"><TT>anonymous_protocol</TT>: This option can take three values: -<TT>sasl_anon</TT>, <TT>login_anon</TT> or <TT>both</TT>. <TT>sasl_anon</TT> means +</DD><DT CLASS="dt-description"><TT>{anonymous_protocol, sasl_anon | login_anon | both}</TT></DT><DD CLASS="dd-description"> +<TT>sasl_anon</TT> means that the SASL Anonymous method will be used. <TT>login_anon</TT> means that the anonymous login method will be used. <TT>both</TT> means that SASL Anonymous and login anonymous are both enabled. -</LI></UL>Those options are defined for each virtual host with the <TT>host_config</TT> +</DD></DL>Those options are defined for each virtual host with the <TT>host_config</TT> parameter (see section&#XA0;<A HREF="#virtualhost">3.1.2</A>).Examples: <UL CLASS="itemize"><LI CLASS="li-itemize"> To enable anonymous login on all virtual hosts: @@ -1043,7 +1041,7 @@ PAM authentication is disabled by default, so you have to configure and compile <PRE CLASS="verbatim">./configure --enable-pam && make install </PRE>Options: <DL CLASS="description"><DT CLASS="dt-description"> -<TT>pam_service</TT></DT><DD CLASS="dd-description">This option defines the PAM service name. +<TT>{pam_service, Name}</TT></DT><DD CLASS="dd-description">This option defines the PAM service name. Default is <TT>"ejabberd"</TT>. Refer to the PAM documentation of your operation system for more information. </DD></DL>Example: @@ -1085,48 +1083,47 @@ then <TT>/etc/nssswitch.conf</TT> must be configured to use <TT>winbind</TT> as <H4 CLASS="subsubsection"><A HREF="#ACLDefinition">ACL Definition</A></H4> <A NAME="ACLDefinition"></A> Access control in <TT>ejabberd</TT> is performed via Access Control Lists (ACLs). The declarations of ACLs in the configuration file have the following syntax: -<PRE CLASS="verbatim">{acl, <aclname>, {<acltype>, ...}}. -</PRE><TT><acltype></TT> can be one of the following: +<DL CLASS="description"><DT CLASS="dt-description"><TT>{acl, ACLName, ACLValue}.</TT></DT></DL><TT>ACLValue</TT> can be one of the following: <DL CLASS="description"><DT CLASS="dt-description"> <TT>all</TT></DT><DD CLASS="dd-description"> Matches all JIDs. Example: <PRE CLASS="verbatim">{acl, all, all}. -</PRE></DD><DT CLASS="dt-description"><TT>{user, <username>}</TT></DT><DD CLASS="dd-description"> Matches the user with the name -<TT><username></TT> at the first virtual host. Example: +</PRE></DD><DT CLASS="dt-description"><TT>{user, Username}</TT></DT><DD CLASS="dd-description"> Matches the user with the name +<TT>Username</TT> at the first virtual host. Example: <PRE CLASS="verbatim">{acl, admin, {user, "yozhik"}}. -</PRE></DD><DT CLASS="dt-description"><TT>{user, <username>, <server>}</TT></DT><DD CLASS="dd-description"> Matches the user with the JID -<TT><username>@<server></TT> and any resource. Example: +</PRE></DD><DT CLASS="dt-description"><TT>{user, Username, Server}</TT></DT><DD CLASS="dd-description"> Matches the user with the JID +<TT>Username@Server</TT> and any resource. Example: <PRE CLASS="verbatim">{acl, admin, {user, "yozhik", "example.org"}}. -</PRE></DD><DT CLASS="dt-description"><TT>{server, <server>}</TT></DT><DD CLASS="dd-description"> Matches any JID from server -<TT><server></TT>. Example: +</PRE></DD><DT CLASS="dt-description"><TT>{server, Server}</TT></DT><DD CLASS="dd-description"> Matches any JID from server +<TT>Server</TT>. Example: <PRE CLASS="verbatim">{acl, exampleorg, {server, "example.org"}}. -</PRE></DD><DT CLASS="dt-description"><TT>{resource, <resource>}</TT></DT><DD CLASS="dd-description"> Matches any JID with a resource -<TT><resource></TT>. Example: +</PRE></DD><DT CLASS="dt-description"><TT>{resource, Resource}</TT></DT><DD CLASS="dd-description"> Matches any JID with a resource +<TT>Resource</TT>. Example: <PRE CLASS="verbatim">{acl, mucklres, {resource, "muckl"}}. -</PRE></DD><DT CLASS="dt-description"><TT>{shared_group, <groupname>}</TT></DT><DD CLASS="dd-description"> Matches any member of a Shared Roster Group with name <TT><groupname></TT> in the virtual host. Example: +</PRE></DD><DT CLASS="dt-description"><TT>{shared_group, Groupname}</TT></DT><DD CLASS="dd-description"> Matches any member of a Shared Roster Group with name <TT>Groupname</TT> in the virtual host. Example: <PRE CLASS="verbatim">{acl, techgroupmembers, {shared_group, "techteam"}}. -</PRE></DD><DT CLASS="dt-description"><TT>{shared_group, <groupname>, <server>}</TT></DT><DD CLASS="dd-description"> Matches any member of a Shared Roster Group with name <TT><groupname></TT> in the virtual host <TT><server></TT>. Example: +</PRE></DD><DT CLASS="dt-description"><TT>{shared_group, Groupname, Server}</TT></DT><DD CLASS="dd-description"> Matches any member of a Shared Roster Group with name <TT>Groupname</TT> in the virtual host <TT>Server</TT>. Example: <PRE CLASS="verbatim">{acl, techgroupmembers, {shared_group, "techteam", "example.org"}}. -</PRE></DD><DT CLASS="dt-description"><TT>{user_regexp, <regexp>}</TT></DT><DD CLASS="dd-description"> Matches any local user with a name that -matches <TT><regexp></TT> on local virtual hosts. Example: +</PRE></DD><DT CLASS="dt-description"><TT>{user_regexp, Regexp}</TT></DT><DD CLASS="dd-description"> Matches any local user with a name that +matches <TT>Regexp</TT> on local virtual hosts. Example: <PRE CLASS="verbatim">{acl, tests, {user_regexp, "^test[0-9]*$"}}. -</PRE></DD><DT CLASS="dt-description"><TT>{user_regexp, <regexp>, <server>}</TT></DT><DD CLASS="dd-description"> Matches any user with a name -that matches <TT><regexp></TT> at server <TT><server></TT>. Example: -<PRE CLASS="verbatim">{acl, tests, {user_regexp, "^test", "example.org"}}. -</PRE></DD><DT CLASS="dt-description"><TT>{server_regexp, <regexp>}</TT></DT><DD CLASS="dd-description"> Matches any JID from the server that -matches <TT><regexp></TT>. Example: +</PRE></DD><DT CLASS="dt-description"><TT>{user_regexp, UserRegexp, Server}</TT></DT><DD CLASS="dd-description"> Matches any user with a name +that matches <TT>Regexp</TT> at server <TT>Server</TT>. Example: +<PRE CLASS="verbatim">{acl, tests, {user_Userregexp, "^test", "example.org"}}. +</PRE></DD><DT CLASS="dt-description"><TT>{server_regexp, Regexp}</TT></DT><DD CLASS="dd-description"> Matches any JID from the server that +matches <TT>Regexp</TT>. Example: <PRE CLASS="verbatim">{acl, icq, {server_regexp, "^icq\\."}}. -</PRE></DD><DT CLASS="dt-description"><TT>{resource_regexp, <regexp>}</TT></DT><DD CLASS="dd-description"> Matches any JID with a resource that -matches <TT><regexp></TT>. Example: +</PRE></DD><DT CLASS="dt-description"><TT>{resource_regexp, Regexp}</TT></DT><DD CLASS="dd-description"> Matches any JID with a resource that +matches <TT>Regexp</TT>. Example: <PRE CLASS="verbatim">{acl, icq, {resource_regexp, "^laptop\\."}}. -</PRE></DD><DT CLASS="dt-description"><TT>{node_regexp, <user_regexp>, <server_regexp>}</TT></DT><DD CLASS="dd-description"> Matches any user -with a name that matches <TT><user_regexp></TT> at any server that matches -<TT><server_regexp></TT>. Example: +</PRE></DD><DT CLASS="dt-description"><TT>{node_regexp, UserRegexp, ServerRegexp}</TT></DT><DD CLASS="dd-description"> Matches any user +with a name that matches <TT>UserRegexp</TT> at any server that matches +<TT>ServerRegexp</TT>. Example: <PRE CLASS="verbatim">{acl, yohzik, {node_regexp, "^yohzik$", "^example.(com|org)$"}}. -</PRE></DD><DT CLASS="dt-description"><TT>{user_glob, <glob>}</TT></DT><DD CLASS="dd-description"> -</DD><DT CLASS="dt-description"><TT>{user_glob, <glob>, <server>}</TT></DT><DD CLASS="dd-description"> -</DD><DT CLASS="dt-description"><TT>{server_glob, <glob>}</TT></DT><DD CLASS="dd-description"> -</DD><DT CLASS="dt-description"><TT>{resource_glob, <glob>}</TT></DT><DD CLASS="dd-description"> -</DD><DT CLASS="dt-description"><TT>{node_glob, <user_glob>, <server_glob>}</TT></DT><DD CLASS="dd-description"> This is the same as +</PRE></DD><DT CLASS="dt-description"><TT>{user_glob, Glob}</TT></DT><DD CLASS="dd-description"> +</DD><DT CLASS="dt-description"><TT>{user_glob, Glob, Server}</TT></DT><DD CLASS="dd-description"> +</DD><DT CLASS="dt-description"><TT>{server_glob, Glob}</TT></DT><DD CLASS="dd-description"> +</DD><DT CLASS="dt-description"><TT>{resource_glob, Glob}</TT></DT><DD CLASS="dd-description"> +</DD><DT CLASS="dt-description"><TT>{node_glob, UserGlob, ServerGlob}</TT></DT><DD CLASS="dd-description"> This is the same as above. However, it uses shell glob patterns instead of regexp. These patterns can have the following special characters: <DL CLASS="description"><DT CLASS="dt-description"> @@ -1137,19 +1134,15 @@ ranges are specified by a pair of characters separated by a <TT>&#X2018;-&#X2019 If the first character after <TT>&#X2018;[&#X2019;</TT> is a <TT>&#X2018;!&#X2019;</TT>, any character not enclosed is matched. </DD></DL> -</DD></DL>The following ACLs are pre-defined: +</DD></DL>The following <TT>ACLName</TT> are pre-defined: <DL CLASS="description"><DT CLASS="dt-description"> <TT>all</TT></DT><DD CLASS="dd-description"> Matches any JID. </DD><DT CLASS="dt-description"><TT>none</TT></DT><DD CLASS="dd-description"> Matches no JID. </DD></DL> <A NAME="AccessRights"></A>  <H4 CLASS="subsubsection"><A HREF="#AccessRights">Access Rights</A></H4> <A NAME="AccessRights"></A> -An entry allowing or denying access to different services looks similar to -this: -<PRE CLASS="verbatim">{access, <accessname>, [{allow, <aclname>}, - {deny, <aclname>}, - ... - ]}. -</PRE>When a JID is checked to have access to <TT><accessname></TT>, the server +An entry allowing or denying access to different services. +The syntax is: +<DL CLASS="description"><DT CLASS="dt-description"><TT>{access, AccessName, [ {allow|deny, ACLName}, ...]}.</TT></DT></DL>When a JID is checked to have access to <TT>Accessname</TT>, the server sequentially checks if that JID matches any of the ACLs that are named in the second elements of the tuples in the list. If it matches, the first element of the first matched tuple is returned, otherwise the value &#X2018;<TT>deny</TT>&#X2019; is @@ -1157,7 +1150,7 @@ returned.Example: <PRE CLASS="verbatim">{access, configure, [{allow, admin}]}. {access, something, [{deny, badmans}, {allow, all}]}. -</PRE>The following access rules are pre-defined: +</PRE>The following <TT>AccessName</TT> are pre-defined: <DL CLASS="description"><DT CLASS="dt-description"> <TT>all</TT></DT><DD CLASS="dd-description"> Always returns the value &#X2018;<TT>allow</TT>&#X2019;. </DD><DT CLASS="dt-description"><TT>none</TT></DT><DD CLASS="dd-description"> Always returns the value &#X2018;<TT>deny</TT>&#X2019;. @@ -1170,35 +1163,27 @@ opened session will be disconnected. The error <TT>session replaced</TT> will be sent to the disconnected session. The value for this option can be either a number, or <TT>infinity</TT>. The default value is <TT>infinity</TT>.The syntax is: -<PRE CLASS="verbatim">{access, max_user_sessions, [{<maxnumber>, <aclname>}, - ... - ]}. -</PRE>Examples: -<UL CLASS="itemize"><LI CLASS="li-itemize"> -To limit the number of sessions per user to 10 for all users: -<PRE CLASS="verbatim">{access, max_user_sessions, [{10, all}]}. -</PRE></LI></UL> <A NAME="configmaxs2sconns"></A>  +<DL CLASS="description"><DT CLASS="dt-description"><TT>{access, max_user_sessions, [ {MaxNumber, ACLName}, ...]}.</TT></DT></DL>This example limits the number of sessions per user to 5 for all users, and to 10 for admins: +<PRE CLASS="verbatim">{access, max_user_sessions, [{10, admin}, {5, all}]}. +</PRE> <A NAME="configmaxs2sconns"></A>  <H4 CLASS="subsubsection"><A HREF="#configmaxs2sconns">Several connections to a remote Jabber server with ACL</A></H4> <A NAME="configmaxs2sconns"></A> The special access <TT>max_s2s_connections</TT> specifies how many simultaneus S2S connections can be established to a specific remote Jabber server. The default value is <TT>1</TT>. There&#X2019;s also available the access <TT>max_s2s_connections_per_node</TT>.The syntax is: -<PRE CLASS="verbatim">{access, max_s2s_connections, [{<maxnumber>, <aclname>}, - ... - ]}. -</PRE>Examples: +<DL CLASS="description"><DT CLASS="dt-description"><TT>{access, max_s2s_connections, [ {MaxNumber, ACLName}, ...]}.</TT></DT></DL>Examples: <UL CLASS="itemize"><LI CLASS="li-itemize"> Allow up to 3 connections with each remote server: <PRE CLASS="verbatim">{access, max_s2s_connections, [{3, all}]}. </PRE></LI></UL> <A NAME="shapers"></A>  <H3 CLASS="subsection"><A NAME="htoc26">3.1.6</A>&#XA0;&#XA0;<A HREF="#shapers">Shapers</A></H3> <A NAME="shapers"></A> -Shapers enable you to limit connection traffic. The syntax of -shapers is like this: -<PRE CLASS="verbatim">{shaper, <shapername>, <kind>}. -</PRE>Currently only one kind of shaper called <TT>maxrate</TT> is available. It has the +Shapers enable you to limit connection traffic. +The syntax is: +<DL CLASS="description"><DT CLASS="dt-description"><TT>{shaper, ShaperName, Kind}.</TT></DT></DL> +Currently only one kind of shaper called <TT>maxrate</TT> is available. It has the following syntax: -<PRE CLASS="verbatim">{maxrate, <rate>} -</PRE>where <TT><rate></TT> stands for the maximum allowed incoming rate in bytes per +<DL CLASS="description"><DT CLASS="dt-description"><TT>{maxrate, Rate}</TT></DT></DL> +where <TT>Rate</TT> stands for the maximum allowed incoming rate in bytes per second. When a connection exceeds this limit, <TT>ejabberd</TT> stops reading from the socket until the average rate is again below the allowed maximum.Examples: @@ -1213,14 +1198,15 @@ To define a shaper named &#X2018;<TT>normal</TT>&#X2019; with traffic speed limi <H3 CLASS="subsection"><A NAME="htoc27">3.1.7</A>&#XA0;&#XA0;<A HREF="#language">Default Language</A></H3> <A NAME="language"></A> The option <TT>language</TT> defines the default language of server strings that can be seen by Jabber clients. If a Jabber client does not support -<TT>xml:lang</TT>, the specified language is used. The default value is -<TT>en</TT>. In order to take effect there must be a translation file -<TT><language>.msg</TT> in <TT>ejabberd</TT>&#X2019;s <TT>msgs</TT> directory.For example, to set Russian as default language: +<TT>xml:lang</TT>, the specified language is used.The option syntax is: +<DL CLASS="description"><DT CLASS="dt-description"><TT>{language, Language}.</TT></DT></DL>The default value is <TT>en</TT>. +In order to take effect there must be a translation file +<TT>Language.msg</TT> in <TT>ejabberd</TT>&#X2019;s <TT>msgs</TT> directory.For example, to set Russian as default language: <PRE CLASS="verbatim">{language, "ru"}. </PRE>Appendix <A HREF="#i18ni10n">A</A> provides more details about internationalization and localization. <A NAME="captcha"></A>  <H3 CLASS="subsection"><A NAME="htoc28">3.1.8</A>&#XA0;&#XA0;<A HREF="#captcha">CAPTCHA</A></H3> <A NAME="captcha"></A> Some <TT>ejabberd</TT> modules can be configured to require a CAPTCHA challenge on certain actions. -If the client does not support CAPTCHA Forms (<A HREF="http://www.xmpp.org/extensions/xep-0158.html">XEP-0158</A>), +If the client does not support CAPTCHA Forms (<A HREF="http://xmpp.org/extensions/xep-0158.html">XEP-0158</A>), a web link is provided so the user can fill the challenge in a web browser.An example script is provided that generates the image using ImageMagick&#X2019;s Convert program.The configurable options are: <DL CLASS="description"><DT CLASS="dt-description"> @@ -1249,21 +1235,47 @@ See section <A HREF="#listened-module">3.1.3</A>.Example configuration: } ]}. +</PRE> <A NAME="stun"></A>  +<H3 CLASS="subsection"><A NAME="htoc29">3.1.9</A>&#XA0;&#XA0;<A HREF="#stun">STUN</A></H3> <A NAME="stun"></A> +<TT>ejabberd</TT> is able to act as a stand-alone STUN server +(<A HREF="http://tools.ietf.org/html/rfc5389">RFC 5389</A>). Currently only Binding usage +is supported. In that role <TT>ejabberd</TT> helps clients with Jingle ICE (<A HREF="http://xmpp.org/extensions/xep-0176.html">XEP-0176</A>) support to discover their external addresses and ports.You should configure <TT>ejabberd_stun</TT> listening module as described in <A HREF="#listened">3.1.3</A> section. +If <TT>certfile</TT> option is defined, <TT>ejabberd</TT> multiplexes TCP and +TLS over TCP connections on the same port. Obviously, <TT>certfile</TT> option +is defined for <TT>tcp</TT> only. Note however that TCP or TLS over TCP +support is not required for Binding usage and is reserved for +<A HREF="http://tools.ietf.org/html/draft-ietf-behave-turn-16">TURN</A> +functionality. Feel free to configure <TT>udp</TT> transport only.Example configuration: +<PRE CLASS="verbatim">{listen, + [ + ... + {{3478, udp}, ejabberd_stun, []}, + {3478, ejabberd_stun, []}, + {5349, ejabberd_stun, [{certfile, "/etc/ejabberd/server.pem"}]}, + ... + ] +}. +</PRE>You also need to configure DNS SRV records properly so clients can easily discover a +STUN server serving your XMPP domain. Refer to section +<A HREF="http://tools.ietf.org/html/rfc5389#section-9">DNS Discovery of a Server</A> +of <A HREF="http://tools.ietf.org/html/rfc5389">RFC 5389</A> for details.Example DNS SRV configuration: +<PRE CLASS="verbatim">_stun._udp IN SRV 0 0 3478 stun.example.com. +_stun._tcp IN SRV 0 0 3478 stun.example.com. +_stuns._tcp IN SRV 0 0 5349 stun.example.com. </PRE> <A NAME="includeconfigfile"></A>  -<H3 CLASS="subsection"><A NAME="htoc29">3.1.9</A>&#XA0;&#XA0;<A HREF="#includeconfigfile">Include Additional Configuration Files</A></H3> <A NAME="includeconfigfile"></A> -The option <TT>include_config_file</TT> in a configuration file instructs <TT>ejabberd</TT> to include other configuration files immediately.The basic usage is: -<PRE CLASS="verbatim">{include_config_file, <filename>}. -</PRE>It is also possible to specify suboptions: -<PRE CLASS="verbatim">{include_config_file, <filename>, [<suboption>, <suboption>, ...]}. -</PRE>The filename can be indicated either as an absolute path, +<H3 CLASS="subsection"><A NAME="htoc30">3.1.10</A>&#XA0;&#XA0;<A HREF="#includeconfigfile">Include Additional Configuration Files</A></H3> <A NAME="includeconfigfile"></A> +The option <TT>include_config_file</TT> in a configuration file instructs <TT>ejabberd</TT> to include other configuration files immediately.The basic syntax is: +<DL CLASS="description"><DT CLASS="dt-description"><TT>{include_config_file, Filename}.</TT></DT></DL> +It is possible to specify suboptions using the full syntax: +<DL CLASS="description"><DT CLASS="dt-description"><TT>{include_config_file, Filename, [Suboption, ...]}.</TT></DT></DL>The filename can be indicated either as an absolute path, or relative to the main <TT>ejabberd</TT> configuration file. It isn&#X2019;t possible to use wildcards. The file must exist and be readable.The allowed suboptions are: <DL CLASS="description"><DT CLASS="dt-description"> -<TT>{disallow, [<option>, <option>, ...]}</TT></DT><DD CLASS="dd-description"> Disallows the usage of those options in the included configuration file. +<TT>{disallow, [Optionname, ...]}</TT></DT><DD CLASS="dd-description"> Disallows the usage of those options in the included configuration file. The options that match this criteria are not accepted. The default value is an empty list: <TT>[]</TT> -</DD><DT CLASS="dt-description"><TT>{allow_only, [<option>, <option>, ...]}</TT></DT><DD CLASS="dd-description"> Allows only the usage of those options in the included configuration file. +</DD><DT CLASS="dt-description"><TT>{allow_only, [Optionname, ...]}</TT></DT><DD CLASS="dd-description"> Allows only the usage of those options in the included configuration file. The options that do not match this criteria are not accepted. The default value is: <TT>all</TT> </DD></DL>This is a basic example: @@ -1281,12 +1293,12 @@ and later includes another file with additional rules: <PRE CLASS="verbatim">{acl, admin, {user, "bob", "localhost"}}. {acl, admin, {user, "jan", "localhost"}}. </PRE> <A NAME="optionmacros"></A>  -<H3 CLASS="subsection"><A NAME="htoc30">3.1.10</A>&#XA0;&#XA0;<A HREF="#optionmacros">Option Macros in Configuration File</A></H3> <A NAME="optionmacros"></A> +<H3 CLASS="subsection"><A NAME="htoc31">3.1.11</A>&#XA0;&#XA0;<A HREF="#optionmacros">Option Macros in Configuration File</A></H3> <A NAME="optionmacros"></A> In the <TT>ejabberd</TT> configuration file, it is possible to define a macro for a value and later use this macro when defining an option.A macro is defined with this syntax: -<PRE CLASS="verbatim">{define_macro, '<MACRO>', <value>}. -</PRE>The <TT>MACRO</TT> must be surrounded by single quotation marks, +<DL CLASS="description"><DT CLASS="dt-description"><TT>{define_macro, &#X2019;MACRO&#X2019;, Value}.</TT></DT></DL> +The <TT>MACRO</TT> must be surrounded by single quotation marks, and all letters in uppercase; check the examples bellow. The <TT>value</TT> can be any valid arbitrary Erlang term.The first definition of a macro is preserved, and additional definitions of the same macro are forgotten.Macros are processed after @@ -1294,17 +1306,17 @@ additional configuration files have been included, so it is possible to use macros that are defined in configuration files included before the usage.It isn&#X2019;t possible to use a macro in the definition of another macro.There are two ways to use a macro: -<DL CLASS="description"><DT CLASS="dt-description"><TT>&#X2019;<MACRO>&#X2019;</TT></DT><DD CLASS="dd-description"> +<DL CLASS="description"><DT CLASS="dt-description"><TT>&#X2019;MACRO&#X2019;</TT></DT><DD CLASS="dd-description"> You can put this instead of a value in an <TT>ejabberd</TT> option, and will be replaced with the <TT>value</TT> previously defined. If the macro is not defined previously, -the program will crash and report an error.</DD><DT CLASS="dt-description"><TT>{use_macro, &#X2019;<MACRO>&#X2019;, <defaultvalue>}</TT></DT><DD CLASS="dd-description"> +the program will crash and report an error.</DD><DT CLASS="dt-description"><TT>{use_macro, &#X2019;MACRO&#X2019;, Defaultvalue}</TT></DT><DD CLASS="dd-description"> Use a macro even if it may not be defined. If the macro is not defined previously, the provided <TT>defaultvalue</TT> is used. This usage behaves as if it were defined and used this way: -<PRE CLASS="verbatim">{define_macro, '<MACRO>', <defaultvalue>}. -'<MACRO>' +<PRE CLASS="verbatim">{define_macro, 'MACRO', Defaultvalue}. +'MACRO' </PRE></DD></DL>This example shows the basic usage of a macro: <PRE CLASS="verbatim">{define_macro, 'LOG_LEVEL_NUMBER', 5}. {loglevel, 'LOG_LEVEL_NUMBER'}. @@ -1330,7 +1342,7 @@ This usage behaves as if it were defined and used this way: ] }. </PRE> <A NAME="database"></A>  -<H2 CLASS="section"><A NAME="htoc31">3.2</A>&#XA0;&#XA0;<A HREF="#database">Database and LDAP Configuration</A></H2> <A NAME="database"></A> +<H2 CLASS="section"><A NAME="htoc32">3.2</A>&#XA0;&#XA0;<A HREF="#database">Database and LDAP Configuration</A></H2> <A NAME="database"></A> <TT>ejabberd</TT> uses its internal Mnesia database by default. However, it is possible to use a relational database or an LDAP server to store persistent, @@ -1363,7 +1375,7 @@ For example: {auth_method, [odbc]} ]}. </PRE> <A NAME="mysql"></A>  -<H3 CLASS="subsection"><A NAME="htoc32">3.2.1</A>&#XA0;&#XA0;<A HREF="#mysql">MySQL</A></H3> <A NAME="mysql"></A> +<H3 CLASS="subsection"><A NAME="htoc33">3.2.1</A>&#XA0;&#XA0;<A HREF="#mysql">MySQL</A></H3> <A NAME="mysql"></A> Although this section will describe <TT>ejabberd</TT>&#X2019;s configuration when you want to use the native MySQL driver, it does not describe MySQL&#X2019;s installation and database creation. Check the MySQL documentation and the tutorial <A HREF="http://support.process-one.net/doc/display/MESSENGER/Using+ejabberd+with+MySQL+native+driver">Using ejabberd with MySQL native driver</A> for information regarding these topics. @@ -1387,17 +1399,13 @@ commands: value is used to define if we want to use ODBC, or one of the two native interface available, PostgreSQL or MySQL.To use the native MySQL interface, you can pass a tuple of the following form as parameter: -<PRE CLASS="verbatim">{mysql, "Server", "Database", "Username", "Password"} -</PRE><TT>mysql</TT> is a keyword that should be kept as is. For example: -<PRE CLASS="verbatim">{odbc_server, {mysql, "localhost", "test", "root", "password"}}. -</PRE>Optionally, it is possible to define the MySQL port to use. This +<DL CLASS="description"><DT CLASS="dt-description"><TT>{mysql, "Server", "Database", "Username", "Password"}</TT></DT></DL><TT>mysql</TT> is a keyword that should be kept as is. For example: +<DL CLASS="description"><DT CLASS="dt-description"><TT>{odbc_server, {mysql, "localhost", "test", "root", "password"}}.</TT></DT></DL>Optionally, it is possible to define the MySQL port to use. This option is only useful, in very rare cases, when you are not running MySQL with the default port setting. The <TT>mysql</TT> parameter can thus take the following form: -<PRE CLASS="verbatim">{mysql, "Server", Port, "Database", "Username", "Password"} -</PRE>The <TT>Port</TT> value should be an integer, without quotes. For example: -<PRE CLASS="verbatim">{odbc_server, {mysql, "localhost", Port, "test", "root", "password"}}. -</PRE>By default <TT>ejabberd</TT> opens 10 connections to the database for each virtual host. +<DL CLASS="description"><DT CLASS="dt-description"><TT>{mysql, "Server", Port, "Database", "Username", "Password"}</TT></DT></DL>The <TT>Port</TT> value should be an integer, without quotes. For example: +<DL CLASS="description"><DT CLASS="dt-description"><TT>{odbc_server, {mysql, "localhost", Port, "test", "root", "password"}}.</TT></DT></DL>By default <TT>ejabberd</TT> opens 10 connections to the database for each virtual host. Use this option to modify the value: <PRE CLASS="verbatim">{odbc_pool_size, 10}. </PRE>You can configure an interval to make a dummy SQL request @@ -1424,7 +1432,7 @@ relational databases like MySQL. To enable storage to your database, just make sure that your database is running well (see previous sections), and replace the suffix-less or ldap module variant with the odbc module variant. Keep in mind that you cannot have several variants of the same module loaded! <A NAME="mssql"></A>  -<H3 CLASS="subsection"><A NAME="htoc33">3.2.2</A>&#XA0;&#XA0;<A HREF="#mssql">Microsoft SQL Server</A></H3> <A NAME="mssql"></A> +<H3 CLASS="subsection"><A NAME="htoc34">3.2.2</A>&#XA0;&#XA0;<A HREF="#mssql">Microsoft SQL Server</A></H3> <A NAME="mssql"></A> Although this section will describe <TT>ejabberd</TT>&#X2019;s configuration when you want to use Microsoft SQL Server, it does not describe Microsoft SQL Server&#X2019;s installation and database creation. Check the MySQL documentation and the @@ -1462,7 +1470,7 @@ database, just make sure that your database is running well (see previous sections), and replace the suffix-less or ldap module variant with the odbc module variant. Keep in mind that you cannot have several variants of the same module loaded! <A NAME="pgsql"></A>  -<H3 CLASS="subsection"><A NAME="htoc34">3.2.3</A>&#XA0;&#XA0;<A HREF="#pgsql">PostgreSQL</A></H3> <A NAME="pgsql"></A> +<H3 CLASS="subsection"><A NAME="htoc35">3.2.3</A>&#XA0;&#XA0;<A HREF="#pgsql">PostgreSQL</A></H3> <A NAME="pgsql"></A> Although this section will describe <TT>ejabberd</TT>&#X2019;s configuration when you want to use the native PostgreSQL driver, it does not describe PostgreSQL&#X2019;s installation and database creation. Check the PostgreSQL documentation and the tutorial <A HREF="http://support.process-one.net/doc/display/MESSENGER/Using+ejabberd+with+MySQL+native+driver">Using ejabberd with MySQL native driver</A> for information regarding these topics. @@ -1489,17 +1497,13 @@ using next commands: value is used to define if we want to use ODBC, or one of the two native interface available, PostgreSQL or MySQL.To use the native PostgreSQL interface, you can pass a tuple of the following form as parameter: -<PRE CLASS="verbatim">{pgsql, "Server", "Database", "Username", "Password"} -</PRE><TT>pgsql</TT> is a keyword that should be kept as is. For example: -<PRE CLASS="verbatim">{odbc_server, {pgsql, "localhost", "database", "ejabberd", "password"}}. -</PRE>Optionally, it is possible to define the PostgreSQL port to use. This +<DL CLASS="description"><DT CLASS="dt-description"><TT>{pgsql, "Server", "Database", "Username", "Password"}</TT></DT></DL><TT>pgsql</TT> is a keyword that should be kept as is. For example: +<DL CLASS="description"><DT CLASS="dt-description"><TT>{odbc_server, {pgsql, "localhost", "database", "ejabberd", "password"}}.</TT></DT></DL>Optionally, it is possible to define the PostgreSQL port to use. This option is only useful, in very rare cases, when you are not running PostgreSQL with the default port setting. The <TT>pgsql</TT> parameter can thus take the following form: -<PRE CLASS="verbatim">{pgsql, "Server", Port, "Database", "Username", "Password"} -</PRE>The <TT>Port</TT> value should be an integer, without quotes. For example: -<PRE CLASS="verbatim">{odbc_server, {pgsql, "localhost", 5432, "database", "ejabberd", "password"}}. -</PRE>By default <TT>ejabberd</TT> opens 10 connections to the database for each virtual host. +<DL CLASS="description"><DT CLASS="dt-description"><TT>{pgsql, "Server", Port, "Database", "Username", "Password"}</TT></DT></DL>The <TT>Port</TT> value should be an integer, without quotes. For example: +<DL CLASS="description"><DT CLASS="dt-description"><TT>{odbc_server, {pgsql, "localhost", 5432, "database", "ejabberd", "password"}}.</TT></DT></DL>By default <TT>ejabberd</TT> opens 10 connections to the database for each virtual host. Use this option to modify the value: <PRE CLASS="verbatim">{odbc_pool_size, 10}. </PRE>You can configure an interval to make a dummy SQL request @@ -1523,7 +1527,7 @@ relational databases like PostgreSQL. To enable storage to your database, just make sure that your database is running well (see previous sections), and replace the suffix-less or ldap module variant with the odbc module variant. Keep in mind that you cannot have several variants of the same module loaded! <A NAME="odbc"></A>  -<H3 CLASS="subsection"><A NAME="htoc35">3.2.4</A>&#XA0;&#XA0;<A HREF="#odbc">ODBC Compatible</A></H3> <A NAME="odbc"></A> +<H3 CLASS="subsection"><A NAME="htoc36">3.2.4</A>&#XA0;&#XA0;<A HREF="#odbc">ODBC Compatible</A></H3> <A NAME="odbc"></A> Although this section will describe <TT>ejabberd</TT>&#X2019;s configuration when you want to use the ODBC driver, it does not describe the installation and database creation of your database. Check the documentation of your database. The tutorial <A HREF="http://support.process-one.net/doc/display/MESSENGER/Using+ejabberd+with+MySQL+native+driver">Using ejabberd with MySQL native driver</A> also can help you. Note that the tutorial @@ -1568,7 +1572,7 @@ database, just make sure that your database is running well (see previous sections), and replace the suffix-less or ldap module variant with the odbc module variant. Keep in mind that you cannot have several variants of the same module loaded! <A NAME="ldap"></A>  -<H3 CLASS="subsection"><A NAME="htoc36">3.2.5</A>&#XA0;&#XA0;<A HREF="#ldap">LDAP</A></H3> <A NAME="ldap"></A> +<H3 CLASS="subsection"><A NAME="htoc37">3.2.5</A>&#XA0;&#XA0;<A HREF="#ldap">LDAP</A></H3> <A NAME="ldap"></A> <TT>ejabberd</TT> has built-in LDAP support. You can authenticate users against LDAP server and use LDAP directory as vCard storage. Shared rosters are not supported yet.Note that <TT>ejabberd</TT> treats LDAP as a read-only storage: @@ -1576,20 +1580,20 @@ it is possible to consult data, but not possible to create accounts, change password or edit vCard that is stored in LDAP. <A NAME="ldapconnection"></A>  <H4 CLASS="subsubsection"><A HREF="#ldapconnection">Connection</A></H4> <A NAME="ldapconnection"></A> Parameters: <DL CLASS="description"><DT CLASS="dt-description"> -<TT>ldap_servers</TT></DT><DD CLASS="dd-description"> List of IP addresses or DNS names of your +<TT>{ldap_servers, [Servers, ...]}</TT></DT><DD CLASS="dd-description"> List of IP addresses or DNS names of your LDAP servers. This option is required. -</DD><DT CLASS="dt-description"><TT>ldap_encrypt</TT></DT><DD CLASS="dd-description"> Type of connection encryption to the LDAP server. +</DD><DT CLASS="dt-description"><TT>{ldap_encrypt, none|tls}</TT></DT><DD CLASS="dd-description"> Type of connection encryption to the LDAP server. Allowed values are: <TT>none</TT>, <TT>tls</TT>. Note that STARTTLS is not supported. The default value is: <TT>none</TT>. -</DD><DT CLASS="dt-description"><TT>ldap_port</TT></DT><DD CLASS="dd-description"> Port to connect to your LDAP server. +</DD><DT CLASS="dt-description"><TT>{ldap_port, Number}</TT></DT><DD CLASS="dd-description"> Port to connect to your LDAP server. The default port is&#XA0;389 if encryption is disabled; and 636 if encryption is enabled. If you configure a value, it is stored in <TT>ejabberd</TT>&#X2019;s database. Then, if you remove that value from the configuration file, the value previously stored in the database will be used instead of the default port. -</DD><DT CLASS="dt-description"><TT>ldap_rootdn</TT></DT><DD CLASS="dd-description"> Bind DN. The default value +</DD><DT CLASS="dt-description"><TT>{ldap_rootdn, RootDN}</TT></DT><DD CLASS="dd-description"> Bind DN. The default value is&#XA0;<TT>""</TT> which means &#X2018;anonymous connection&#X2019;. -</DD><DT CLASS="dt-description"><TT>ldap_password</TT></DT><DD CLASS="dd-description"> Bind password. The default +</DD><DT CLASS="dt-description"><TT>{ldap_password, Password}</TT></DT><DD CLASS="dd-description"> Bind password. The default value is <TT>""</TT>. </DD></DL>Example: <PRE CLASS="verbatim">{auth_method, ldap}. @@ -1600,15 +1604,15 @@ value is <TT>""</TT>. </PRE>Note that current LDAP implementation does not support SSL secured communication and SASL authentication. <A NAME="ldapauth"></A>  <H4 CLASS="subsubsection"><A HREF="#ldapauth">Authentication</A></H4> <A NAME="ldapauth"></A> You can authenticate users against an LDAP directory. Available options are:<DL CLASS="description"><DT CLASS="dt-description"> -<TT>ldap_base</TT></DT><DD CLASS="dd-description">LDAP base directory which stores +<TT>{ldap_base, Base}</TT></DT><DD CLASS="dd-description">LDAP base directory which stores users accounts. This option is required. -</DD><DT CLASS="dt-description"><TT>ldap_uids</TT></DT><DD CLASS="dd-description">LDAP attribute which holds a list -of attributes to use as alternatives for getting the JID. The value is of -the form: <TT>[{ldap_uidattr}]</TT> or <TT>[{ldap_uidattr, -ldap_uidattr_format}]</TT>. You can use as many comma separated tuples -<TT>{ldap_uidattr, ldap_uidattr_format}</TT> that is needed. The default -value is <TT>[{"uid", "%u"}]</TT>. The defaut <TT>ldap_uidattr_format</TT> -is <TT>"%u"</TT>. The values for <TT>ldap_uidattr</TT> and +</DD><DT CLASS="dt-description"><TT>{ldap_uids, [ {ldap_uidattr} | {ldap_uidattr, ldap_uidattr_format}, ...]}</TT></DT><DD CLASS="dd-description"> +LDAP attribute which holds a list of attributes to use as alternatives for getting the JID. +The default attributes are <TT>[{"uid", "%u"}]</TT>. +The attributes are of the form: +<TT>[{ldap_uidattr}]</TT> or <TT>[{ldap_uidattr, ldap_uidattr_format}]</TT>. +You can use as many comma separated attributes as needed. +The values for <TT>ldap_uidattr</TT> and <TT>ldap_uidattr_format</TT> are described as follow: <DL CLASS="description"><DT CLASS="dt-description"> <TT>ldap_uidattr</TT></DT><DD CLASS="dd-description">LDAP attribute which holds @@ -1619,13 +1623,13 @@ only one pattern variable <TT>"%u"</TT> which will be replaced by the user&#X2019;s part of a JID. For example, <TT>"%u@example.org"</TT>. The default value is <TT>"%u"</TT>. </DD></DL> -</DD><DT CLASS="dt-description"><TT>ldap_filter</TT></DT><DD CLASS="dd-description"> -<A HREF="http://www.faqs.org/rfcs/rfc2254.html">RFC 2254</A> LDAP filter. The +</DD><DT CLASS="dt-description"><TT>{ldap_filter, Filter}</TT></DT><DD CLASS="dd-description"> +<A HREF="http://tools.ietf.org/html/rfc4515">RFC 4515</A> LDAP filter. The default is <TT>none</TT>. Example: <TT>"(&(objectClass=shadowAccount)(memberOf=Jabber Users))"</TT>. Please, do not forget to close brackets and do not use superfluous whitespaces. Also you must not use <TT>ldap_uidattr</TT> attribute in filter because this -attribute will be substituted in LDAP filter automatically.</DD><DT CLASS="dt-description"><TT>ldap_local_filter</TT></DT><DD CLASS="dd-description"> +attribute will be substituted in LDAP filter automatically.</DD><DT CLASS="dt-description"><TT>{ldap_local_filter, Filter}</TT></DT><DD CLASS="dd-description"> If you can&#X2019;t use <TT>ldap_filter</TT> due to performance reasons (the LDAP server has many users registered), you can use this local filter. @@ -1754,11 +1758,12 @@ configuration is shown below:<PRE CLASS="verbatim">{auth_method, ldap}. ... ]}. </PRE> <A NAME="modules"></A>  -<H2 CLASS="section"><A NAME="htoc37">3.3</A>&#XA0;&#XA0;<A HREF="#modules">Modules Configuration</A></H2> <A NAME="modules"></A> +<H2 CLASS="section"><A NAME="htoc38">3.3</A>&#XA0;&#XA0;<A HREF="#modules">Modules Configuration</A></H2> <A NAME="modules"></A> The option <TT>modules</TT> defines the list of modules that will be loaded after <TT>ejabberd</TT>&#X2019;s startup. Each entry in the list is a tuple in which the first element is the name of a module and the second is a list of options for that -module.Examples: +module.The syntax is: +<DL CLASS="description"><DT CLASS="dt-description"><TT>{modules, [ {ModuleName, ModuleOptions}, ...]}.</TT></DT></DL>Examples: <UL CLASS="itemize"><LI CLASS="li-itemize"> In this example only the module <TT>mod_echo</TT> is loaded and no module options are specified between the square brackets: @@ -1776,40 +1781,42 @@ all entries end with a comma: {mod_version, []} ]}. </PRE></LI></UL> <A NAME="modoverview"></A>  -<H3 CLASS="subsection"><A NAME="htoc38">3.3.1</A>&#XA0;&#XA0;<A HREF="#modoverview">Modules Overview</A></H3> <A NAME="modoverview"></A> +<H3 CLASS="subsection"><A NAME="htoc39">3.3.1</A>&#XA0;&#XA0;<A HREF="#modoverview">Modules Overview</A></H3> <A NAME="modoverview"></A> The following table lists all modules included in <TT>ejabberd</TT>.<BLOCKQUOTE CLASS="table"><DIV CLASS="center"><DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV> <TABLE BORDER=1 CELLSPACING=0 CELLPADDING=1><TR><TD ALIGN=left NOWRAP>Module</TD><TD ALIGN=left NOWRAP>Feature</TD><TD ALIGN=left NOWRAP>Dependencies</TD></TR> -<TR><TD ALIGN=left NOWRAP><TT>mod_adhoc</TT></TD><TD ALIGN=left NOWRAP>Ad-Hoc Commands (<A HREF="http://www.xmpp.org/extensions/xep-0050.html">XEP-0050</A>)</TD><TD ALIGN=left NOWRAP> </TD></TR> +<TR><TD ALIGN=left NOWRAP><TT>mod_adhoc</TT></TD><TD ALIGN=left NOWRAP>Ad-Hoc Commands (<A HREF="http://xmpp.org/extensions/xep-0050.html">XEP-0050</A>)</TD><TD ALIGN=left NOWRAP> </TD></TR> <TR><TD ALIGN=left NOWRAP><A HREF="#modannounce"><TT>mod_announce</TT></A></TD><TD ALIGN=left NOWRAP>Manage announcements</TD><TD ALIGN=left NOWRAP>recommends <TT>mod_adhoc</TT></TD></TR> -<TR><TD ALIGN=left NOWRAP><TT>mod_caps</TT></TD><TD ALIGN=left NOWRAP>Entity Capabilities (<A HREF="http://www.xmpp.org/extensions/xep-0115.html">XEP-0115</A>)</TD><TD ALIGN=left NOWRAP> </TD></TR> +<TR><TD ALIGN=left NOWRAP><TT>mod_caps</TT></TD><TD ALIGN=left NOWRAP>Entity Capabilities (<A HREF="http://xmpp.org/extensions/xep-0115.html">XEP-0115</A>)</TD><TD ALIGN=left NOWRAP> </TD></TR> <TR><TD ALIGN=left NOWRAP><TT>mod_configure</TT></TD><TD ALIGN=left NOWRAP>Server configuration using Ad-Hoc</TD><TD ALIGN=left NOWRAP><TT>mod_adhoc</TT></TD></TR> -<TR><TD ALIGN=left NOWRAP><A HREF="#moddisco"><TT>mod_disco</TT></A></TD><TD ALIGN=left NOWRAP>Service Discovery (<A HREF="http://www.xmpp.org/extensions/xep-0030.html">XEP-0030</A>)</TD><TD ALIGN=left NOWRAP> </TD></TR> +<TR><TD ALIGN=left NOWRAP><A HREF="#moddisco"><TT>mod_disco</TT></A></TD><TD ALIGN=left NOWRAP>Service Discovery (<A HREF="http://xmpp.org/extensions/xep-0030.html">XEP-0030</A>)</TD><TD ALIGN=left NOWRAP> </TD></TR> <TR><TD ALIGN=left NOWRAP><A HREF="#modecho"><TT>mod_echo</TT></A></TD><TD ALIGN=left NOWRAP>Echoes Jabber packets</TD><TD ALIGN=left NOWRAP> </TD></TR> <TR><TD ALIGN=left NOWRAP><A HREF="#modirc"><TT>mod_irc</TT></A></TD><TD ALIGN=left NOWRAP>IRC transport</TD><TD ALIGN=left NOWRAP> </TD></TR> -<TR><TD ALIGN=left NOWRAP><A HREF="#modlast"><TT>mod_last</TT></A></TD><TD ALIGN=left NOWRAP>Last Activity (<A HREF="http://www.xmpp.org/extensions/xep-0012.html">XEP-0012</A>)</TD><TD ALIGN=left NOWRAP> </TD></TR> -<TR><TD ALIGN=left NOWRAP><A HREF="#modlast"><TT>mod_last_odbc</TT></A></TD><TD ALIGN=left NOWRAP>Last Activity (<A HREF="http://www.xmpp.org/extensions/xep-0012.html">XEP-0012</A>)</TD><TD ALIGN=left NOWRAP>supported DB (*)</TD></TR> -<TR><TD ALIGN=left NOWRAP><A HREF="#modmuc"><TT>mod_muc</TT></A></TD><TD ALIGN=left NOWRAP>Multi-User Chat (<A HREF="http://www.xmpp.org/extensions/xep-0045.html">XEP-0045</A>)</TD><TD ALIGN=left NOWRAP> </TD></TR> +<TR><TD ALIGN=left NOWRAP><A HREF="#modlast"><TT>mod_last</TT></A></TD><TD ALIGN=left NOWRAP>Last Activity (<A HREF="http://xmpp.org/extensions/xep-0012.html">XEP-0012</A>)</TD><TD ALIGN=left NOWRAP> </TD></TR> +<TR><TD ALIGN=left NOWRAP><A HREF="#modlast"><TT>mod_last_odbc</TT></A></TD><TD ALIGN=left NOWRAP>Last Activity (<A HREF="http://xmpp.org/extensions/xep-0012.html">XEP-0012</A>)</TD><TD ALIGN=left NOWRAP>supported DB (*)</TD></TR> +<TR><TD ALIGN=left NOWRAP><A HREF="#modmuc"><TT>mod_muc</TT></A></TD><TD ALIGN=left NOWRAP>Multi-User Chat (<A HREF="http://xmpp.org/extensions/xep-0045.html">XEP-0045</A>)</TD><TD ALIGN=left NOWRAP> </TD></TR> <TR><TD ALIGN=left NOWRAP><A HREF="#modmuclog"><TT>mod_muc_log</TT></A></TD><TD ALIGN=left NOWRAP>Multi-User Chat room logging</TD><TD ALIGN=left NOWRAP><TT>mod_muc</TT></TD></TR> -<TR><TD ALIGN=left NOWRAP><A HREF="#modoffline"><TT>mod_offline</TT></A></TD><TD ALIGN=left NOWRAP>Offline message storage (<A HREF="http://www.xmpp.org/extensions/xep-0160.html">XEP-0160</A>)</TD><TD ALIGN=left NOWRAP> </TD></TR> -<TR><TD ALIGN=left NOWRAP><A HREF="#modoffline"><TT>mod_offline_odbc</TT></A></TD><TD ALIGN=left NOWRAP>Offline message storage (<A HREF="http://www.xmpp.org/extensions/xep-0160.html">XEP-0160</A>)</TD><TD ALIGN=left NOWRAP>supported DB (*)</TD></TR> +<TR><TD ALIGN=left NOWRAP><A HREF="#modoffline"><TT>mod_offline</TT></A></TD><TD ALIGN=left NOWRAP>Offline message storage (<A HREF="http://xmpp.org/extensions/xep-0160.html">XEP-0160</A>)</TD><TD ALIGN=left NOWRAP> </TD></TR> +<TR><TD ALIGN=left NOWRAP><A HREF="#modoffline"><TT>mod_offline_odbc</TT></A></TD><TD ALIGN=left NOWRAP>Offline message storage (<A HREF="http://xmpp.org/extensions/xep-0160.html">XEP-0160</A>)</TD><TD ALIGN=left NOWRAP>supported DB (*)</TD></TR> +<TR><TD ALIGN=left NOWRAP><A HREF="#modping"><TT>mod_ping</TT></A></TD><TD ALIGN=left NOWRAP>XMPP Ping and periodic keepalives (<A HREF="http://xmpp.org/extensions/xep-0199.html">XEP-0199</A>)</TD><TD ALIGN=left NOWRAP> </TD></TR> <TR><TD ALIGN=left NOWRAP><A HREF="#modprivacy"><TT>mod_privacy</TT></A></TD><TD ALIGN=left NOWRAP>Blocking Communication (XMPP IM)</TD><TD ALIGN=left NOWRAP> </TD></TR> <TR><TD ALIGN=left NOWRAP><A HREF="#modprivacy"><TT>mod_privacy_odbc</TT></A></TD><TD ALIGN=left NOWRAP>Blocking Communication (XMPP IM)</TD><TD ALIGN=left NOWRAP>supported DB (*)</TD></TR> -<TR><TD ALIGN=left NOWRAP><A HREF="#modprivate"><TT>mod_private</TT></A></TD><TD ALIGN=left NOWRAP>Private XML Storage (<A HREF="http://www.xmpp.org/extensions/xep-0049.html">XEP-0049</A>)</TD><TD ALIGN=left NOWRAP> </TD></TR> -<TR><TD ALIGN=left NOWRAP><A HREF="#modprivate"><TT>mod_private_odbc</TT></A></TD><TD ALIGN=left NOWRAP>Private XML Storage (<A HREF="http://www.xmpp.org/extensions/xep-0049.html">XEP-0049</A>)</TD><TD ALIGN=left NOWRAP>supported DB (*)</TD></TR> -<TR><TD ALIGN=left NOWRAP><A HREF="#modproxy"><TT>mod_proxy65</TT></A></TD><TD ALIGN=left NOWRAP>SOCKS5 Bytestreams (<A HREF="http://www.xmpp.org/extensions/xep-0065.html">XEP-0065</A>)</TD><TD ALIGN=left NOWRAP> </TD></TR> -<TR><TD ALIGN=left NOWRAP><A HREF="#modpubsub"><TT>mod_pubsub</TT></A></TD><TD ALIGN=left NOWRAP>Pub-Sub (<A HREF="http://www.xmpp.org/extensions/xep-0060.html">XEP-0060</A>), PEP (<A HREF="http://www.xmpp.org/extensions/xep-0163.html">XEP-0163</A>)</TD><TD ALIGN=left NOWRAP><TT>mod_caps</TT></TD></TR> -<TR><TD ALIGN=left NOWRAP><A HREF="#modregister"><TT>mod_register</TT></A></TD><TD ALIGN=left NOWRAP>In-Band Registration (<A HREF="http://www.xmpp.org/extensions/xep-0077.html">XEP-0077</A>)</TD><TD ALIGN=left NOWRAP> </TD></TR> +<TR><TD ALIGN=left NOWRAP><A HREF="#modprivate"><TT>mod_private</TT></A></TD><TD ALIGN=left NOWRAP>Private XML Storage (<A HREF="http://xmpp.org/extensions/xep-0049.html">XEP-0049</A>)</TD><TD ALIGN=left NOWRAP> </TD></TR> +<TR><TD ALIGN=left NOWRAP><A HREF="#modprivate"><TT>mod_private_odbc</TT></A></TD><TD ALIGN=left NOWRAP>Private XML Storage (<A HREF="http://xmpp.org/extensions/xep-0049.html">XEP-0049</A>)</TD><TD ALIGN=left NOWRAP>supported DB (*)</TD></TR> +<TR><TD ALIGN=left NOWRAP><A HREF="#modproxy"><TT>mod_proxy65</TT></A></TD><TD ALIGN=left NOWRAP>SOCKS5 Bytestreams (<A HREF="http://xmpp.org/extensions/xep-0065.html">XEP-0065</A>)</TD><TD ALIGN=left NOWRAP> </TD></TR> +<TR><TD ALIGN=left NOWRAP><A HREF="#modpubsub"><TT>mod_pubsub</TT></A></TD><TD ALIGN=left NOWRAP>Pub-Sub (<A HREF="http://xmpp.org/extensions/xep-0060.html">XEP-0060</A>), PEP (<A HREF="http://xmpp.org/extensions/xep-0163.html">XEP-0163</A>)</TD><TD ALIGN=left NOWRAP><TT>mod_caps</TT></TD></TR> +<TR><TD ALIGN=left NOWRAP><A HREF="#modpubsub"><TT>mod_pubsub_odbc</TT></A></TD><TD ALIGN=left NOWRAP>Pub-Sub (<A HREF="http://xmpp.org/extensions/xep-0060.html">XEP-0060</A>), PEP (<A HREF="http://xmpp.org/extensions/xep-0163.html">XEP-0163</A>)</TD><TD ALIGN=left NOWRAP>supported DB (*) and <TT>mod_caps</TT></TD></TR> +<TR><TD ALIGN=left NOWRAP><A HREF="#modregister"><TT>mod_register</TT></A></TD><TD ALIGN=left NOWRAP>In-Band Registration (<A HREF="http://xmpp.org/extensions/xep-0077.html">XEP-0077</A>)</TD><TD ALIGN=left NOWRAP> </TD></TR> <TR><TD ALIGN=left NOWRAP><A HREF="#modroster"><TT>mod_roster</TT></A></TD><TD ALIGN=left NOWRAP>Roster management (XMPP IM)</TD><TD ALIGN=left NOWRAP> </TD></TR> <TR><TD ALIGN=left NOWRAP><A HREF="#modroster"><TT>mod_roster_odbc</TT></A></TD><TD ALIGN=left NOWRAP>Roster management (XMPP IM)</TD><TD ALIGN=left NOWRAP>supported DB (*)</TD></TR> <TR><TD ALIGN=left NOWRAP><A HREF="#modservicelog"><TT>mod_service_log</TT></A></TD><TD ALIGN=left NOWRAP>Copy user messages to logger service</TD><TD ALIGN=left NOWRAP> </TD></TR> <TR><TD ALIGN=left NOWRAP><A HREF="#modsharedroster"><TT>mod_shared_roster</TT></A></TD><TD ALIGN=left NOWRAP>Shared roster management</TD><TD ALIGN=left NOWRAP><TT>mod_roster</TT> or</TD></TR> <TR><TD ALIGN=left NOWRAP> </TD><TD ALIGN=left NOWRAP> </TD><TD ALIGN=left NOWRAP><TT>mod_roster_odbc</TT></TD></TR> -<TR><TD ALIGN=left NOWRAP><A HREF="#modstats"><TT>mod_stats</TT></A></TD><TD ALIGN=left NOWRAP>Statistics Gathering (<A HREF="http://www.xmpp.org/extensions/xep-0039.html">XEP-0039</A>)</TD><TD ALIGN=left NOWRAP> </TD></TR> -<TR><TD ALIGN=left NOWRAP><A HREF="#modtime"><TT>mod_time</TT></A></TD><TD ALIGN=left NOWRAP>Entity Time (<A HREF="http://www.xmpp.org/extensions/xep-0090.html">XEP-0090</A>)</TD><TD ALIGN=left NOWRAP> </TD></TR> -<TR><TD ALIGN=left NOWRAP><A HREF="#modvcard"><TT>mod_vcard</TT></A></TD><TD ALIGN=left NOWRAP>vcard-temp (<A HREF="http://www.xmpp.org/extensions/xep-0054.html">XEP-0054</A>)</TD><TD ALIGN=left NOWRAP> </TD></TR> -<TR><TD ALIGN=left NOWRAP><A HREF="#modvcardldap"><TT>mod_vcard_ldap</TT></A></TD><TD ALIGN=left NOWRAP>vcard-temp (<A HREF="http://www.xmpp.org/extensions/xep-0054.html">XEP-0054</A>)</TD><TD ALIGN=left NOWRAP>LDAP server</TD></TR> -<TR><TD ALIGN=left NOWRAP><A HREF="#modvcard"><TT>mod_vcard_odbc</TT></A></TD><TD ALIGN=left NOWRAP>vcard-temp (<A HREF="http://www.xmpp.org/extensions/xep-0054.html">XEP-0054</A>)</TD><TD ALIGN=left NOWRAP>supported DB (*)</TD></TR> -<TR><TD ALIGN=left NOWRAP><A HREF="#modversion"><TT>mod_version</TT></A></TD><TD ALIGN=left NOWRAP>Software Version (<A HREF="http://www.xmpp.org/extensions/xep-0092.html">XEP-0092</A>)</TD><TD ALIGN=left NOWRAP> </TD></TR> +<TR><TD ALIGN=left NOWRAP><A HREF="#modstats"><TT>mod_stats</TT></A></TD><TD ALIGN=left NOWRAP>Statistics Gathering (<A HREF="http://xmpp.org/extensions/xep-0039.html">XEP-0039</A>)</TD><TD ALIGN=left NOWRAP> </TD></TR> +<TR><TD ALIGN=left NOWRAP><A HREF="#modtime"><TT>mod_time</TT></A></TD><TD ALIGN=left NOWRAP>Entity Time (<A HREF="http://xmpp.org/extensions/xep-0202.html">XEP-0202</A>)</TD><TD ALIGN=left NOWRAP> </TD></TR> +<TR><TD ALIGN=left NOWRAP><A HREF="#modvcard"><TT>mod_vcard</TT></A></TD><TD ALIGN=left NOWRAP>vcard-temp (<A HREF="http://xmpp.org/extensions/xep-0054.html">XEP-0054</A>)</TD><TD ALIGN=left NOWRAP> </TD></TR> +<TR><TD ALIGN=left NOWRAP><A HREF="#modvcardldap"><TT>mod_vcard_ldap</TT></A></TD><TD ALIGN=left NOWRAP>vcard-temp (<A HREF="http://xmpp.org/extensions/xep-0054.html">XEP-0054</A>)</TD><TD ALIGN=left NOWRAP>LDAP server</TD></TR> +<TR><TD ALIGN=left NOWRAP><A HREF="#modvcard"><TT>mod_vcard_odbc</TT></A></TD><TD ALIGN=left NOWRAP>vcard-temp (<A HREF="http://xmpp.org/extensions/xep-0054.html">XEP-0054</A>)</TD><TD ALIGN=left NOWRAP>supported DB (*)</TD></TR> +<TR><TD ALIGN=left NOWRAP><A HREF="#modversion"><TT>mod_version</TT></A></TD><TD ALIGN=left NOWRAP>Software Version (<A HREF="http://xmpp.org/extensions/xep-0092.html">XEP-0092</A>)</TD><TD ALIGN=left NOWRAP> </TD></TR> </TABLE> <DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE><UL CLASS="itemize"><LI CLASS="li-itemize"> (*) This module requires a supported database. For a list of supported databases, see section&#XA0;<A HREF="#database">3.2</A>. @@ -1838,13 +1845,14 @@ Last connection date and time: Use <TT>mod_last_odbc</TT> instead of <TT>ejabberd</TT> website. Please remember that these contributions might not work or that they can contain severe bugs and security leaks. Therefore, use them at your own risk! <A NAME="modcommonoptions"></A>  -<H3 CLASS="subsection"><A NAME="htoc39">3.3.2</A>&#XA0;&#XA0;<A HREF="#modcommonoptions">Common Options</A></H3> <A NAME="modcommonoptions"></A> The following options are used by many modules. Therefore, they are described in +<H3 CLASS="subsection"><A NAME="htoc40">3.3.2</A>&#XA0;&#XA0;<A HREF="#modcommonoptions">Common Options</A></H3> <A NAME="modcommonoptions"></A> The following options are used by many modules. Therefore, they are described in this separate section. <A NAME="modiqdiscoption"></A>  <H4 CLASS="subsubsection"><A HREF="#modiqdiscoption"><TT>iqdisc</TT></A></H4> <A NAME="modiqdiscoption"></A> Many modules define handlers for processing IQ queries of different namespaces to this server or to a user (e.&#XA0;g. to <TT>example.org</TT> or to <TT>user@example.org</TT>). This option defines processing discipline for -these queries. Possible values are: +these queries.The syntax is: +<DL CLASS="description"><DT CLASS="dt-description"><TT>{iqdisc, Value}</TT></DT></DL>Possible <TT>Value</TT> are: <DL CLASS="description"><DT CLASS="dt-description"> <TT>no_queue</TT></DT><DD CLASS="dd-description"> All queries of a namespace with this processing discipline are processed immediately. This also means that no other packets can be processed @@ -1871,8 +1879,9 @@ number of processes (32000 by default). ]}. </PRE> <A NAME="modhostoption"></A>  <H4 CLASS="subsubsection"><A HREF="#modhostoption"><TT>host</TT></A></H4> <A NAME="modhostoption"></A> -This option defines the Jabber ID of a service provided by an <TT>ejabberd</TT> module. -The keyword "@HOST@" is replaced at start time with the real virtual host string.This example configures +This option defines the Jabber ID of a service provided by an <TT>ejabberd</TT> module.The syntax is: +<DL CLASS="description"><DT CLASS="dt-description"><TT>{host, HostName}</TT></DT></DL>If you include the keyword "@HOST@" in the HostName, +it is replaced at start time with the real virtual host string.This example configures the echo module to provide its echoing service in the Jabber ID <TT>mirror.example.org</TT>: <PRE CLASS="verbatim">{modules, @@ -1890,7 +1899,7 @@ the "@HOST@" keyword must be used: ... ]}. </PRE> <A NAME="modannounce"></A>  -<H3 CLASS="subsection"><A NAME="htoc40">3.3.3</A>&#XA0;&#XA0;<A HREF="#modannounce"><TT>mod_announce</TT></A></H3> <A NAME="modannounce"></A> +<H3 CLASS="subsection"><A NAME="htoc41">3.3.3</A>&#XA0;&#XA0;<A HREF="#modannounce"><TT>mod_announce</TT></A></H3> <A NAME="modannounce"></A> This module enables configured users to broadcast announcements and to set the message of the day (MOTD). Configured users can perform these actions with a @@ -1921,7 +1930,7 @@ login. The message is not sent to any currently connected user. Any message sent to this JID removes the existing message of the day (MOTD). </DD></DL>Options: <DL CLASS="description"><DT CLASS="dt-description"> -<TT>access</TT></DT><DD CLASS="dd-description"> This option specifies who is allowed to +<TT>{access, AccessName}</TT></DT><DD CLASS="dd-description"> This option specifies who is allowed to send announcements and to set the message of the day (by default, nobody is able to send such messages). </DD></DL>Examples: @@ -1954,23 +1963,32 @@ Only administrators can send announcements: </PRE></LI></UL>Note that <TT>mod_announce</TT> can be resource intensive on large deployments as it can broadcast lot of messages. This module should be disabled for instances of <TT>ejabberd</TT> with hundreds of thousands users. <A NAME="moddisco"></A>  -<H3 CLASS="subsection"><A NAME="htoc41">3.3.4</A>&#XA0;&#XA0;<A HREF="#moddisco"><TT>mod_disco</TT></A></H3> <A NAME="moddisco"></A> +<H3 CLASS="subsection"><A NAME="htoc42">3.3.4</A>&#XA0;&#XA0;<A HREF="#moddisco"><TT>mod_disco</TT></A></H3> <A NAME="moddisco"></A> -This module adds support for Service Discovery (<A HREF="http://www.xmpp.org/extensions/xep-0030.html">XEP-0030</A>). With + +This module adds support for Service Discovery (<A HREF="http://xmpp.org/extensions/xep-0030.html">XEP-0030</A>). With this module enabled, services on your server can be discovered by Jabber clients. Note that <TT>ejabberd</TT> has no modules with support -for the superseded Jabber Browsing (<A HREF="http://www.xmpp.org/extensions/xep-0011.html">XEP-0011</A>) and Agent Information -(<A HREF="http://www.xmpp.org/extensions/xep-0094.html">XEP-0094</A>). Accordingly, Jabber clients need to have support for +for the superseded Jabber Browsing (<A HREF="http://xmpp.org/extensions/xep-0011.html">XEP-0011</A>) and Agent Information +(<A HREF="http://xmpp.org/extensions/xep-0094.html">XEP-0094</A>). Accordingly, Jabber clients need to have support for the newer Service Discovery protocol if you want them be able to discover the services you offer.Options: <DL CLASS="description"><DT CLASS="dt-description"> -<TT>iqdisc</TT></DT><DD CLASS="dd-description"> This specifies +<TT>{iqdisc, Discipline}</TT></DT><DD CLASS="dd-description"> This specifies the processing discipline for Service Discovery (<TT>http://jabber.org/protocol/disco#items</TT> and <TT>http://jabber.org/protocol/disco#info</TT>) IQ queries (see section&#XA0;<A HREF="#modiqdiscoption">3.3.2</A>). -</DD><DT CLASS="dt-description"><TT>extra_domains</TT></DT><DD CLASS="dd-description"> With this option, -extra domains can be added to the Service Discovery item list. +</DD><DT CLASS="dt-description"><TT>{extra_domains, [Domain, ...]}</TT></DT><DD CLASS="dd-description"> With this option, +you can specify a list of extra domains that are added to the Service Discovery item list. +</DD><DT CLASS="dt-description"><TT>{server_info, [ {Modules, Field, [Value, ...]}, ... ]}</TT></DT><DD CLASS="dd-description"> +Specify additional information about the server, +as described in Contact Addresses for XMPP Services (<A HREF="http://xmpp.org/extensions/xep-0157.html">XEP-0157</A>). +<TT>Modules</TT> can be the keyword &#X2018;all&#X2019;, +in which case the information is reported in all the services; +or a list of <TT>ejabberd</TT> modules, +in which case the information is only specified for the services provided by those modules. +Any arbitrary <TT>Field</TT> and <TT>Value</TT> can be specified, not only contact addresses. </DD></DL>Examples: <UL CLASS="itemize"><LI CLASS="li-itemize"> To serve a link to the Jabber User Directory on <TT>jabber.org</TT>: @@ -1996,14 +2014,36 @@ To serve a link to the Jabber User Directory on <TT>jabber.org</TT>: "example.com"]}]}, ... ]}. +</PRE></LI><LI CLASS="li-itemize">With this configuration, all services show abuse addresses, +feedback address on the main server, +and admin addresses for both the main server and the vJUD service: +<PRE CLASS="verbatim">{modules, + [ + ... + {mod_disco, [{server_info, [ + {all, + "abuse-addresses", + ["mailto:abuse@shakespeare.lit"]}, + {[mod_muc], + "Web chatroom logs", + ["http://www.example.org/muc-logs"]}, + {[mod_disco], + "feedback-addresses", + ["http://shakespeare.lit/feedback.php", "mailto:feedback@shakespeare.lit", "xmpp:feedback@shakespeare.lit"]}, + {[mod_disco, mod_vcard], + "admin-addresses", + ["mailto:xmpp@shakespeare.lit", "xmpp:admins@shakespeare.lit"]} + ]}]}, + ... + ]}. </PRE></LI></UL> <A NAME="modecho"></A>  -<H3 CLASS="subsection"><A NAME="htoc42">3.3.5</A>&#XA0;&#XA0;<A HREF="#modecho"><TT>mod_echo</TT></A></H3> <A NAME="modecho"></A> +<H3 CLASS="subsection"><A NAME="htoc43">3.3.5</A>&#XA0;&#XA0;<A HREF="#modecho"><TT>mod_echo</TT></A></H3> <A NAME="modecho"></A> This module simply echoes any Jabber packet back to the sender. This mirror can be of interest for <TT>ejabberd</TT> and Jabber client debugging.Options: <DL CLASS="description"><DT CLASS="dt-description"> -<TT>host</TT></DT><DD CLASS="dd-description"> This option defines the Jabber ID of the +<TT>{host, HostName}</TT></DT><DD CLASS="dd-description"> This option defines the Jabber ID of the service. If the <TT>host</TT> option is not specified, the Jabber ID will be the hostname of the virtual host with the prefix &#X2018;<TT>echo.</TT>&#X2019;. The keyword "@HOST@" is replaced at start time with the real virtual host name. @@ -2017,9 +2057,9 @@ of them all? ... ]}. </PRE> <A NAME="modhttpbind"></A>  -<H3 CLASS="subsection"><A NAME="htoc43">3.3.6</A>&#XA0;&#XA0;<A HREF="#modhttpbind"><TT>mod_http_bind</TT></A></H3> <A NAME="modhttpbind"></A> +<H3 CLASS="subsection"><A NAME="htoc44">3.3.6</A>&#XA0;&#XA0;<A HREF="#modhttpbind"><TT>mod_http_bind</TT></A></H3> <A NAME="modhttpbind"></A> This module implements XMPP over Bosh (formerly known as HTTP Binding) -as defined in <A HREF="http://www.xmpp.org/extensions/xep-0124.html">XEP-0124</A> and <A HREF="http://www.xmpp.org/extensions/xep-0206.html">XEP-0206</A>. +as defined in <A HREF="http://xmpp.org/extensions/xep-0124.html">XEP-0124</A> and <A HREF="http://xmpp.org/extensions/xep-0206.html">XEP-0206</A>. It extends ejabberd&#X2019;s built in HTTP service with a configurable resource at which this service will be hosted.To use HTTP-Binding, enable the module: <PRE CLASS="verbatim">{modules, @@ -2057,40 +2097,57 @@ For example: }, ... ]}. -</PRE>The maximum inactivity period is by default 30 seconds. -This can be configured with the module option <TT>max_inactivity</TT>. +</PRE>Options: +<DL CLASS="description"><DT CLASS="dt-description"> +<TT>{max_inactivity, Seconds}</TT></DT><DD CLASS="dd-description"> +Define the maximum inactivity period in seconds. +Default value is 30 seconds. For example, to set 50 seconds: -<PRE CLASS="verbatim">{modules, +<PRE CLASS="verbatim">{modules, [ ... {mod_http_bind, [ {max_inactivity, 50} ]}, ... ]}. -</PRE> <A NAME="modhttpfileserver"></A>  -<H3 CLASS="subsection"><A NAME="htoc44">3.3.7</A>&#XA0;&#XA0;<A HREF="#modhttpfileserver"><TT>mod_http_fileserver</TT></A></H3> <A NAME="modhttpfileserver"></A> +</PRE></DD></DL> <A NAME="modhttpfileserver"></A>  +<H3 CLASS="subsection"><A NAME="htoc45">3.3.7</A>&#XA0;&#XA0;<A HREF="#modhttpfileserver"><TT>mod_http_fileserver</TT></A></H3> <A NAME="modhttpfileserver"></A> This simple module serves files from the local disk over HTTP.Options: <DL CLASS="description"><DT CLASS="dt-description"> -<TT>docroot</TT></DT><DD CLASS="dd-description"> +<TT>{docroot, Path}</TT></DT><DD CLASS="dd-description"> Directory to serve the files. -</DD><DT CLASS="dt-description"><TT>accesslog</TT></DT><DD CLASS="dd-description"> +</DD><DT CLASS="dt-description"><TT>{accesslog, Path}</TT></DT><DD CLASS="dd-description"> File to log accesses using an Apache-like format. No log will be recorded if this option is not specified. -</DD><DT CLASS="dt-description"><TT>directory_indices</TT></DT><DD CLASS="dd-description"> +</DD><DT CLASS="dt-description"><TT>{directory_indices, [Index, ...]}</TT></DT><DD CLASS="dd-description"> Indicate one or more directory index files, similarly to Apache&#X2019;s DirectoryIndex variable. When a web request hits a directory instead of a regular file, those directory indices are looked in order, and the first one found is returned. +Specify a mapping of extensions to content types. +There are several content types already defined, +with this option you can add new definitions, modify or delete existing ones. +To delete an existing definition, simply define it with a value: &#X2018;undefined&#X2019;. +</DD><DT CLASS="dt-description"><TT>{default_content_type, Type}</TT></DT><DD CLASS="dd-description"> +Specify the content type to use for unknown extensions. +Default value is &#X2018;application/octet-stream&#X2019;. </DD></DL>This example configuration will serve the files from the local directory <CODE>/var/www</CODE> in the address <CODE>http://example.org:5280/pub/archive/</CODE>. +In this example a new content type <TT>ogg</TT> is defined, +<TT>png</TT> is redefined, and <TT>jpg</TT> definition is deleted. To use this module you must enable it: <PRE CLASS="verbatim">{modules, [ ... {mod_http_fileserver, [ {docroot, "/var/www"}, - {directory_indices, ["index.html", "main.htm"]}, - {accesslog, "/var/log/ejabberd/access.log"} + {accesslog, "/var/log/ejabberd/access.log"}, + {directory_indices, ["index.html", "main.htm"]}, + {content_types, [{".ogg", "audio/ogg"}, + {".png", "image/png"}, + {".jpg", undefined} + ]}, + {default_content_type, "text/html"} ] }, ... @@ -2113,13 +2170,13 @@ To use this module you must enable it: ... ]}. </PRE> <A NAME="modirc"></A>  -<H3 CLASS="subsection"><A NAME="htoc45">3.3.8</A>&#XA0;&#XA0;<A HREF="#modirc"><TT>mod_irc</TT></A></H3> <A NAME="modirc"></A> +<H3 CLASS="subsection"><A NAME="htoc46">3.3.8</A>&#XA0;&#XA0;<A HREF="#modirc"><TT>mod_irc</TT></A></H3> <A NAME="modirc"></A> This module is an IRC transport that can be used to join channels on IRC servers.End user information: <UL CLASS="itemize"><LI CLASS="li-itemize"> A Jabber client with &#X2018;groupchat 1.0&#X2019; support or Multi-User -Chat support (<A HREF="http://www.xmpp.org/extensions/xep-0045.html">XEP-0045</A>) is necessary to join IRC channels. +Chat support (<A HREF="http://xmpp.org/extensions/xep-0045.html">XEP-0045</A>) is necessary to join IRC channels. </LI><LI CLASS="li-itemize">An IRC channel can be joined in nearly the same way as joining a Jabber Multi-User Chat room. The difference is that the room name will be &#X2018;channel%<TT>irc.example.org</TT>&#X2019; in case <TT>irc.example.org</TT> is @@ -2129,7 +2186,7 @@ to the IRC transport instead of the Multi-User Chat service. <TT>nickserver!irc.example.org@irc.jabberserver.org</TT>. </LI><LI CLASS="li-itemize">Entering your password is possible by sending &#X2018;LOGIN nick password&#X2019; to <TT>nickserver!irc.example.org@irc.jabberserver.org</TT>. -</LI><LI CLASS="li-itemize">The IRC transport provides Ad-Hoc Commands (<A HREF="http://www.xmpp.org/extensions/xep-0050.html">XEP-0050</A>) +</LI><LI CLASS="li-itemize">The IRC transport provides Ad-Hoc Commands (<A HREF="http://xmpp.org/extensions/xep-0050.html">XEP-0050</A>) to join a channel, and to set custom IRC username and encoding. </LI><LI CLASS="li-itemize">When using a popular Jabber server, it can occur that no connection can be achieved with some IRC servers because they limit the @@ -2137,14 +2194,15 @@ number of conections from one IP. </LI></UL>Options: <DL CLASS="description"><DT CLASS="dt-description"> -<TT>host</TT></DT><DD CLASS="dd-description"> This option defines the Jabber ID of the +<TT>{host, HostName}</TT></DT><DD CLASS="dd-description"> This option defines the Jabber ID of the service. If the <TT>host</TT> option is not specified, the Jabber ID will be the hostname of the virtual host with the prefix &#X2018;<TT>irc.</TT>&#X2019;. The keyword "@HOST@" is replaced at start time with the real virtual host name. -</DD><DT CLASS="dt-description"><TT>access</TT></DT><DD CLASS="dd-description"> This option can be used to specify who +</DD><DT CLASS="dt-description"><TT>{access, AccessName}</TT></DT><DD CLASS="dd-description"> This option can be used to specify who may use the IRC transport (default value: <TT>all</TT>). -</DD><DT CLASS="dt-description"><TT>default_encoding</TT></DT><DD CLASS="dd-description"> Set the default IRC encoding (default value: <TT>"koi8-r"</TT>). +</DD><DT CLASS="dt-description"><TT>{default_encoding, Encoding}</TT></DT><DD CLASS="dd-description"> Set the default IRC encoding. +Default value: <TT>"koi8-r"</TT> </DD></DL>Examples: <UL CLASS="itemize"><LI CLASS="li-itemize"> In the first example, the IRC transport is available on (all) your @@ -2173,17 +2231,17 @@ of <TT>example.org</TT>, and any user of <TT>example.com</TT>: ... ]}. </PRE></LI></UL> <A NAME="modlast"></A>  -<H3 CLASS="subsection"><A NAME="htoc46">3.3.9</A>&#XA0;&#XA0;<A HREF="#modlast"><TT>mod_last</TT></A></H3> <A NAME="modlast"></A> -This module adds support for Last Activity (<A HREF="http://www.xmpp.org/extensions/xep-0012.html">XEP-0012</A>). It can be used to +<H3 CLASS="subsection"><A NAME="htoc47">3.3.9</A>&#XA0;&#XA0;<A HREF="#modlast"><TT>mod_last</TT></A></H3> <A NAME="modlast"></A> +This module adds support for Last Activity (<A HREF="http://xmpp.org/extensions/xep-0012.html">XEP-0012</A>). It can be used to discover when a disconnected user last accessed the server, to know when a connected user was last active on the server, or to query the uptime of the <TT>ejabberd</TT> server.Options: <DL CLASS="description"><DT CLASS="dt-description"> -<TT>iqdisc</TT></DT><DD CLASS="dd-description"> This specifies +<TT>{iqdisc, Discipline}</TT></DT><DD CLASS="dd-description"> This specifies the processing discipline for Last activity (<TT>jabber:iq:last</TT>) IQ queries (see section&#XA0;<A HREF="#modiqdiscoption">3.3.2</A>). </DD></DL> <A NAME="modmuc"></A>  -<H3 CLASS="subsection"><A NAME="htoc47">3.3.10</A>&#XA0;&#XA0;<A HREF="#modmuc"><TT>mod_muc</TT></A></H3> <A NAME="modmuc"></A> -This module provides a Multi-User Chat (<A HREF="http://www.xmpp.org/extensions/xep-0045.html">XEP-0045</A>) service. +<H3 CLASS="subsection"><A NAME="htoc48">3.3.10</A>&#XA0;&#XA0;<A HREF="#modmuc"><TT>mod_muc</TT></A></H3> <A NAME="modmuc"></A> +This module provides a Multi-User Chat (<A HREF="http://xmpp.org/extensions/xep-0045.html">XEP-0045</A>) service. Users can discover existing rooms, join or create them. Occupants of a room can chat in public or have private chats.Some of the features of Multi-User Chat: <UL CLASS="itemize"><LI CLASS="li-itemize"> @@ -2204,20 +2262,20 @@ set of rooms goes down, the rooms disappear and they will be recreated on an available node on first connection attempt.Module options: <DL CLASS="description"><DT CLASS="dt-description"> -<TT>host</TT></DT><DD CLASS="dd-description"> This option defines the Jabber ID of the +<TT>{host, HostName}</TT></DT><DD CLASS="dd-description"> This option defines the Jabber ID of the service. If the <TT>host</TT> option is not specified, the Jabber ID will be the hostname of the virtual host with the prefix &#X2018;<TT>conference.</TT>&#X2019;. The keyword "@HOST@" is replaced at start time with the real virtual host name. -</DD><DT CLASS="dt-description"><TT>access</TT></DT><DD CLASS="dd-description"> You can specify who is allowed to use +</DD><DT CLASS="dt-description"><TT>{access, AccessName}</TT></DT><DD CLASS="dd-description"> You can specify who is allowed to use the Multi-User Chat service. By default everyone is allowed to use it. -</DD><DT CLASS="dt-description"><TT>access_create</TT></DT><DD CLASS="dd-description"> To configure who is +</DD><DT CLASS="dt-description"><TT>{access_create, AccessName}</TT></DT><DD CLASS="dd-description"> To configure who is allowed to create new rooms at the Multi-User Chat service, this option can be used. By default everybody is allowed to create rooms. -</DD><DT CLASS="dt-description"><TT>access_persistent</TT></DT><DD CLASS="dd-description"> To configure who is +</DD><DT CLASS="dt-description"><TT>{access_persistent, AccessName}</TT></DT><DD CLASS="dd-description"> To configure who is allowed to modify the &#X2019;persistent&#X2019; room option. By default everybody is allowed to modify that option. -</DD><DT CLASS="dt-description"><TT>access_admin</TT></DT><DD CLASS="dd-description"> This option specifies +</DD><DT CLASS="dt-description"><TT>{access_admin, AccessName}</TT></DT><DD CLASS="dd-description"> This option specifies who is allowed to administrate the Multi-User Chat service. The default value is <TT>none</TT>, which means that only the room creator can administer his room. @@ -2225,7 +2283,7 @@ The administrators can send a normal message to the service JID, and it will be shown in all active rooms as a service message. The administrators can send a groupchat message to the JID of an active room, and the message will be shown in the room as a service message. -</DD><DT CLASS="dt-description"><TT>history_size</TT></DT><DD CLASS="dd-description"> A small history of +</DD><DT CLASS="dt-description"><TT>{history_size, Size}</TT></DT><DD CLASS="dd-description"> A small history of the current discussion is sent to users when they enter the room. With this option you can define the number of history messages to keep and send to users joining the room. The value is an @@ -2233,35 +2291,35 @@ integer. Setting the value to <TT>0</TT> disables the history feature and, as a result, nothing is kept in memory. The default value is <TT>20</TT>. This value is global and thus affects all rooms on the service. -</DD><DT CLASS="dt-description"><TT>max_users</TT></DT><DD CLASS="dd-description"> This option defines at +</DD><DT CLASS="dt-description"><TT>{max_users, Number}</TT></DT><DD CLASS="dd-description"> This option defines at the service level, the maximum number of users allowed per room. It can be lowered in each room configuration but cannot be increased in individual room configuration. The default value is 200. -</DD><DT CLASS="dt-description"><TT>max_users_admin_threshold</TT></DT><DD CLASS="dd-description"> +</DD><DT CLASS="dt-description"><TT>{max_users_admin_threshold, Number}</TT></DT><DD CLASS="dd-description"> This option defines the number of service admins or room owners allowed to enter the room when the maximum number of allowed occupants was reached. The default limit is 5. -</DD><DT CLASS="dt-description"><TT>max_user_conferences</TT></DT><DD CLASS="dd-description"> +</DD><DT CLASS="dt-description"><TT>{max_user_conferences, Number}</TT></DT><DD CLASS="dd-description"> This option defines the maximum number of rooms that any given user can join. The default value is 10. This option is used to prevent possible abuses. Note that this is a soft limit: some users can sometimes join more conferences in cluster configurations. -</DD><DT CLASS="dt-description"><TT>max_room_id</TT></DT><DD CLASS="dd-description"> +</DD><DT CLASS="dt-description"><TT>{max_room_id, Number}</TT></DT><DD CLASS="dd-description"> This option defines the maximum number of characters that Room ID can have when creating a new room. The default value is to not limit: infinite. -</DD><DT CLASS="dt-description"><TT>max_room_name</TT></DT><DD CLASS="dd-description"> +</DD><DT CLASS="dt-description"><TT>{max_room_name, Number}</TT></DT><DD CLASS="dd-description"> This option defines the maximum number of characters that Room Name can have when configuring the room. The default value is to not limit: infinite. -</DD><DT CLASS="dt-description"><TT>max_room_desc</TT></DT><DD CLASS="dd-description"> +</DD><DT CLASS="dt-description"><TT>{max_room_desc, Number}</TT></DT><DD CLASS="dd-description"> This option defines the maximum number of characters that Room Description can have when configuring the room. The default value is to not limit: infinite. -</DD><DT CLASS="dt-description"><TT>min_message_interval</TT></DT><DD CLASS="dd-description"> +</DD><DT CLASS="dt-description"><TT>{min_message_interval, Number}</TT></DT><DD CLASS="dd-description"> This option defines the minimum interval between two messages send by an occupant in seconds. This option is global and valid for all rooms. A decimal value can be used. When this option is not defined, @@ -2271,7 +2329,7 @@ be broadcasted by the service. A good value for this minimum message interval is 0.4 second. If an occupant tries to send messages faster, an error is send back explaining that the message has been discarded and describing the reason why the message is not acceptable. -</DD><DT CLASS="dt-description"><TT>min_presence_interval</TT></DT><DD CLASS="dd-description"> +</DD><DT CLASS="dt-description"><TT>{min_presence_interval, Number}</TT></DT><DD CLASS="dd-description"> This option defines the minimum of time between presence changes coming from a given occupant in seconds. This option is global and valid for all rooms. A @@ -2283,36 +2341,36 @@ presence is cached by <TT>ejabberd</TT> and only the last presence is broadcasted to all occupants in the room after expiration of the interval delay. Intermediate presence packets are silently discarded. A good value for this option is 4 seconds. -</DD><DT CLASS="dt-description"><TT>default_room_options</TT></DT><DD CLASS="dd-description"> +</DD><DT CLASS="dt-description"><TT>{default_room_options, [ {OptionName, OptionValue}, ...]}</TT></DT><DD CLASS="dd-description"> This module option allows to define the desired default room options. Note that the creator of a room can modify the options of his room at any time using a Jabber client with MUC capability. The available room options and the default values are: <DL CLASS="description"><DT CLASS="dt-description"> -<TT>{allow_change_subj, true}</TT></DT><DD CLASS="dd-description"> Allow occupants to change the subject. -</DD><DT CLASS="dt-description"><TT>{allow_private_messages, true}</TT></DT><DD CLASS="dd-description"> Occupants can send private messages to other occupants. -</DD><DT CLASS="dt-description"><TT>{allow_query_users, true}</TT></DT><DD CLASS="dd-description"> Occupants can send IQ queries to other occupants. -</DD><DT CLASS="dt-description"><TT>{allow_user_invites, false}</TT></DT><DD CLASS="dd-description"> Allow occupants to send invitations. -</DD><DT CLASS="dt-description"><TT>{allow_visitor_nickchange, true}</TT></DT><DD CLASS="dd-description"> Allow visitors to +<TT>{allow_change_subj, true|false}</TT></DT><DD CLASS="dd-description"> Allow occupants to change the subject. +</DD><DT CLASS="dt-description"><TT>{allow_private_messages, true|false}</TT></DT><DD CLASS="dd-description"> Occupants can send private messages to other occupants. +</DD><DT CLASS="dt-description"><TT>{allow_query_users, true|false}</TT></DT><DD CLASS="dd-description"> Occupants can send IQ queries to other occupants. +</DD><DT CLASS="dt-description"><TT>{allow_user_invites, false|true}</TT></DT><DD CLASS="dd-description"> Allow occupants to send invitations. +</DD><DT CLASS="dt-description"><TT>{allow_visitor_nickchange, true|false}</TT></DT><DD CLASS="dd-description"> Allow visitors to change nickname. -</DD><DT CLASS="dt-description"><TT>{allow_visitor_status, true}</TT></DT><DD CLASS="dd-description"> Allow visitors to send +</DD><DT CLASS="dt-description"><TT>{allow_visitor_status, true|false}</TT></DT><DD CLASS="dd-description"> Allow visitors to send status text in presence updates. If disallowed, the <TT>status</TT> text is stripped before broadcasting the presence update to all the room occupants. -</DD><DT CLASS="dt-description"><TT>{anonymous, true}</TT></DT><DD CLASS="dd-description"> The room is anonymous: +</DD><DT CLASS="dt-description"><TT>{anonymous, true|false}</TT></DT><DD CLASS="dd-description"> The room is anonymous: occupants don&#X2019;t see the real JIDs of other occupants. Note that the room moderators can always see the real JIDs of the occupants. -</DD><DT CLASS="dt-description"><TT>{logging, false}</TT></DT><DD CLASS="dd-description"> The public messages are logged using <TT>mod_muc_log</TT>. +</DD><DT CLASS="dt-description"><TT>{logging, false|true}</TT></DT><DD CLASS="dd-description"> The public messages are logged using <TT>mod_muc_log</TT>. </DD><DT CLASS="dt-description"><TT>{max_users, 200}</TT></DT><DD CLASS="dd-description"> Maximum number of occupants in the room. -</DD><DT CLASS="dt-description"><TT>{members_by_default, true}</TT></DT><DD CLASS="dd-description"> The occupants that enter the room are participants by default, so they have &#X2019;voice&#X2019;. -</DD><DT CLASS="dt-description"><TT>{members_only, false}</TT></DT><DD CLASS="dd-description"> Only members of the room can enter. -</DD><DT CLASS="dt-description"><TT>{moderated, true}</TT></DT><DD CLASS="dd-description"> Only occupants with &#X2019;voice&#X2019; can send public messages. -</DD><DT CLASS="dt-description"><TT>{password, ""}</TT></DT><DD CLASS="dd-description"> Password of the room. You may want to enable the next option too. -</DD><DT CLASS="dt-description"><TT>{password_protected, false}</TT></DT><DD CLASS="dd-description"> The password is required to enter the room. -</DD><DT CLASS="dt-description"><TT>{persistent, false}</TT></DT><DD CLASS="dd-description"> The room persists even if the last participant leaves. -</DD><DT CLASS="dt-description"><TT>{public, true}</TT></DT><DD CLASS="dd-description"> The room is public in the list of the MUC service, so it can be discovered. -</DD><DT CLASS="dt-description"><TT>{public_list, true}</TT></DT><DD CLASS="dd-description"> The list of participants is public, without requiring to enter the room. -</DD><DT CLASS="dt-description"><TT>{title, ""}</TT></DT><DD CLASS="dd-description"> A human-readable title of the room. +</DD><DT CLASS="dt-description"><TT>{members_by_default, true|false}</TT></DT><DD CLASS="dd-description"> The occupants that enter the room are participants by default, so they have &#X2019;voice&#X2019;. +</DD><DT CLASS="dt-description"><TT>{members_only, false|true}</TT></DT><DD CLASS="dd-description"> Only members of the room can enter. +</DD><DT CLASS="dt-description"><TT>{moderated, true|false}</TT></DT><DD CLASS="dd-description"> Only occupants with &#X2019;voice&#X2019; can send public messages. +</DD><DT CLASS="dt-description"><TT>{password, "roompass123"}</TT></DT><DD CLASS="dd-description"> Password of the room. You may want to enable the next option too. +</DD><DT CLASS="dt-description"><TT>{password_protected, false|true}</TT></DT><DD CLASS="dd-description"> The password is required to enter the room. +</DD><DT CLASS="dt-description"><TT>{persistent, false|true}</TT></DT><DD CLASS="dd-description"> The room persists even if the last participant leaves. +</DD><DT CLASS="dt-description"><TT>{public, true|false}</TT></DT><DD CLASS="dd-description"> The room is public in the list of the MUC service, so it can be discovered. +</DD><DT CLASS="dt-description"><TT>{public_list, true|false}</TT></DT><DD CLASS="dd-description"> The list of participants is public, without requiring to enter the room. +</DD><DT CLASS="dt-description"><TT>{title, "Room Title"}</TT></DT><DD CLASS="dd-description"> A human-readable title of the room. </DD></DL> All of those room options can be set to <TT>true</TT> or <TT>false</TT>, except <TT>password</TT> and <TT>title</TT> which are strings, @@ -2405,7 +2463,7 @@ the newly created rooms have by default those options. ... ]}. </PRE></LI></UL> <A NAME="modmuclog"></A>  -<H3 CLASS="subsection"><A NAME="htoc48">3.3.11</A>&#XA0;&#XA0;<A HREF="#modmuclog"><TT>mod_muc_log</TT></A></H3> <A NAME="modmuclog"></A> +<H3 CLASS="subsection"><A NAME="htoc49">3.3.11</A>&#XA0;&#XA0;<A HREF="#modmuclog"><TT>mod_muc_log</TT></A></H3> <A NAME="modmuclog"></A> This module enables optional logging of Multi-User Chat (MUC) public conversations to HTML. Once you enable this module, users can join a room using a MUC capable Jabber client, and if they have enough privileges, they can request the @@ -2415,7 +2473,7 @@ Room details are added on top of each page: room title, JID, author, subject and configuration. </LI><LI CLASS="li-itemize"> The room JID in the generated HTML is a link to join the room (using -<A HREF="http://www.xmpp.org/rfcs/rfc5122.html">XMPP URI</A>). +<A HREF="http://xmpp.org/rfcs/rfc5122.html">XMPP URI</A>). </LI><LI CLASS="li-itemize">Subject and room configuration changes are tracked and displayed. </LI><LI CLASS="li-itemize">Joins, leaves, nick changes, kicks, bans and &#X2018;/me&#X2019; are tracked and displayed, including the reason if available. @@ -2428,53 +2486,52 @@ displayed, including the reason if available. </LI><LI CLASS="li-itemize">A custom link can be added on top of each page. </LI></UL>Options: <DL CLASS="description"><DT CLASS="dt-description"> -<TT>access_log</TT></DT><DD CLASS="dd-description"> +<TT>{access_log, AccessName}</TT></DT><DD CLASS="dd-description"> This option restricts which occupants are allowed to enable or disable room logging. The default value is <TT>muc_admin</TT>. Note for this default setting you need to have an access rule for <TT>muc_admin</TT> in order to take effect. -</DD><DT CLASS="dt-description"><TT>cssfile</TT></DT><DD CLASS="dd-description"> +</DD><DT CLASS="dt-description"><TT>{cssfile, false|URL}</TT></DT><DD CLASS="dd-description"> With this option you can set whether the HTML files should have a custom CSS file or if they need to use the embedded CSS file. Allowed values are <TT>false</TT> and an URL to a CSS file. With the first value, HTML files will include the embedded CSS code. With the latter, you can specify the URL of the -custom CSS file (for example: &#X2018;http://example.com/my.css&#X2019;). The default value +custom CSS file (for example: <TT>"http://example.com/my.css"</TT>). The default value is <TT>false</TT>. -</DD><DT CLASS="dt-description"><TT>dirname</TT></DT><DD CLASS="dd-description"> +</DD><DT CLASS="dt-description"><TT>{dirname, room_jid|room_name}</TT></DT><DD CLASS="dd-description"> Allows to configure the name of the room directory. Allowed values are <TT>room_jid</TT> and <TT>room_name</TT>. With the first value, the room directory name will be the full room JID. With the latter, the room directory name will be only the room name, not including the MUC service name. The default value is <TT>room_jid</TT>. -</DD><DT CLASS="dt-description"><TT>dirtype</TT></DT><DD CLASS="dd-description"> +</DD><DT CLASS="dt-description"><TT>{dirtype, subdirs|plain}</TT></DT><DD CLASS="dd-description"> The type of the created directories can be specified with this option. Allowed values are <TT>subdirs</TT> and <TT>plain</TT>. With the first value, subdirectories are created for each year and month. With the latter, the names of the log files contain the full date, and there are no subdirectories. The default value is <TT>subdirs</TT>. -</DD><DT CLASS="dt-description"><TT>file_format</TT></DT><DD CLASS="dd-description"> +</DD><DT CLASS="dt-description"><TT>{file_format, html|plaintext}</TT></DT><DD CLASS="dd-description"> Define the format of the log files: <TT>html</TT> stores in HTML format, <TT>plaintext</TT> stores in plain text. The default value is <TT>html</TT>. -</DD><DT CLASS="dt-description"><TT>outdir</TT></DT><DD CLASS="dd-description"> +</DD><DT CLASS="dt-description"><TT>{outdir, Path}</TT></DT><DD CLASS="dd-description"> This option sets the full path to the directory in which the HTML files should be stored. Make sure the <TT>ejabberd</TT> daemon user has write access on that directory. The default value is <TT>"www/muc"</TT>. -</DD><DT CLASS="dt-description"><TT>spam_prevention</TT></DT><DD CLASS="dd-description"> +</DD><DT CLASS="dt-description"><TT>{spam_prevention true|false}</TT></DT><DD CLASS="dd-description"> To prevent spam, the <TT>spam_prevention</TT> option adds a special attribute to links that prevent their indexation by search engines. The default value is <TT>true</TT>, which mean that nofollow attributes will be added to user submitted links. -</DD><DT CLASS="dt-description"><TT>timezone</TT></DT><DD CLASS="dd-description"> +</DD><DT CLASS="dt-description"><TT>{timezone, local|universal}</TT></DT><DD CLASS="dd-description"> The time zone for the logs is configurable with this option. Allowed values are <TT>local</TT> and <TT>universal</TT>. With the first value, the local time, as reported to Erlang by the operating system, will be used. With the latter, GMT/UTC time will be used. The default value is <TT>local</TT>. -</DD><DT CLASS="dt-description"><TT>top_link</TT></DT><DD CLASS="dd-description"> +</DD><DT CLASS="dt-description"><TT>{top_link, {URL, Text}}</TT></DT><DD CLASS="dd-description"> With this option you can customize the link on the top right corner of each -log file. The syntax of this option is <TT>{"URL", "Text"}</TT>. The default -value is <TT>{"/", "Home"}</TT>. +log file. The default value is <TT>{"/", "Home"}</TT>. </DD></DL>Examples: <UL CLASS="itemize"><LI CLASS="li-itemize"> In the first example any room owner can enable logging, and a @@ -2525,13 +2582,14 @@ top link will be the default <CODE><a href="/">Home</a></CODE>. ... ]}. </PRE></LI></UL> <A NAME="modoffline"></A>  -<H3 CLASS="subsection"><A NAME="htoc49">3.3.12</A>&#XA0;&#XA0;<A HREF="#modoffline"><TT>mod_offline</TT></A></H3> <A NAME="modoffline"></A> -This module implements offline message storage. This means that all messages +<H3 CLASS="subsection"><A NAME="htoc50">3.3.12</A>&#XA0;&#XA0;<A HREF="#modoffline"><TT>mod_offline</TT></A></H3> <A NAME="modoffline"></A> +This module implements offline message storage (<A HREF="http://xmpp.org/extensions/xep-0160.html">XEP-0160</A>). +This means that all messages sent to an offline user will be stored on the server until that user comes online again. Thus it is very similar to how email works. Note that <TT>ejabberdctl</TT> has a command to delete expired messages (see section&#XA0;<A HREF="#ejabberdctl">4.1</A>).<DL CLASS="description"><DT CLASS="dt-description"> -<TT>access_max_user_messages</TT></DT><DD CLASS="dd-description"> +<TT>{access_max_user_messages, Number}</TT></DT><DD CLASS="dd-description"> This option defines which access rule will be enforced to limit the maximum number of offline messages that a user can have (quota). When a user has too many offline messages, any new messages that he receive are discarded, @@ -2555,8 +2613,36 @@ and all the other users up to 100. {mod_offline, [ {access_max_user_messages, max_user_offline_messages} ]}, ... ]}. +</PRE> <A NAME="modping"></A>  +<H3 CLASS="subsection"><A NAME="htoc51">3.3.13</A>&#XA0;&#XA0;<A HREF="#modping"><TT>mod_ping</TT></A></H3> <A NAME="modping"></A> +This module implements support for XMPP Ping (<A HREF="http://xmpp.org/extensions/xep-0199.html">XEP-0199</A>) and periodic keepalives. +When this module is enabled ejabberd responds correctly to +ping requests, as defined in the protocol.Configuration options: +<DL CLASS="description"><DT CLASS="dt-description"> +<TT>{send_pings, true|false}</TT></DT><DD CLASS="dd-description"> +If this option is set to <TT>true</TT>, the server sends pings to connected clients +that are not active in a given interval <TT>ping_interval</TT>. +This is useful to keep client connections alive or checking availability. +By default this option is disabled. +</DD><DT CLASS="dt-description"><TT>{ping_interval, Seconds}</TT></DT><DD CLASS="dd-description"> +How often to send pings to connected clients, if the previous option is enabled. +If a client connection does not send or receive any stanza in this interval, +a ping request is sent to the client. +The default value is 60 seconds. +</DD><DT CLASS="dt-description"><TT>{timeout_action, none|kill}</TT></DT><DD CLASS="dd-description"> +What to do when a client does not answer to a server ping request in less than 32 seconds. +The default is to do nothing. +</DD></DL>This example enables Ping responses, configures the module to send pings +to client connections that are inactive for 4 minutes, +and if a client does not answer to the ping in less than 32 seconds, its connection is closed: +<PRE CLASS="verbatim">{modules, + [ + ... + {mod_ping, [{send_pings, true}, {ping_interval, 240}, {timeout_action, kill}]}, + ... + ]}. </PRE> <A NAME="modprivacy"></A>  -<H3 CLASS="subsection"><A NAME="htoc50">3.3.13</A>&#XA0;&#XA0;<A HREF="#modprivacy"><TT>mod_privacy</TT></A></H3> <A NAME="modprivacy"></A> +<H3 CLASS="subsection"><A NAME="htoc52">3.3.14</A>&#XA0;&#XA0;<A HREF="#modprivacy"><TT>mod_privacy</TT></A></H3> <A NAME="modprivacy"></A> This module implements Blocking Communication (also known as Privacy Rules) as defined in section 10 from XMPP IM. If end users have support for it in their Jabber client, they will be able to: @@ -2578,47 +2664,50 @@ or subscription type (or globally). </LI><LI CLASS="li-itemize">Allowing or blocking all communications based on JID, group, or subscription type (or globally). </LI></UL> -(from <A HREF="http://www.xmpp.org/specs/rfc3921.html#privacy"><TT>http://www.xmpp.org/specs/rfc3921.html#privacy</TT></A>) +(from <A HREF="http://xmpp.org/specs/rfc3921.html#privacy"><TT>http://xmpp.org/specs/rfc3921.html#privacy</TT></A>) </BLOCKQUOTE>Options: <DL CLASS="description"><DT CLASS="dt-description"> -<TT>iqdisc</TT></DT><DD CLASS="dd-description"> This specifies +<TT>{iqdisc, Discipline}</TT></DT><DD CLASS="dd-description"> This specifies the processing discipline for Blocking Communication (<TT>jabber:iq:privacy</TT>) IQ queries (see section&#XA0;<A HREF="#modiqdiscoption">3.3.2</A>). </DD></DL> <A NAME="modprivate"></A>  -<H3 CLASS="subsection"><A NAME="htoc51">3.3.14</A>&#XA0;&#XA0;<A HREF="#modprivate"><TT>mod_private</TT></A></H3> <A NAME="modprivate"></A> -This module adds support for Private XML Storage (<A HREF="http://www.xmpp.org/extensions/xep-0049.html">XEP-0049</A>): +<H3 CLASS="subsection"><A NAME="htoc53">3.3.15</A>&#XA0;&#XA0;<A HREF="#modprivate"><TT>mod_private</TT></A></H3> <A NAME="modprivate"></A> +This module adds support for Private XML Storage (<A HREF="http://xmpp.org/extensions/xep-0049.html">XEP-0049</A>): <BLOCKQUOTE CLASS="quote"> Using this method, Jabber entities can store private data on the server and retrieve it whenever necessary. The data stored might be anything, as long as it is valid XML. One typical usage for this namespace is the server-side storage -of client-specific preferences; another is Bookmark Storage (<A HREF="http://www.xmpp.org/extensions/xep-0048.html">XEP-0048</A>). +of client-specific preferences; another is Bookmark Storage (<A HREF="http://xmpp.org/extensions/xep-0048.html">XEP-0048</A>). </BLOCKQUOTE>Options: <DL CLASS="description"><DT CLASS="dt-description"> -<TT>iqdisc</TT></DT><DD CLASS="dd-description"> This specifies +<TT>{iqdisc, Discipline}</TT></DT><DD CLASS="dd-description"> This specifies the processing discipline for Private XML Storage (<TT>jabber:iq:private</TT>) IQ queries (see section&#XA0;<A HREF="#modiqdiscoption">3.3.2</A>). </DD></DL> <A NAME="modproxy"></A>  -<H3 CLASS="subsection"><A NAME="htoc52">3.3.15</A>&#XA0;&#XA0;<A HREF="#modproxy"><TT>mod_proxy65</TT></A></H3> <A NAME="modproxy"></A> -This module implements SOCKS5 Bytestreams (<A HREF="http://www.xmpp.org/extensions/xep-0065.html">XEP-0065</A>). +<H3 CLASS="subsection"><A NAME="htoc54">3.3.16</A>&#XA0;&#XA0;<A HREF="#modproxy"><TT>mod_proxy65</TT></A></H3> <A NAME="modproxy"></A> +This module implements SOCKS5 Bytestreams (<A HREF="http://xmpp.org/extensions/xep-0065.html">XEP-0065</A>). It allows <TT>ejabberd</TT> to act as a file transfer proxy between two XMPP clients.Options: <DL CLASS="description"><DT CLASS="dt-description"> -<TT>host</TT></DT><DD CLASS="dd-description">This option defines the hostname of the service. -If this option is not set, the prefix &#X2018;<TT>proxy.</TT>&#X2019; is added to <TT>ejabberd</TT> -hostname. -</DD><DT CLASS="dt-description"><TT>name</TT></DT><DD CLASS="dd-description">Defines Service Discovery name of the service. + +<TT>{host, HostName}</TT></DT><DD CLASS="dd-description"> This option defines the Jabber ID of the +service. If the <TT>host</TT> option is not specified, the Jabber ID will be the +hostname of the virtual host with the prefix &#X2018;<TT>proxy.</TT>&#X2019;. The keyword "@HOST@" +is replaced at start time with the real virtual host name. + +</DD><DT CLASS="dt-description"><TT>{name, Text}</TT></DT><DD CLASS="dd-description">Defines Service Discovery name of the service. Default is <TT>"SOCKS5 Bytestreams"</TT>. -</DD><DT CLASS="dt-description"><TT>ip</TT></DT><DD CLASS="dd-description">This option specifies which network interface +</DD><DT CLASS="dt-description"><TT>{ip, IPTuple}</TT></DT><DD CLASS="dd-description">This option specifies which network interface to listen for. Default is an IP address of the service&#X2019;s DNS name, or, if fails, <CODE>{127,0,0,1}</CODE>. -</DD><DT CLASS="dt-description"><TT>port</TT></DT><DD CLASS="dd-description">This option defines port to listen for +</DD><DT CLASS="dt-description"><TT>{port, Number}</TT></DT><DD CLASS="dd-description">This option defines port to listen for incoming connections. Default is&#XA0;7777. -</DD><DT CLASS="dt-description"><TT>auth_type</TT></DT><DD CLASS="dd-description">SOCKS5 authentication type. +</DD><DT CLASS="dt-description"><TT>{auth_type, anonymous|plain}</TT></DT><DD CLASS="dd-description">SOCKS5 authentication type. Possible values are <TT>anonymous</TT> and <TT>plain</TT>. Default is <TT>anonymous</TT>. -</DD><DT CLASS="dt-description"><TT>access</TT></DT><DD CLASS="dd-description">Defines ACL for file transfer initiators. +</DD><DT CLASS="dt-description"><TT>{access, AccessName}</TT></DT><DD CLASS="dd-description">Defines ACL for file transfer initiators. Default is <TT>all</TT>. -</DD><DT CLASS="dt-description"><TT>max_connections</TT></DT><DD CLASS="dd-description">Maximum number of +</DD><DT CLASS="dt-description"><TT>{max_connections, Number}</TT></DT><DD CLASS="dd-description">Maximum number of active connections per file transfer initiator. No limit by default. -</DD><DT CLASS="dt-description"><TT>shaper</TT></DT><DD CLASS="dd-description">This option defines shaper for +</DD><DT CLASS="dt-description"><TT>{shaper, none|ShaperName}</TT></DT><DD CLASS="dd-description">This option defines shaper for the file transfer peers. Shaper with the maximum bandwidth will be selected. Default is <TT>none</TT>. </DD></DL>Examples: @@ -2651,54 +2740,79 @@ The simpliest configuration of the module: ... ]}. </PRE></LI></UL> <A NAME="modpubsub"></A>  -<H3 CLASS="subsection"><A NAME="htoc53">3.3.16</A>&#XA0;&#XA0;<A HREF="#modpubsub"><TT>mod_pubsub</TT></A></H3> <A NAME="modpubsub"></A> -This module offers a Publish-Subscribe Service (<A HREF="http://www.xmpp.org/extensions/xep-0060.html">XEP-0060</A>). +<H3 CLASS="subsection"><A NAME="htoc55">3.3.17</A>&#XA0;&#XA0;<A HREF="#modpubsub"><TT>mod_pubsub</TT></A></H3> <A NAME="modpubsub"></A> +This module offers a Publish-Subscribe Service (<A HREF="http://xmpp.org/extensions/xep-0060.html">XEP-0060</A>). The functionality in <TT>mod_pubsub</TT> can be extended using plugins. -The plugin that implements PEP (Personal Eventing via Pubsub) (<A HREF="http://www.xmpp.org/extensions/xep-0163.html">XEP-0163</A>) +The plugin that implements PEP (Personal Eventing via Pubsub) (<A HREF="http://xmpp.org/extensions/xep-0163.html">XEP-0163</A>) is enabled in the default ejabberd configuration file, and it requires <TT>mod_caps</TT>.Options: <DL CLASS="description"><DT CLASS="dt-description"> -<TT>host</TT></DT><DD CLASS="dd-description"> This option defines the Jabber ID of the +<TT>{host, HostName}</TT></DT><DD CLASS="dd-description"> This option defines the Jabber ID of the service. If the <TT>host</TT> option is not specified, the Jabber ID will be the hostname of the virtual host with the prefix &#X2018;<TT>pubsub.</TT>&#X2019;. The keyword "@HOST@" is replaced at start time with the real virtual host name. -</DD><DT CLASS="dt-description"><TT>access_createnode</TT></DT><DD CLASS="dd-description"> +</DD><DT CLASS="dt-description"><TT>{access_createnode, AccessName}</TT></DT><DD CLASS="dd-description"> This option restricts which users are allowed to create pubsub nodes using -ACL and ACCESS. The default value is <TT>pubsub_createnode</TT>. </DD><DT CLASS="dt-description"><TT>plugins</TT></DT><DD CLASS="dd-description"> -To specify which pubsub node plugins to use. If not defined, the default -pubsub plugin is always used. -</DD><DT CLASS="dt-description"><TT>nodetree</TT></DT><DD CLASS="dd-description"> -To specify which nodetree to use. If not defined, the default pubsub -nodetree is used. Only one nodetree can be used per host, -and is shared by all node plugins. -</DD><DT CLASS="dt-description"><TT>pep_sendlast_offline</TT></DT><DD CLASS="dd-description"> +ACL and ACCESS. The default value is <TT>pubsub_createnode</TT>. </DD><DT CLASS="dt-description"><TT>{plugins, [ Plugin, ...]}</TT></DT><DD CLASS="dd-description"> +To specify which pubsub node plugins to use. +The first one in the list is used by default. +If this option is not defined, the default plugins list is: <TT>["flat"]</TT>. +PubSub clients can define which plugin to use when creating a node: +add <TT>type=&#X2019;plugin-name&#X2019;</TT> attribute to the <TT>create</TT> stanza element. +</DD><DT CLASS="dt-description"><TT>{nodetree, Nodetree}</TT></DT><DD CLASS="dd-description"> +To specify which nodetree to use. +If not defined, the default pubsub nodetree is used: "tree". +Only one nodetree can be used per host, and is shared by all node plugins.The "virtual" nodetree does not store nodes on database. +This saves resources on systems with tons of nodes. +If using the "virtual" nodetree, +you can only enable those node plugins: +["flat","pep"] or ["flat"]; +any other plugins configuration will not work. +Also, all nodes will have the defaut configuration, +and this can not be changed. +Using "virtual" nodetree requires to start from a clean database, +it will not work if you used the default "tree" nodetree before.The "dag" nodetree provides experimental support for PubSub Collection Nodes (<A HREF="http://xmpp.org/extensions/xep-0248.html">XEP-0248</A>). +In that case you should also add "dag" node plugin as default, for example: +<TT>{plugins, ["dag","flat","hometree","pep"]}</TT> +</DD><DT CLASS="dt-description"><TT>{pep_sendlast_offline, false|true}</TT></DT><DD CLASS="dd-description"> To specify whether or not we should get last published PEP items from users in our roster which are offline when we connect. Value is true or false. If not defined, pubsub assumes false so we only get last items of online contacts. -</DD><DT CLASS="dt-description"><TT>last_item_cache</TT></DT><DD CLASS="dd-description"> +</DD><DT CLASS="dt-description"><TT>{last_item_cache, false|true}</TT></DT><DD CLASS="dd-description"> To specify whether or not pubsub should cache last items. Value is true or false. If not defined, pubsub do not cache last items. On systems with not so many nodes, caching last items speeds up pubsub and allows to raise user connection rate. The cost is memory usage, as every item is stored in memory. -</DD><DT CLASS="dt-description"><TT>pep_mapping</TT></DT><DD CLASS="dd-description"> +</DD><DT CLASS="dt-description"><TT>{pep_mapping, [ {Key, Value}, ...]}</TT></DT><DD CLASS="dd-description"> This allow to define a Key-Value list to choose defined node plugins on given PEP namespace. The following example will use node_tune instead of node_pep for every PEP node with tune namespace: <PRE CLASS="verbatim"> {mod_pubsub, [{pep_mapping, [{"http://jabber.org/protocol/tune", "tune"}]}]} -</PRE></DD></DL>Example: +</PRE></DD></DL>Example of configuration that uses flat nodes as default, and allows use of flat, nodetree and pep nodes: <PRE CLASS="verbatim">{modules, [ ... {mod_pubsub, [ {access_createnode, pubsub_createnode}, - {plugins, ["default", "pep"]} - ]} + {plugins, ["flat", "hometree", "pep"]} + ]}, + ... + ]}. +</PRE>Using ODBC database requires use of dedicated plugins. The following example shows previous configuration +with ODBC usage: +<PRE CLASS="verbatim">{modules, + [ + ... + {mod_pubsub_odbc, [ + {access_createnode, pubsub_createnode}, + {plugins, ["flat_odbc", "hometree_odbc", "pep_odbc"]} + ]}, ... ]}. </PRE> <A NAME="modregister"></A>  -<H3 CLASS="subsection"><A NAME="htoc54">3.3.17</A>&#XA0;&#XA0;<A HREF="#modregister"><TT>mod_register</TT></A></H3> <A NAME="modregister"></A> -This module adds support for In-Band Registration (<A HREF="http://www.xmpp.org/extensions/xep-0077.html">XEP-0077</A>). This protocol +<H3 CLASS="subsection"><A NAME="htoc56">3.3.18</A>&#XA0;&#XA0;<A HREF="#modregister"><TT>mod_register</TT></A></H3> <A NAME="modregister"></A> +This module adds support for In-Band Registration (<A HREF="http://xmpp.org/extensions/xep-0077.html">XEP-0077</A>). This protocol enables end users to use a Jabber client to: <UL CLASS="itemize"><LI CLASS="li-itemize"> Register a new account on the server. @@ -2706,17 +2820,17 @@ Register a new account on the server. </LI><LI CLASS="li-itemize">Delete an existing account on the server. </LI></UL>Options: <DL CLASS="description"><DT CLASS="dt-description"> -<TT>access</TT></DT><DD CLASS="dd-description"> This option can be configured to specify +<TT>{access, AccessName}</TT></DT><DD CLASS="dd-description"> This option can be configured to specify rules to restrict registration. If a rule returns &#X2018;deny&#X2019; on the requested user name, registration for that user name is denied. (there are no restrictions by default). -</DD><DT CLASS="dt-description"><TT>welcome_message</TT></DT><DD CLASS="dd-description"> Set a welcome message that +</DD><DT CLASS="dt-description"><TT>{welcome_message, Message}</TT></DT><DD CLASS="dd-description"> Set a welcome message that is sent to each newly registered account. The first string is the subject, and the second string is the message body. In the body you can set a newline with the characters: <CODE>\n</CODE> -</DD><DT CLASS="dt-description"><TT>registration_watchers</TT></DT><DD CLASS="dd-description"> This option defines a +</DD><DT CLASS="dt-description"><TT>{registration_watchers, [ JID, ...]}</TT></DT><DD CLASS="dd-description"> This option defines a list of JIDs which will be notified each time a new account is registered. -</DD><DT CLASS="dt-description"><TT>iqdisc</TT></DT><DD CLASS="dd-description"> This specifies +</DD><DT CLASS="dt-description"><TT>{iqdisc, Discipline}</TT></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>). </DD></DL>This module reads also another option defined globally for the server: <TT>{registration_timeout, Timeout}</TT>. @@ -2770,20 +2884,40 @@ Also define a registration timeout of one hour: ... ]}. </PRE></LI></UL> <A NAME="modroster"></A>  -<H3 CLASS="subsection"><A NAME="htoc55">3.3.18</A>&#XA0;&#XA0;<A HREF="#modroster"><TT>mod_roster</TT></A></H3> <A NAME="modroster"></A> -This module implements roster management as defined in <A HREF="http://www.xmpp.org/specs/rfc3921.html#roster">RFC 3921: XMPP IM</A>.Options: +<H3 CLASS="subsection"><A NAME="htoc57">3.3.19</A>&#XA0;&#XA0;<A HREF="#modroster"><TT>mod_roster</TT></A></H3> <A NAME="modroster"></A> +This module implements roster management as defined in +<A HREF="http://xmpp.org/specs/rfc3921.html#roster">RFC 3921: XMPP IM</A>. +It also supports Roster Versioning (<A HREF="http://xmpp.org/extensions/xep-0237.html">XEP-0237</A>).Options: <DL CLASS="description"><DT CLASS="dt-description"> -<TT>iqdisc</TT></DT><DD CLASS="dd-description"> This specifies +<TT>{iqdisc, Discipline}</TT></DT><DD CLASS="dd-description"> This specifies the processing discipline for Roster Management (<TT>jabber:iq:roster</TT>) IQ queries (see section&#XA0;<A HREF="#modiqdiscoption">3.3.2</A>). -</DD></DL> <A NAME="modservicelog"></A>  -<H3 CLASS="subsection"><A NAME="htoc56">3.3.19</A>&#XA0;&#XA0;<A HREF="#modservicelog"><TT>mod_service_log</TT></A></H3> <A NAME="modservicelog"></A> +</DD><DT CLASS="dt-description"><TT>{versioning, false|true}</TT></DT><DD CLASS="dd-description"> Enables +Roster Versioning. +This option is disabled by default. +</DD><DT CLASS="dt-description"><TT>{store_current_id, false|true}</TT></DT><DD CLASS="dd-description"> +If this option is enabled, the current version number is stored on the database. +If disabled, the version number is calculated on the fly each time. +Enabling this option reduces the load for both ejabberd and the database. +This option does not affect the client in any way. +This option is only useful if Roster Versioning is enabled. +This option is disabled by default. +Important: if you use <TT>mod_shared_roster</TT>, you must disable this option. +</DD></DL>This example configuration enables Roster Versioning with storage of current id: +<PRE CLASS="verbatim">{modules, + [ + ... + {mod_roster, [{versioning, true}, {store_current_id, true}]}, + ... + ]}. +</PRE> <A NAME="modservicelog"></A>  +<H3 CLASS="subsection"><A NAME="htoc58">3.3.20</A>&#XA0;&#XA0;<A HREF="#modservicelog"><TT>mod_service_log</TT></A></H3> <A NAME="modservicelog"></A> This module adds support for logging end user packets via a Jabber message auditing service such as <A HREF="http://www.funkypenguin.info/project/bandersnatch/">Bandersnatch</A>. All user packets are encapsulated in a <CODE><route/></CODE> element and sent to the specified service(s).Options: <DL CLASS="description"><DT CLASS="dt-description"> -<TT>loggers</TT></DT><DD CLASS="dd-description"> With this option a (list of) service(s) +<TT>{loggers, [Names, ...]}</TT></DT><DD CLASS="dd-description"> With this option a (list of) service(s) that will receive the packets can be specified. </DD></DL>Examples: <UL CLASS="itemize"><LI CLASS="li-itemize"> @@ -2806,7 +2940,7 @@ To log all end user packets to the Bandersnatch service running on ... ]}. </PRE></LI></UL> <A NAME="modsharedroster"></A>  -<H3 CLASS="subsection"><A NAME="htoc57">3.3.20</A>&#XA0;&#XA0;<A HREF="#modsharedroster"><TT>mod_shared_roster</TT></A></H3> <A NAME="modsharedroster"></A> +<H3 CLASS="subsection"><A NAME="htoc59">3.3.21</A>&#XA0;&#XA0;<A HREF="#modsharedroster"><TT>mod_shared_roster</TT></A></H3> <A NAME="modsharedroster"></A> This module enables you to create shared roster groups. This means that you can create groups of people that can see members from (other) groups in their rosters. The big advantages of this feature are that end users do not need to @@ -2881,8 +3015,8 @@ roster groups as shown in the following table: </TABLE> <DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE> </LI></UL> <A NAME="modstats"></A>  -<H3 CLASS="subsection"><A NAME="htoc58">3.3.21</A>&#XA0;&#XA0;<A HREF="#modstats"><TT>mod_stats</TT></A></H3> <A NAME="modstats"></A> -This module adds support for Statistics Gathering (<A HREF="http://www.xmpp.org/extensions/xep-0039.html">XEP-0039</A>). This protocol +<H3 CLASS="subsection"><A NAME="htoc60">3.3.22</A>&#XA0;&#XA0;<A HREF="#modstats"><TT>mod_stats</TT></A></H3> <A NAME="modstats"></A> +This module adds support for Statistics Gathering (<A HREF="http://xmpp.org/extensions/xep-0039.html">XEP-0039</A>). This protocol allows you to retrieve next statistics from your <TT>ejabberd</TT> deployment: <UL CLASS="itemize"><LI CLASS="li-itemize"> Total number of registered users on the current virtual host (users/total). @@ -2891,7 +3025,7 @@ Total number of registered users on the current virtual host (users/total). </LI><LI CLASS="li-itemize">Total number of online users on all virtual hosts (users/all-hosts/online). </LI></UL>Options: <DL CLASS="description"><DT CLASS="dt-description"> -<TT>iqdisc</TT></DT><DD CLASS="dd-description"> This specifies +<TT>{iqdisc, Discipline}</TT></DT><DD CLASS="dd-description"> This specifies the processing discipline for Statistics Gathering (<TT>http://jabber.org/protocol/stats</TT>) IQ queries (see section&#XA0;<A HREF="#modiqdiscoption">3.3.2</A>). </DD></DL>As there are only a small amount of clients (for example <A HREF="http://tkabber.jabber.ru/">Tkabber</A>) and software libraries with @@ -2913,40 +3047,40 @@ by sending: </query> </iq> </PRE></LI></UL> <A NAME="modtime"></A>  -<H3 CLASS="subsection"><A NAME="htoc59">3.3.22</A>&#XA0;&#XA0;<A HREF="#modtime"><TT>mod_time</TT></A></H3> <A NAME="modtime"></A> -This module features support for Entity Time (<A HREF="http://www.xmpp.org/extensions/xep-0090.html">XEP-0090</A>). By using this XEP, +<H3 CLASS="subsection"><A NAME="htoc61">3.3.23</A>&#XA0;&#XA0;<A HREF="#modtime"><TT>mod_time</TT></A></H3> <A NAME="modtime"></A> +This module features support for Entity Time (<A HREF="http://xmpp.org/extensions/xep-0202.html">XEP-0202</A>). By using this XEP, you are able to discover the time at another entity&#X2019;s location.Options: <DL CLASS="description"><DT CLASS="dt-description"> -<TT>iqdisc</TT></DT><DD CLASS="dd-description"> This specifies +<TT>{iqdisc, Discipline}</TT></DT><DD CLASS="dd-description"> This specifies the processing discipline for Entity Time (<TT>jabber:iq:time</TT>) IQ queries (see section&#XA0;<A HREF="#modiqdiscoption">3.3.2</A>). </DD></DL> <A NAME="modvcard"></A>  -<H3 CLASS="subsection"><A NAME="htoc60">3.3.23</A>&#XA0;&#XA0;<A HREF="#modvcard"><TT>mod_vcard</TT></A></H3> <A NAME="modvcard"></A> +<H3 CLASS="subsection"><A NAME="htoc62">3.3.24</A>&#XA0;&#XA0;<A HREF="#modvcard"><TT>mod_vcard</TT></A></H3> <A NAME="modvcard"></A> This module allows end users to store and retrieve their vCard, and to retrieve -other users vCards, as defined in vcard-temp (<A HREF="http://www.xmpp.org/extensions/xep-0054.html">XEP-0054</A>). The module also +other users vCards, as defined in vcard-temp (<A HREF="http://xmpp.org/extensions/xep-0054.html">XEP-0054</A>). The module also implements an uncomplicated Jabber User Directory based on the vCards of these users. Moreover, it enables the server to send its vCard when queried.Options: <DL CLASS="description"><DT CLASS="dt-description"> -<TT>host</TT></DT><DD CLASS="dd-description"> This option defines the Jabber ID of the +<TT>{host, HostName}</TT></DT><DD CLASS="dd-description"> This option defines the Jabber ID of the service. If the <TT>host</TT> option is not specified, the Jabber ID will be the hostname of the virtual host with the prefix &#X2018;<TT>vjud.</TT>&#X2019;. The keyword "@HOST@" is replaced at start time with the real virtual host name. -</DD><DT CLASS="dt-description"><TT>iqdisc</TT></DT><DD CLASS="dd-description"> This specifies +</DD><DT CLASS="dt-description"><TT>{iqdisc, Discipline}</TT></DT><DD CLASS="dd-description"> This specifies the processing discipline for <TT>vcard-temp</TT> IQ queries (see section&#XA0;<A HREF="#modiqdiscoption">3.3.2</A>). -</DD><DT CLASS="dt-description"><TT>search</TT></DT><DD CLASS="dd-description">This option specifies whether the search -functionality is enabled (value: <TT>true</TT>) or disabled (value: -<TT>false</TT>). If disabled, the option <TT>host</TT> will be ignored and the +</DD><DT CLASS="dt-description"><TT>{search, true|false}</TT></DT><DD CLASS="dd-description">This option specifies whether the search +functionality is enabled or not +If disabled, the option <TT>host</TT> will be ignored and the Jabber User Directory service will not appear in the Service Discovery item list. The default value is <TT>true</TT>. -</DD><DT CLASS="dt-description"><TT>matches</TT></DT><DD CLASS="dd-description">With this option, the number of reported +</DD><DT CLASS="dt-description"><TT>{matches, infinity|Number}</TT></DT><DD CLASS="dd-description">With this option, the number of reported search results can be limited. If the option&#X2019;s value is set to <TT>infinity</TT>, all search results are reported. The default value is <TT>30</TT>. -</DD><DT CLASS="dt-description"><TT>allow_return_all</TT></DT><DD CLASS="dd-description">This option enables +</DD><DT CLASS="dt-description"><TT>{allow_return_all, false|true}</TT></DT><DD CLASS="dd-description">This option enables you to specify if search operations with empty input fields should return all users who added some information to their vCard. The default value is <TT>false</TT>. -</DD><DT CLASS="dt-description"><TT>search_all_hosts</TT></DT><DD CLASS="dd-description">If this option is set +</DD><DT CLASS="dt-description"><TT>{search_all_hosts, true|false}</TT></DT><DD CLASS="dd-description">If this option is set to <TT>true</TT>, search operations will apply to all virtual hosts. Otherwise only the current host will be searched. The default value is <TT>true</TT>. This option is available in <TT>mod_vcard</TT>, but not available in <TT>mod_vcard_odbc</TT>. @@ -2975,7 +3109,7 @@ and that all virtual hosts will be searched instead of only the current one: ... ]}. </PRE></LI></UL> <A NAME="modvcardldap"></A>  -<H3 CLASS="subsection"><A NAME="htoc61">3.3.24</A>&#XA0;&#XA0;<A HREF="#modvcardldap"><TT>mod_vcard_ldap</TT></A></H3> <A NAME="modvcardldap"></A> +<H3 CLASS="subsection"><A NAME="htoc63">3.3.25</A>&#XA0;&#XA0;<A HREF="#modvcardldap"><TT>mod_vcard_ldap</TT></A></H3> <A NAME="modvcardldap"></A> <TT>ejabberd</TT> can map LDAP attributes to vCard fields. This behaviour is implemented in the <TT>mod_vcard_ldap</TT> module. This module does not depend on the authentication method (see&#XA0;<A HREF="#ldapauth">3.2.5</A>).Note that <TT>ejabberd</TT> treats LDAP as a read-only storage: @@ -2990,32 +3124,35 @@ about these options. If one of these options is not set, <TT>ejabberd</TT> will for the top-level option with the same name.The second group of parameters consists of the following <TT>mod_vcard_ldap</TT>-specific options:<DL CLASS="description"><DT CLASS="dt-description"> -<TT>host</TT></DT><DD CLASS="dd-description"> This option defines the Jabber ID of the +<TT>{host, HostName}</TT></DT><DD CLASS="dd-description"> This option defines the Jabber ID of the service. If the <TT>host</TT> option is not specified, the Jabber ID will be the hostname of the virtual host with the prefix &#X2018;<TT>vjud.</TT>&#X2019;. The keyword "@HOST@" is replaced at start time with the real virtual host name. -</DD><DT CLASS="dt-description"><TT>iqdisc</TT></DT><DD CLASS="dd-description"> This specifies +</DD><DT CLASS="dt-description"><TT>{iqdisc, Discipline}</TT></DT><DD CLASS="dd-description"> This specifies the processing discipline for <TT>vcard-temp</TT> IQ queries (see section&#XA0;<A HREF="#modiqdiscoption">3.3.2</A>). -</DD><DT CLASS="dt-description"><TT>search</TT></DT><DD CLASS="dd-description">This option specifies whether the search +</DD><DT CLASS="dt-description"><TT>{search, true|false}</TT></DT><DD CLASS="dd-description">This option specifies whether the search functionality is enabled (value: <TT>true</TT>) or disabled (value: <TT>false</TT>). If disabled, the option <TT>host</TT> will be ignored and the Jabber User Directory service will not appear in the Service Discovery item list. The default value is <TT>true</TT>. -</DD><DT CLASS="dt-description"><TT>matches</TT></DT><DD CLASS="dd-description">With this option, the number of reported +</DD><DT CLASS="dt-description"><TT>{matches, infinity|Number}</TT></DT><DD CLASS="dd-description">With this option, the number of reported search results can be limited. If the option&#X2019;s value is set to <TT>infinity</TT>, all search results are reported. The default value is <TT>30</TT>. -</DD><DT CLASS="dt-description"><TT>ldap_vcard_map</TT></DT><DD CLASS="dd-description">With this option you can -set the table that maps LDAP attributes to vCard fields. The format is: -<TT>[</TT><TT>Name_of_vCard_field, Pattern, List_of_LDAP_attributes</TT><TT>, ...]</TT>. -<TT>Name_of_vcard_field</TT> is the type name of the vCard as defined in -<A HREF="http://www.ietf.org/rfc/rfc2426.txt">RFC 2426</A>. <TT>Pattern</TT> is a -string which contains pattern variables <TT>"%u"</TT>, <TT>"%d"</TT> or -<TT>"%s"</TT>. <TT>List_of_LDAP_attributes</TT> is the list containing LDAP -attributes. The pattern variables <TT>"%s"</TT> will be sequentially replaced +</DD><DT CLASS="dt-description"><TT>{ldap_vcard_map, [ {Name, Pattern, LDAPattributes}, ...]}</TT></DT><DD CLASS="dd-description"> +With this option you can set the table that maps LDAP attributes to vCard fields. + +<TT>Name</TT> is the type name of the vCard as defined in +<A HREF="http://tools.ietf.org/html/rfc2426">RFC 2426</A>. +<TT>Pattern</TT> is a string which contains pattern variables +<TT>"%u"</TT>, <TT>"%d"</TT> or <TT>"%s"</TT>. +<TT>LDAPattributes</TT> is the list containing LDAP attributes. +The pattern variables +<TT>"%s"</TT> will be sequentially replaced with the values of LDAP attributes from <TT>List_of_LDAP_attributes</TT>, -<TT>"%u"</TT> will be replaced with the user part of a JID, and <TT>"%d"</TT> -will be replaced with the domain part of a JID. The default is: +<TT>"%u"</TT> will be replaced with the user part of a JID, +and <TT>"%d"</TT> will be replaced with the domain part of a JID. +The default is: <PRE CLASS="verbatim">[{"NICKNAME", "%u", []}, {"FN", "%s", ["displayName"]}, {"LAST", "%s", ["sn"]}, @@ -3036,9 +3173,9 @@ will be replaced with the domain part of a JID. The default is: {"BDAY", "%s", ["birthDay"]}, {"ROLE", "%s", ["employeeType"]}, {"PHOTO", "%s", ["jpegPhoto"]}] -</PRE></DD><DT CLASS="dt-description"><TT>ldap_search_fields</TT></DT><DD CLASS="dd-description">This option -defines the search form and the LDAP attributes to search within. The format -is: <TT>[</TT><TT>Name, Attribute</TT><TT>, ...]</TT>. <TT>Name</TT> is the name of a search form +</PRE></DD><DT CLASS="dt-description"><TT>{ldap_search_fields, [ {Name, Attribute}, ...]}</TT></DT><DD CLASS="dd-description">This option +defines the search form and the LDAP attributes to search within. +<TT>Name</TT> is the name of a search form field which will be automatically translated by using the translation files (see <TT>msgs/*.msg</TT> for available words). <TT>Attribute</TT> is the LDAP attribute or the pattern <TT>"%u"</TT>. The default is: @@ -3054,11 +3191,11 @@ LDAP attribute or the pattern <TT>"%u"</TT>. The default is: {"Email", "mail"}, {"Organization Name", "o"}, {"Organization Unit", "ou"}] -</PRE></DD><DT CLASS="dt-description"><TT>ldap_search_reported</TT></DT><DD CLASS="dd-description">This option -defines which search fields should be reported. The format is: -<TT>[</TT><TT>Name, vCard_Name</TT><TT>, ...]</TT>. <TT>Name</TT> is the name of a search form +</PRE></DD><DT CLASS="dt-description"><TT>{ldap_search_reported, [ {SearchField, VcardField}, ...]}</TT></DT><DD CLASS="dd-description">This option +defines which search fields should be reported. +<TT>SearchField</TT> is the name of a search form field which will be automatically translated by using the translation -files (see <TT>msgs/*.msg</TT> for available words). <TT>vCard_Name</TT> is the +files (see <TT>msgs/*.msg</TT> for available words). <TT>VcardField</TT> is the vCard field name defined in the <TT>ldap_vcard_map</TT> option. The default is: <PRE CLASS="verbatim">[{"Full Name", "FN"}, @@ -3151,17 +3288,17 @@ searching his info in LDAP.</LI><LI CLASS="li-itemize"><TT>ldap_vcard_map</T {"Nickname", "NICKNAME"} ]}, </PRE></LI></UL> <A NAME="modversion"></A>  -<H3 CLASS="subsection"><A NAME="htoc62">3.3.25</A>&#XA0;&#XA0;<A HREF="#modversion"><TT>mod_version</TT></A></H3> <A NAME="modversion"></A> -This module implements Software Version (<A HREF="http://www.xmpp.org/extensions/xep-0092.html">XEP-0092</A>). Consequently, it +<H3 CLASS="subsection"><A NAME="htoc64">3.3.26</A>&#XA0;&#XA0;<A HREF="#modversion"><TT>mod_version</TT></A></H3> <A NAME="modversion"></A> +This module implements Software Version (<A HREF="http://xmpp.org/extensions/xep-0092.html">XEP-0092</A>). Consequently, it answers <TT>ejabberd</TT>&#X2019;s version when queried.Options: <DL CLASS="description"><DT CLASS="dt-description"> -<TT>show_os</TT></DT><DD CLASS="dd-description">Should the operating system be revealed or not. +<TT>{show_os, true|false}</TT></DT><DD CLASS="dd-description">Should the operating system be revealed or not. The default value is <TT>true</TT>. -</DD><DT CLASS="dt-description"><TT>iqdisc</TT></DT><DD CLASS="dd-description"> This specifies +</DD><DT CLASS="dt-description"><TT>{iqdisc, Discipline}</TT></DT><DD CLASS="dd-description"> This specifies the processing discipline for Software Version (<TT>jabber:iq:version</TT>) IQ queries (see section&#XA0;<A HREF="#modiqdiscoption">3.3.2</A>). </DD></DL> <A NAME="manage"></A>  -<H1 CLASS="chapter"><A NAME="htoc63">Chapter&#XA0;4</A>&#XA0;&#XA0;<A HREF="#manage">Managing an <TT>ejabberd</TT> Server</A></H1> <A NAME="manage"></A> <A NAME="ejabberdctl"></A>  -<H2 CLASS="section"><A NAME="htoc64">4.1</A>&#XA0;&#XA0;<A HREF="#ejabberdctl"><TT>ejabberdctl</TT></A></H2> <A NAME="ejabberdctl"></A> With the <TT>ejabberdctl</TT> command line administration script +<H1 CLASS="chapter"><A NAME="htoc65">Chapter&#XA0;4</A>&#XA0;&#XA0;<A HREF="#manage">Managing an <TT>ejabberd</TT> Server</A></H1> <A NAME="manage"></A> <A NAME="ejabberdctl"></A>  +<H2 CLASS="section"><A NAME="htoc66">4.1</A>&#XA0;&#XA0;<A HREF="#ejabberdctl"><TT>ejabberdctl</TT></A></H2> <A NAME="ejabberdctl"></A> With the <TT>ejabberdctl</TT> command line administration script you can execute <TT>ejabberdctl commands</TT> (described in the next section, <A HREF="#ectl-commands">4.1.1</A>) and also many general <TT>ejabberd commands</TT> (described in section <A HREF="#eja-commands">4.2</A>). This means you can start, stop and perform many other administrative tasks @@ -3173,7 +3310,7 @@ and other codes may be used for specific results. This can be used by other scripts to determine automatically if a command succeeded or failed, for example using: <TT>echo $?</TT> <A NAME="ectl-commands"></A>  -<H3 CLASS="subsection"><A NAME="htoc65">4.1.1</A>&#XA0;&#XA0;<A HREF="#ectl-commands">ejabberdctl Commands</A></H3> <A NAME="ectl-commands"></A> When <TT>ejabberdctl</TT> is executed without any parameter, +<H3 CLASS="subsection"><A NAME="htoc67">4.1.1</A>&#XA0;&#XA0;<A HREF="#ectl-commands">ejabberdctl Commands</A></H3> <A NAME="ectl-commands"></A> When <TT>ejabberdctl</TT> is executed without any parameter, it displays the available options. If there isn&#X2019;t an <TT>ejabberd</TT> server running, the available parameters are: <DL CLASS="description"><DT CLASS="dt-description"> @@ -3209,7 +3346,7 @@ robot1 testuser1 testuser2 </PRE> <A NAME="erlangconfiguration"></A>  -<H3 CLASS="subsection"><A NAME="htoc66">4.1.2</A>&#XA0;&#XA0;<A HREF="#erlangconfiguration">Erlang Runtime System</A></H3> <A NAME="erlangconfiguration"></A> <TT>ejabberd</TT> is an Erlang/OTP application that runs inside an Erlang runtime system. +<H3 CLASS="subsection"><A NAME="htoc68">4.1.2</A>&#XA0;&#XA0;<A HREF="#erlangconfiguration">Erlang Runtime System</A></H3> <A NAME="erlangconfiguration"></A> <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. The <TT>ejabberdctl</TT> administration script uses many of those possibilities. You can configure some of them with the file <TT>ejabberdctl.cfg</TT>, @@ -3275,10 +3412,14 @@ Starts the Erlang system detached from the system console. Maximum number of Erlang processes. </DD><DT CLASS="dt-description"><TT>-remsh ejabberd@localhost</TT></DT><DD CLASS="dd-description"> Open an Erlang shell in a remote Erlang node. +</DD><DT CLASS="dt-description"><TT>-hidden</TT></DT><DD CLASS="dd-description"> + The connections to other nodes are hidden (not published). + The result is that this node is not considered part of the cluster. + This is important when starting a temporary <TT>ctl</TT> or <TT>debug</TT> node. </DD></DL> Note that some characters need to be escaped when used in shell scripts, for instance <CODE>"</CODE> and <CODE>{}</CODE>. You can find other options in the Erlang manual page (<TT>erl -man erl</TT>). <A NAME="eja-commands"></A>  -<H2 CLASS="section"><A NAME="htoc67">4.2</A>&#XA0;&#XA0;<A HREF="#eja-commands"><TT>ejabberd</TT> Commands</A></H2> <A NAME="eja-commands"></A> An <TT>ejabberd command</TT> is an abstract function identified by a name, +<H2 CLASS="section"><A NAME="htoc69">4.2</A>&#XA0;&#XA0;<A HREF="#eja-commands"><TT>ejabberd</TT> Commands</A></H2> <A NAME="eja-commands"></A> An <TT>ejabberd command</TT> is an abstract function identified by a name, with a defined number and type of calling arguments and type of result that is registered in the <TT>ejabberd_commands</TT> service. Those commands can be defined in any Erlang module and executed using any valid frontend.<TT>ejabberd</TT> includes a frontend to execute <TT>ejabberd commands</TT>: the script <TT>ejabberdctl</TT>. @@ -3286,7 +3427,7 @@ Other known frontends that can be installed to execute ejabberd commands in diff <TT>ejabberd_xmlrpc</TT> (XML-RPC service), <TT>mod_rest</TT> (HTTP POST service), <TT>mod_shcommands</TT> (ejabberd WebAdmin page). <A NAME="list-eja-commands"></A>  -<H3 CLASS="subsection"><A NAME="htoc68">4.2.1</A>&#XA0;&#XA0;<A HREF="#list-eja-commands">List of ejabberd Commands</A></H3> <A NAME="list-eja-commands"></A> <TT>ejabberd</TT> includes a few ejabberd Commands by default. +<H3 CLASS="subsection"><A NAME="htoc70">4.2.1</A>&#XA0;&#XA0;<A HREF="#list-eja-commands">List of ejabberd Commands</A></H3> <A NAME="list-eja-commands"></A> <TT>ejabberd</TT> includes a few ejabberd Commands by default. When more modules are installed, new commands may be available in the frontends.The easiest way to get a list of the available commands, and get help for them is to use the ejabberdctl script: <PRE CLASS="verbatim">$ ejabberdctl help @@ -3301,7 +3442,7 @@ Available commands in this ejabberd node: ... </PRE>The more interesting ones are: <DL CLASS="description"><DT CLASS="dt-description"> -<TT>reopen-log</TT></DT><DD CLASS="dd-description"> Reopen the log files after they were renamed. +<TT>reopen_log</TT></DT><DD CLASS="dd-description"> Reopen the log files after they were renamed. If the old files were not renamed before calling this command, they are automatically renamed to <TT>"*-old.log"</TT>. See section <A HREF="#logfiles">7.1</A>. </DD><DT CLASS="dt-description"><TT>backup ejabberd.backup</TT></DT><DD CLASS="dd-description"> @@ -3309,7 +3450,7 @@ Store internal Mnesia database to a binary backup file. </DD><DT CLASS="dt-description"><TT>restore ejabberd.backup</TT></DT><DD CLASS="dd-description"> Restore immediately from a binary backup file the internal Mnesia database. This will consume quite some memory for big servers. -</DD><DT CLASS="dt-description"><TT>install-fallback ejabberd.backup</TT></DT><DD CLASS="dd-description"> +</DD><DT CLASS="dt-description"><TT>install_fallback ejabberd.backup</TT></DT><DD CLASS="dd-description"> The binary backup file is installed as fallback: it will be used to restore the database at the next ejabberd start. Similar to <TT>restore</TT>, but requires less memory. @@ -3318,23 +3459,33 @@ Dump internal Mnesia database to a text file dump. </DD><DT CLASS="dt-description"><TT>load ejabberd.dump</TT></DT><DD CLASS="dd-description"> Restore immediately from a text file dump. This is not recommended for big databases, as it will consume much time, -memory and processor. In that case it&#X2019;s preferable to use <TT>backup</TT> and <TT>install-fallback</TT>. -</DD><DT CLASS="dt-description"><TT>import-file, import-dir</TT></DT><DD CLASS="dd-description"> -These options can be used to migrate from other Jabber/XMPP servers. There -exist tutorials to <A HREF="http://www.ejabberd.im/migrate-to-ejabberd">migrate from other software to ejabberd</A>. -</DD><DT CLASS="dt-description"><TT>delete-expired-messages</TT></DT><DD CLASS="dd-description"> This option can be used to delete old messages +memory and processor. In that case it&#X2019;s preferable to use <TT>backup</TT> and <TT>install_fallback</TT>. +</DD><DT CLASS="dt-description"><TT>import_piefxis, export_piefxis, export_piefxis_host</TT></DT><DD CLASS="dd-description"> +These options can be used to migrate accounts +using <A HREF="http://xmpp.org/extensions/xep-0227.html">XEP-0227</A> formatted XML files +from/to other Jabber/XMPP servers +or move users of a vhost to another ejabberd installation. +See also +<A HREF="https://support.process-one.net/doc/display/P1/ejabberd+migration+kit">ejabberd migration kit</A>. +</DD><DT CLASS="dt-description"><TT>import_file, import_dir</TT></DT><DD CLASS="dd-description"> +These options can be used to migrate accounts +using jabberd1.4 formatted XML files. +from other Jabber/XMPP servers +There exist tutorials to +<A HREF="http://www.ejabberd.im/migrate-to-ejabberd">migrate from other software to ejabberd</A>. +</DD><DT CLASS="dt-description"><TT>delete_expired_messages</TT></DT><DD CLASS="dd-description"> This option can be used to delete old messages in offline storage. This might be useful when the number of offline messages is very high. </DD></DL> <A NAME="accesscommands"></A>  -<H3 CLASS="subsection"><A NAME="htoc69">4.2.2</A>&#XA0;&#XA0;<A HREF="#accesscommands">Restrict Execution with AccessCommands</A></H3> <A NAME="accesscommands"></A> The frontends can be configured to restrict access to certain commands. +<H3 CLASS="subsection"><A NAME="htoc71">4.2.2</A>&#XA0;&#XA0;<A HREF="#accesscommands">Restrict Execution with AccessCommands</A></H3> <A NAME="accesscommands"></A> The frontends can be configured to restrict access to certain commands. In that case, authentication information must be provided. In each frontend the <TT>AccessCommands</TT> option is defined in a different place. But in all cases the option syntax is the same: -<PRE CLASS="verbatim">AccessCommands = [ {Access, CommandNames, Arguments} ] +<PRE CLASS="verbatim">AccessCommands = [ {Access, CommandNames, Arguments}, ...] Access = atom() CommandNames = all | [CommandName] CommandName = atom() -Arguments = [{ArgumentName, ArgumentValue}] +Arguments = [ {ArgumentName, ArgumentValue}, ...] ArgumentName = atom() ArgumentValue = any() </PRE>The default value is to not define any restriction: <TT>[]</TT>. @@ -3372,7 +3523,7 @@ and the provided arguments do not contradict Arguments.As an example to u {_bot_reg_test, [register, unregister], [{host, "test.org"}]} ] </PRE> <A NAME="webadmin"></A>  -<H2 CLASS="section"><A NAME="htoc70">4.3</A>&#XA0;&#XA0;<A HREF="#webadmin">Web Admin</A></H2> <A NAME="webadmin"></A> +<H2 CLASS="section"><A NAME="htoc72">4.3</A>&#XA0;&#XA0;<A HREF="#webadmin">Web Admin</A></H2> <A NAME="webadmin"></A> The <TT>ejabberd</TT> Web Admin allows to administer most of <TT>ejabberd</TT> using a web browser.This feature is enabled by default: a <TT>ejabberd_http</TT> listener with the option <TT>web_admin</TT> (see section&#XA0;<A HREF="#listened">3.1.3</A>) is included in the listening ports. Then you can open @@ -3444,13 +3595,13 @@ The file is searched by default in The directory of the documentation can be specified in the environment variable <TT>EJABBERD_DOC_PATH</TT>. See section <A HREF="#erlangconfiguration">4.1.2</A>. <A NAME="adhoccommands"></A>  -<H2 CLASS="section"><A NAME="htoc71">4.4</A>&#XA0;&#XA0;<A HREF="#adhoccommands">Ad-hoc Commands</A></H2> <A NAME="adhoccommands"></A> If you enable <TT>mod_configure</TT> and <TT>mod_adhoc</TT>, +<H2 CLASS="section"><A NAME="htoc73">4.4</A>&#XA0;&#XA0;<A HREF="#adhoccommands">Ad-hoc Commands</A></H2> <A NAME="adhoccommands"></A> If you enable <TT>mod_configure</TT> and <TT>mod_adhoc</TT>, you can perform several administrative tasks in <TT>ejabberd</TT> with a Jabber client. -The client must support Ad-Hoc Commands (<A HREF="http://www.xmpp.org/extensions/xep-0050.html">XEP-0050</A>), +The client must support Ad-Hoc Commands (<A HREF="http://xmpp.org/extensions/xep-0050.html">XEP-0050</A>), and you must login in the Jabber server with an account with proper privileges. <A NAME="changeerlangnodename"></A>  -<H2 CLASS="section"><A NAME="htoc72">4.5</A>&#XA0;&#XA0;<A HREF="#changeerlangnodename">Change Computer Hostname</A></H2> <A NAME="changeerlangnodename"></A> <TT>ejabberd</TT> uses the distributed Mnesia database. +<H2 CLASS="section"><A NAME="htoc74">4.5</A>&#XA0;&#XA0;<A HREF="#changeerlangnodename">Change Computer Hostname</A></H2> <A NAME="changeerlangnodename"></A> <TT>ejabberd</TT> uses the distributed Mnesia database. Being distributed, Mnesia enforces consistency of its file, so it stores the name of the Erlang node in it (see section <A HREF="#nodename">5.4</A>). The name of an Erlang node includes the hostname of the computer. @@ -3487,8 +3638,8 @@ mv /var/lib/ejabberd/*.* /var/lib/ejabberd/oldfiles/ </PRE></LI><LI CLASS="li-enumerate">Check that the information of the old database is available: accounts, rosters... After you finish, remember to delete the temporary backup files from public directories. </LI></OL> <A NAME="secure"></A>  -<H1 CLASS="chapter"><A NAME="htoc73">Chapter&#XA0;5</A>&#XA0;&#XA0;<A HREF="#secure">Securing <TT>ejabberd</TT></A></H1> <A NAME="secure"></A> <A NAME="firewall"></A>  -<H2 CLASS="section"><A NAME="htoc74">5.1</A>&#XA0;&#XA0;<A HREF="#firewall">Firewall Settings</A></H2> <A NAME="firewall"></A> +<H1 CLASS="chapter"><A NAME="htoc75">Chapter&#XA0;5</A>&#XA0;&#XA0;<A HREF="#secure">Securing <TT>ejabberd</TT></A></H1> <A NAME="secure"></A> <A NAME="firewall"></A>  +<H2 CLASS="section"><A NAME="htoc76">5.1</A>&#XA0;&#XA0;<A HREF="#firewall">Firewall Settings</A></H2> <A NAME="firewall"></A> You need to take the following TCP ports in mind when configuring your firewall: <BLOCKQUOTE CLASS="table"><DIV CLASS="center"><DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV> <TABLE BORDER=1 CELLSPACING=0 CELLPADDING=1><TR><TD ALIGN=left NOWRAP>Port</TD><TD ALIGN=left NOWRAP>Description</TD></TR> @@ -3499,7 +3650,7 @@ After you finish, remember to delete the temporary backup files from public dire <TR><TD ALIGN=left NOWRAP>port range</TD><TD ALIGN=left NOWRAP>Used for connections between Erlang nodes. This range is configurable (see section <A HREF="#epmd">5.2</A>).</TD></TR> </TABLE> <DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE> <A NAME="epmd"></A>  -<H2 CLASS="section"><A NAME="htoc75">5.2</A>&#XA0;&#XA0;<A HREF="#epmd">epmd</A></H2> <A NAME="epmd"></A> <A HREF="http://www.erlang.org/doc/man/epmd.html">epmd (Erlang Port Mapper Daemon)</A> +<H2 CLASS="section"><A NAME="htoc77">5.2</A>&#XA0;&#XA0;<A HREF="#epmd">epmd</A></H2> <A NAME="epmd"></A> <A HREF="http://www.erlang.org/doc/man/epmd.html">epmd (Erlang Port Mapper Daemon)</A> is a small name server included in Erlang/OTP and used by Erlang programs when establishing distributed Erlang communications. <TT>ejabberd</TT> needs <TT>epmd</TT> to use <TT>ejabberdctl</TT> and also when clustering <TT>ejabberd</TT> nodes. @@ -3524,7 +3675,7 @@ but can be configured in the file <TT>ejabberdctl.cfg</TT>. The Erlang command-line parameter used internally is, for example: <PRE CLASS="verbatim">erl ... -kernel inet_dist_listen_min 4370 inet_dist_listen_max 4375 </PRE> <A NAME="cookie"></A>  -<H2 CLASS="section"><A NAME="htoc76">5.3</A>&#XA0;&#XA0;<A HREF="#cookie">Erlang Cookie</A></H2> <A NAME="cookie"></A> The Erlang cookie is a string with numbers and letters. +<H2 CLASS="section"><A NAME="htoc78">5.3</A>&#XA0;&#XA0;<A HREF="#cookie">Erlang Cookie</A></H2> <A NAME="cookie"></A> The Erlang cookie is a string with numbers and letters. An Erlang node reads the cookie at startup from the command-line parameter <TT>-setcookie</TT>. If not indicated, the cookie is read from the cookie file <TT>$HOME/.erlang.cookie</TT>. If this file does not exist, it is created immediately with a random cookie. @@ -3538,7 +3689,7 @@ to prevent unauthorized access or intrusion to an Erlang node. The communication between Erlang nodes are not encrypted, so the cookie could be read sniffing the traffic on the network. The recommended way to secure the Erlang node is to block the port 4369. <A NAME="nodename"></A>  -<H2 CLASS="section"><A NAME="htoc77">5.4</A>&#XA0;&#XA0;<A HREF="#nodename">Erlang Node Name</A></H2> <A NAME="nodename"></A> An Erlang node may have a node name. +<H2 CLASS="section"><A NAME="htoc79">5.4</A>&#XA0;&#XA0;<A HREF="#nodename">Erlang Node Name</A></H2> <A NAME="nodename"></A> An Erlang node may have a node name. The name can be short (if indicated with the command-line parameter <TT>-sname</TT>) or long (if indicated with the parameter <TT>-name</TT>). Starting an Erlang node with -sname limits the communication between Erlang nodes to the LAN.Using the option <TT>-sname</TT> instead of <TT>-name</TT> is a simple method @@ -3547,7 +3698,7 @@ However, it is not ultimately effective to prevent access to the Erlang node, because it may be possible to fake the fact that you are on another network using a modified version of Erlang <TT>epmd</TT>. The recommended way to secure the Erlang node is to block the port 4369. <A NAME="secure-files"></A>  -<H2 CLASS="section"><A NAME="htoc78">5.5</A>&#XA0;&#XA0;<A HREF="#secure-files">Securing Sensible Files</A></H2> <A NAME="secure-files"></A> <TT>ejabberd</TT> stores sensible data in the file system either in plain text or binary files. +<H2 CLASS="section"><A NAME="htoc80">5.5</A>&#XA0;&#XA0;<A HREF="#secure-files">Securing Sensible Files</A></H2> <A NAME="secure-files"></A> <TT>ejabberd</TT> stores sensible data in the file system either in plain text or binary files. The file system permissions should be set to only allow the proper user to read, write and execute those files and directories.<DL CLASS="description"><DT CLASS="dt-description"> <TT>ejabberd configuration file: /etc/ejabberd/ejabberd.cfg</TT></DT><DD CLASS="dd-description"> @@ -3567,9 +3718,9 @@ so it is preferable to secure the whole <TT>/var/lib/ejabberd/</TT> directory. </DD><DT CLASS="dt-description"><TT>Erlang cookie file: /var/lib/ejabberd/.erlang.cookie</TT></DT><DD CLASS="dd-description"> See section <A HREF="#cookie">5.3</A>. </DD></DL> <A NAME="clustering"></A>  -<H1 CLASS="chapter"><A NAME="htoc79">Chapter&#XA0;6</A>&#XA0;&#XA0;<A HREF="#clustering">Clustering</A></H1> <A NAME="clustering"></A> +<H1 CLASS="chapter"><A NAME="htoc81">Chapter&#XA0;6</A>&#XA0;&#XA0;<A HREF="#clustering">Clustering</A></H1> <A NAME="clustering"></A> <A NAME="howitworks"></A>  -<H2 CLASS="section"><A NAME="htoc80">6.1</A>&#XA0;&#XA0;<A HREF="#howitworks">How it Works</A></H2> <A NAME="howitworks"></A> +<H2 CLASS="section"><A NAME="htoc82">6.1</A>&#XA0;&#XA0;<A HREF="#howitworks">How it Works</A></H2> <A NAME="howitworks"></A> A Jabber domain is served by one or more <TT>ejabberd</TT> nodes. These nodes can be run on different machines that are connected via a network. They all must have the ability to connect to port 4369 of all another nodes, and must @@ -3583,29 +3734,29 @@ router, </LI><LI CLASS="li-itemize">session manager, </LI><LI CLASS="li-itemize">s2s manager. </LI></UL> <A NAME="router"></A>  -<H3 CLASS="subsection"><A NAME="htoc81">6.1.1</A>&#XA0;&#XA0;<A HREF="#router">Router</A></H3> <A NAME="router"></A> +<H3 CLASS="subsection"><A NAME="htoc83">6.1.1</A>&#XA0;&#XA0;<A HREF="#router">Router</A></H3> <A NAME="router"></A> This module is the main router of Jabber packets on each node. It routes them based on their destination&#X2019;s domains. It uses a global routing table. The domain of the packet&#X2019;s destination is searched in the routing table, and if it is found, the packet is routed to the appropriate process. If not, it is sent to the s2s manager. <A NAME="localrouter"></A>  -<H3 CLASS="subsection"><A NAME="htoc82">6.1.2</A>&#XA0;&#XA0;<A HREF="#localrouter">Local Router</A></H3> <A NAME="localrouter"></A> +<H3 CLASS="subsection"><A NAME="htoc84">6.1.2</A>&#XA0;&#XA0;<A HREF="#localrouter">Local Router</A></H3> <A NAME="localrouter"></A> This module routes packets which have a destination domain equal to one of this server&#X2019;s host names. If the destination JID has a non-empty user part, it is routed to the session manager, otherwise it is processed depending on its content. <A NAME="sessionmanager"></A>  -<H3 CLASS="subsection"><A NAME="htoc83">6.1.3</A>&#XA0;&#XA0;<A HREF="#sessionmanager">Session Manager</A></H3> <A NAME="sessionmanager"></A> +<H3 CLASS="subsection"><A NAME="htoc85">6.1.3</A>&#XA0;&#XA0;<A HREF="#sessionmanager">Session Manager</A></H3> <A NAME="sessionmanager"></A> This module routes packets to local users. It looks up to which user resource a packet must be sent via a presence table. Then the packet is either routed to the appropriate c2s process, or stored in offline storage, or bounced back. <A NAME="s2smanager"></A>  -<H3 CLASS="subsection"><A NAME="htoc84">6.1.4</A>&#XA0;&#XA0;<A HREF="#s2smanager">s2s Manager</A></H3> <A NAME="s2smanager"></A> +<H3 CLASS="subsection"><A NAME="htoc86">6.1.4</A>&#XA0;&#XA0;<A HREF="#s2smanager">s2s Manager</A></H3> <A NAME="s2smanager"></A> This module routes packets to other Jabber servers. First, it checks if an opened s2s connection from the domain of the packet&#X2019;s source to the domain of the packet&#X2019;s destination exists. If that is the case, the s2s manager routes the packet to the process serving this connection, otherwise a new connection is opened. <A NAME="cluster"></A>  -<H2 CLASS="section"><A NAME="htoc85">6.2</A>&#XA0;&#XA0;<A HREF="#cluster">Clustering Setup</A></H2> <A NAME="cluster"></A> +<H2 CLASS="section"><A NAME="htoc87">6.2</A>&#XA0;&#XA0;<A HREF="#cluster">Clustering Setup</A></H2> <A NAME="cluster"></A> Suppose you already configured <TT>ejabberd</TT> on one machine named (<TT>first</TT>), and you need to setup another one to make an <TT>ejabberd</TT> cluster. Then do following steps:<OL CLASS="enumerate" type=1><LI CLASS="li-enumerate"> @@ -3643,30 +3794,29 @@ and &#X2018;<CODE>access</CODE>&#X2019; options because they will be taken from enabled only on one machine in the cluster. </LI></OL>You can repeat these steps for other machines supposed to serve this domain. <A NAME="servicelb"></A>  -<H2 CLASS="section"><A NAME="htoc86">6.3</A>&#XA0;&#XA0;<A HREF="#servicelb">Service Load-Balancing</A></H2> <A NAME="servicelb"></A> +<H2 CLASS="section"><A NAME="htoc88">6.3</A>&#XA0;&#XA0;<A HREF="#servicelb">Service Load-Balancing</A></H2> <A NAME="servicelb"></A> <A NAME="componentlb"></A>  -<H3 CLASS="subsection"><A NAME="htoc87">6.3.1</A>&#XA0;&#XA0;<A HREF="#componentlb">Components Load-Balancing</A></H3> <A NAME="componentlb"></A> <A NAME="domainlb"></A>  -<H3 CLASS="subsection"><A NAME="htoc88">6.3.2</A>&#XA0;&#XA0;<A HREF="#domainlb">Domain Load-Balancing Algorithm</A></H3> <A NAME="domainlb"></A> -<TT>ejabberd</TT> includes an algorithm to load balance the components that are plugged on an <TT>ejabberd</TT> cluster. It means that you can plug one or several instances of the same component on each <TT>ejabberd</TT> cluster and that the traffic will be automatically distributed.The default distribution algorithm try to deliver to a local instance of a component. If several local instances are available, one instance is chosen randomly. If no instance is available locally, one instance is chosen randomly among the remote component instances.If you need a different behaviour, you can change the load balancing behaviour with the option <TT>domain_balancing</TT>. The syntax of the option is the following:<PRE CLASS="verbatim">{domain_balancing, "component.example.com", <balancing_criterium>}. -</PRE>Several balancing criteria are available: +<H3 CLASS="subsection"><A NAME="htoc89">6.3.1</A>&#XA0;&#XA0;<A HREF="#componentlb">Components Load-Balancing</A></H3> <A NAME="componentlb"></A> <A NAME="domainlb"></A>  +<H3 CLASS="subsection"><A NAME="htoc90">6.3.2</A>&#XA0;&#XA0;<A HREF="#domainlb">Domain Load-Balancing Algorithm</A></H3> <A NAME="domainlb"></A> +<TT>ejabberd</TT> includes an algorithm to load balance the components that are plugged on an <TT>ejabberd</TT> cluster. It means that you can plug one or several instances of the same component on each <TT>ejabberd</TT> cluster and that the traffic will be automatically distributed.The default distribution algorithm try to deliver to a local instance of a component. If several local instances are available, one instance is chosen randomly. If no instance is available locally, one instance is chosen randomly among the remote component instances.If you need a different behaviour, you can change the load balancing behaviour with the option <TT>domain_balancing</TT>. The syntax of the option is the following: +<DL CLASS="description"><DT CLASS="dt-description"><TT>{domain_balancing, "component.example.com", BalancingCriteria}.</TT></DT></DL>Several balancing criteria are available: <UL CLASS="itemize"><LI CLASS="li-itemize"> <TT>destination</TT>: the full JID of the packet <TT>to</TT> attribute is used. </LI><LI CLASS="li-itemize"><TT>source</TT>: the full JID of the packet <TT>from</TT> attribute is used. </LI><LI CLASS="li-itemize"><TT>bare_destination</TT>: the bare JID (without resource) of the packet <TT>to</TT> attribute is used. </LI><LI CLASS="li-itemize"><TT>bare_source</TT>: the bare JID (without resource) of the packet <TT>from</TT> attribute is used. </LI></UL>If the value corresponding to the criteria is the same, the same component instance in the cluster will be used. <A NAME="lbbuckets"></A>  -<H3 CLASS="subsection"><A NAME="htoc89">6.3.3</A>&#XA0;&#XA0;<A HREF="#lbbuckets">Load-Balancing Buckets</A></H3> <A NAME="lbbuckets"></A> -When there is a risk of failure for a given component, domain balancing can cause service trouble. If one component is failing the service will not work correctly unless the sessions are rebalanced.In this case, it is best to limit the problem to the sessions handled by the failing component. This is what the <TT>domain_balancing_component_number</TT> option does, making the load balancing algorithm not dynamic, but sticky on a fix number of component instances.The syntax is the following: -<PRE CLASS="verbatim">{domain_balancing_component_number, "component.example.com", N} -</PRE> <A NAME="debugging"></A>  -<H1 CLASS="chapter"><A NAME="htoc90">Chapter&#XA0;7</A>&#XA0;&#XA0;<A HREF="#debugging">Debugging</A></H1> <A NAME="debugging"></A> +<H3 CLASS="subsection"><A NAME="htoc91">6.3.3</A>&#XA0;&#XA0;<A HREF="#lbbuckets">Load-Balancing Buckets</A></H3> <A NAME="lbbuckets"></A> +When there is a risk of failure for a given component, domain balancing can cause service trouble. If one component is failing the service will not work correctly unless the sessions are rebalanced.In this case, it is best to limit the problem to the sessions handled by the failing component. This is what the <TT>domain_balancing_component_number</TT> option does, making the load balancing algorithm not dynamic, but sticky on a fix number of component instances.The syntax is: +<DL CLASS="description"><DT CLASS="dt-description"><TT>{domain_balancing_component_number, "component.example.com", Number}.</TT></DT></DL> <A NAME="debugging"></A>  +<H1 CLASS="chapter"><A NAME="htoc92">Chapter&#XA0;7</A>&#XA0;&#XA0;<A HREF="#debugging">Debugging</A></H1> <A NAME="debugging"></A> <A NAME="logfiles"></A>  -<H2 CLASS="section"><A NAME="htoc91">7.1</A>&#XA0;&#XA0;<A HREF="#logfiles">Log Files</A></H2> <A NAME="logfiles"></A> An <TT>ejabberd</TT> node writes two log files: +<H2 CLASS="section"><A NAME="htoc93">7.1</A>&#XA0;&#XA0;<A HREF="#logfiles">Log Files</A></H2> <A NAME="logfiles"></A> An <TT>ejabberd</TT> node writes two log files: <DL CLASS="description"><DT CLASS="dt-description"> <TT>ejabberd.log</TT></DT><DD CLASS="dd-description"> is the ejabberd service log, with the messages reported by <TT>ejabberd</TT> code </DD><DT CLASS="dt-description"><TT>sasl.log</TT></DT><DD CLASS="dd-description"> is the Erlang/OTP system log, with the messages reported by Erlang/OTP using SASL (System Architecture Support Libraries) -</DD></DL>The option <TT>loglevel</TT> modifies the verbosity of the file ejabberd.log. -The possible levels are: +</DD></DL>The option <TT>loglevel</TT> modifies the verbosity of the file ejabberd.log. The syntax is: +<DL CLASS="description"><DT CLASS="dt-description"><TT>{loglevel, Level}.</TT></DT></DL>The possible <TT>Level</TT> are: <DL CLASS="description"><DT CLASS="dt-description"> <TT>0</TT></DT><DD CLASS="dd-description"> No ejabberd log at all (not recommended) </DD><DT CLASS="dt-description"><TT>1</TT></DT><DD CLASS="dd-description"> Critical @@ -3683,30 +3833,32 @@ The ejabberdctl command <TT>reopen-log</TT> (please refer to section <A HREF="#ectl-commands">4.1.1</A>) reopens the log files, and also renames the old ones if you didn&#X2019;t rename them. <A NAME="debugconsole"></A>  -<H2 CLASS="section"><A NAME="htoc92">7.2</A>&#XA0;&#XA0;<A HREF="#debugconsole">Debug Console</A></H2> <A NAME="debugconsole"></A> The Debug Console is an Erlang shell attached to an already running <TT>ejabberd</TT> server. +<H2 CLASS="section"><A NAME="htoc94">7.2</A>&#XA0;&#XA0;<A HREF="#debugconsole">Debug Console</A></H2> <A NAME="debugconsole"></A> The Debug Console is an Erlang shell attached to an already running <TT>ejabberd</TT> server. With this Erlang shell, an experienced administrator can perform complex tasks.This shell gives complete control over the <TT>ejabberd</TT> server, so it is important to use it with extremely care. There are some simple and safe examples in the article <A HREF="http://www.ejabberd.im/interconnect-erl-nodes">Interconnecting Erlang Nodes</A>To exit the shell, close the window or press the keys: control+c control+c. <A NAME="watchdog"></A>  -<H2 CLASS="section"><A NAME="htoc93">7.3</A>&#XA0;&#XA0;<A HREF="#watchdog">Watchdog Alerts</A></H2> <A NAME="watchdog"></A> +<H2 CLASS="section"><A NAME="htoc95">7.3</A>&#XA0;&#XA0;<A HREF="#watchdog">Watchdog Alerts</A></H2> <A NAME="watchdog"></A> <TT>ejabberd</TT> includes a watchdog mechanism that may be useful to developers when troubleshooting a problem related to memory usage. If a process in the <TT>ejabberd</TT> server consumes more memory than the configured threshold, a message is sent to the Jabber accounts defined with the option <TT>watchdog_admins</TT> - in the <TT>ejabberd</TT> configuration file.The memory consumed is measured in <TT>words</TT>: + in the <TT>ejabberd</TT> configuration file.The syntax is: +<DL CLASS="description"><DT CLASS="dt-description"><TT>{watchdog_admins, [JID, ...]}.</TT></DT></DL>The memory consumed is measured in <TT>words</TT>: a word on 32-bit architecture is 4 bytes, and a word on 64-bit architecture is 8 bytes. The threshold by default is 1000000 words. This value can be configured with the option <TT>watchdog_large_heap</TT>, -or in a conversation with the watchdog alert bot.Example configuration: +or in a conversation with the watchdog alert bot.The syntax is: +<DL CLASS="description"><DT CLASS="dt-description"><TT>{watchdog_large_heap, Number}.</TT></DT></DL>Example configuration: <PRE CLASS="verbatim">{watchdog_admins, ["admin2@localhost", "admin2@example.org"]}. {watchdog_large_heap, 30000000}. </PRE>To remove watchdog admins, remove them in the option. To remove all watchdog admins, set the option with an empty list: <PRE CLASS="verbatim">{watchdog_admins, []}. </PRE> <A NAME="i18ni10n"></A>  -<H1 CLASS="chapter"><A NAME="htoc94">Appendix&#XA0;A</A>&#XA0;&#XA0;<A HREF="#i18ni10n">Internationalization and Localization</A></H1> <A NAME="i18ni10n"></A> +<H1 CLASS="chapter"><A NAME="htoc96">Appendix&#XA0;A</A>&#XA0;&#XA0;<A HREF="#i18ni10n">Internationalization and Localization</A></H1> <A NAME="i18ni10n"></A> The source code of <TT>ejabberd</TT> supports localization. The translators can edit the <A HREF="http://www.gnu.org/software/gettext/">gettext</A> .po files @@ -3741,9 +3893,9 @@ HTTP header &#X2018;Accept-Language: ru&#X2019;</TD></TR> </TABLE></DIV> <A NAME="fig:webadmmainru"></A> <DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE> <A NAME="releasenotes"></A>  -<H1 CLASS="chapter"><A NAME="htoc95">Appendix&#XA0;B</A>&#XA0;&#XA0;<A HREF="#releasenotes">Release Notes</A></H1> <A NAME="releasenotes"></A> +<H1 CLASS="chapter"><A NAME="htoc97">Appendix&#XA0;B</A>&#XA0;&#XA0;<A HREF="#releasenotes">Release Notes</A></H1> <A NAME="releasenotes"></A> Release notes are available from <A HREF="http://www.process-one.net/en/ejabberd/release_notes/">ejabberd Home Page</A> <A NAME="acknowledgements"></A>  -<H1 CLASS="chapter"><A NAME="htoc96">Appendix&#XA0;C</A>&#XA0;&#XA0;<A HREF="#acknowledgements">Acknowledgements</A></H1> <A NAME="acknowledgements"></A> Thanks to all people who contributed to this guide: +<H1 CLASS="chapter"><A NAME="htoc98">Appendix&#XA0;C</A>&#XA0;&#XA0;<A HREF="#acknowledgements">Acknowledgements</A></H1> <A NAME="acknowledgements"></A> Thanks to all people who contributed to this guide: <UL CLASS="itemize"><LI CLASS="li-itemize"> Alexey Shchepin (<A HREF="xmpp:aleksey@jabber.ru"><TT>xmpp:aleksey@jabber.ru</TT></A>) </LI><LI CLASS="li-itemize">Badlop (<A HREF="xmpp:badlop@jabberes.org"><TT>xmpp:badlop@jabberes.org</TT></A>) @@ -3755,7 +3907,7 @@ Alexey Shchepin (<A HREF="xmpp:aleksey@jabber.ru"><TT>xmpp:aleksey@jabber.ru</TT </LI><LI CLASS="li-itemize">Sergei Golovan (<A HREF="xmpp:sgolovan@nes.ru"><TT>xmpp:sgolovan@nes.ru</TT></A>) </LI><LI CLASS="li-itemize">Vsevolod Pelipas (<A HREF="xmpp:vsevoload@jabber.ru"><TT>xmpp:vsevoload@jabber.ru</TT></A>) </LI></UL> <A NAME="copyright"></A>  -<H1 CLASS="chapter"><A NAME="htoc97">Appendix&#XA0;D</A>&#XA0;&#XA0;<A HREF="#copyright">Copyright Information</A></H1> <A NAME="copyright"></A> Ejabberd Installation and Operation Guide. +<H1 CLASS="chapter"><A NAME="htoc99">Appendix&#XA0;D</A>&#XA0;&#XA0;<A HREF="#copyright">Copyright Information</A></H1> <A NAME="copyright"></A> Ejabberd Installation and Operation Guide. Copyright &#XA9; 2003 &#X2014; 2009 ProcessOneThis document is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 doc/guide.html @@ -59,6 +59,7 @@ \newcommand{\shell}[1]{\texttt{#1}} \newcommand{\ejabberd}{\texttt{ejabberd}} \newcommand{\Jabber}{Jabber} +\newcommand{\esyntax}[1]{\begin{description}\titem{#1}\end{description}} %% Modules \newcommand{\module}[1]{\texttt{#1}} @@ -77,12 +78,14 @@ \newcommand{\modmuclog}{\module{mod\_muc\_log}} \newcommand{\modoffline}{\module{mod\_offline}} \newcommand{\modofflineodbc}{\module{mod\_offline\_odbc}} +\newcommand{\modping}{\module{mod\_ping}} \newcommand{\modprivacy}{\module{mod\_privacy}} \newcommand{\modprivacyodbc}{\module{mod\_privacy\_odbc}} \newcommand{\modprivate}{\module{mod\_private}} \newcommand{\modprivateodbc}{\module{mod\_private\_odbc}} \newcommand{\modproxy}{\module{mod\_proxy65}} \newcommand{\modpubsub}{\module{mod\_pubsub}} +\newcommand{\modpubsubodbc}{\module{mod\_pubsub\_odbc}} \newcommand{\modregister}{\module{mod\_register}} \newcommand{\modroster}{\module{mod\_roster}} \newcommand{\modrosterodbc}{\module{mod\_roster\_odbc}} @@ -105,10 +108,10 @@ %\ifthenelse{\boolean{modhttpbind}}{\input{mod_http_bind.tex}}{} %% Common options -\newcommand{\iqdiscitem}[1]{\titem{iqdisc} \ind{options!iqdisc}This specifies +\newcommand{\iqdiscitem}[1]{\titem{\{iqdisc, Discipline\}} \ind{options!iqdisc}This specifies the processing discipline for #1 IQ queries (see section~\ref{modiqdiscoption}).} \newcommand{\hostitem}[1]{ - \titem{host} \ind{options!host} This option defines the Jabber ID of the + \titem{\{host, HostName\}} \ind{options!host} This option defines the Jabber ID of the service. If the \texttt{host} option is not specified, the Jabber ID will be the hostname of the virtual host with the prefix `\jid{#1.}'. The keyword "@HOST@" is replaced at start time with the real virtual host name. @@ -169,7 +172,7 @@ ejabberd Development Team \gdef\ahrefurl#1{\href{#1}{\texttt{#1}}} \gdef\footahref#1#2{#2\footnote{\href{#1}{\texttt{#1}}}} \end{latexonly} -\newcommand{\txepref}[2]{\footahref{http://www.xmpp.org/extensions/xep-#1.html}{#2}} +\newcommand{\txepref}[2]{\footahref{http://xmpp.org/extensions/xep-#1.html}{#2}} \newcommand{\xepref}[1]{\txepref{#1}{XEP-#1}} \begin{document} @@ -309,6 +312,7 @@ To compile \ejabberd{} on a `Unix-like' operating system, you need: \item PAM library. Optional. For Pluggable Authentication Modules (PAM). See section \ref{pam}. \item GNU Iconv 1.8 or higher, for the IRC Transport (mod\_irc). Optional. Not needed on systems with GNU Libc. See section \ref{modirc}. \item ImageMagick's Convert program. Optional. For CAPTCHA challenges. See section \ref{captcha}. +\item exmpp 0.9.1 or higher. Optional. For import/export user data with \xepref{0227} XML files. \end{itemize} \makesubsection{download}{Download Source Code} @@ -606,7 +610,7 @@ host name(s) stored in the database will be used. You can override the old values stored in the database by adding next lines to -the configuration file: +the beginning of the configuration file: \begin{verbatim} override_global. override_local. @@ -622,20 +626,18 @@ and ACLs will be removed before new ones are added. The option \option{hosts} defines a list containing one or more domains that \ejabberd{} will serve. +The syntax is: +\esyntax{\{hosts, [HostName, ...]\}.} + Examples: \begin{itemize} \item Serving one domain: \begin{verbatim} {hosts, ["example.org"]}. \end{verbatim} -\item Serving one domain, and backwards compatible with older \ejabberd{} - versions: +\item Serving three domains: \begin{verbatim} -{host, "example.org"}. -\end{verbatim} -\item Serving two domains: -\begin{verbatim} -{hosts, ["example.net", "example.com"]}. +{hosts, ["example.net", "example.com", "jabber.somesite.org"]}. \end{verbatim} \end{itemize} @@ -643,11 +645,10 @@ Examples: \ind{virtual hosting}\ind{virtual hosts}\ind{virtual domains} Options can be defined separately for every virtual host using the -\term{host\_config} option.\ind{options!host\_config} It has the following -syntax: -\begin{verbatim} -{host_config, <hostname>, [<option>, <option>, ...]}. -\end{verbatim} +\term{host\_config} option. + +The syntax is: \ind{options!host\_config} +\esyntax{\{host\_config, HostName, [Option, ...]\}} Examples: \begin{itemize} @@ -683,14 +684,10 @@ Examples: To define specific ejabberd modules in a virtual host, you can define the global \term{modules} option with the common modules, and later add specific modules to certain virtual hosts. -To accomplish that, instead of defining each option in \term{host\_config} with the syntax -\begin{verbatim} -{<option-name>, <option-value>} -\end{verbatim} +To accomplish that, instead of defining each option in \term{host\_config} with the general syntax +\esyntax{\{OptionName, OptionValue\}} use this syntax: -\begin{verbatim} -{{add, <option-name>}, <option-value>} -\end{verbatim} +\esyntax{\{\{add, OptionName\}, OptionValue\}} In this example three virtual hosts have some similar modules, but there are also other different modules for some specific virtual hosts: @@ -732,32 +729,26 @@ other different modules for some specific virtual hosts: \makesubsection{listened}{Listening Ports} \ind{options!listen} -The option \option{listen} defines for which addresses and ports \ejabberd{} +The option \option{listen} defines for which ports, addresses and network protocols \ejabberd{} will listen and what services will be run on them. Each element of the list is a tuple with the following elements: \begin{itemize} -\item Port number. Optionally also the IP address. +\item Port number. Optionally also the IP address and/or a transport protocol. \item Listening module that serves this port. \item Options for the TCP socket and for the listening module. \end{itemize} -With the basic syntax the ports will listen on all IPv4 network addresses: -\begin{verbatim} -{listen, [ - {<port-number>, <module>, [<options>]}, - {<port-number>, <module>, [<options>]}, - ... - {<port-number>, <module>, [<options>]} - ]}. -\end{verbatim} +The option syntax is: +\esyntax{\{listen, [Listener, ...]\}.} -It is possible to specify the IP address for a port using the full syntax: -\begin{verbatim} - {{<port-number>, <ip-address>}, <module>, [<options>]} -\end{verbatim} +To define a listener there are several syntax. +\esyntax{\{PortNumber, Module, [Option, ...]\}} +\esyntax{\{\{PortNumber, IPaddress\}, Module, [Option, ...]\}} +\esyntax{\{\{PortNumber, TransportProtocol\}, Module, [Option, ...]\}} +\esyntax{\{\{PortNumber, IPaddress, TransportProtocol\}, Module, [Option, ...]\}} -\makesubsubsection{listened-port}{Port Number and IP Address} +\makesubsubsection{listened-port}{Port Number, IP Address and Transport Protocol} The port number defines which port to listen for incoming connections. It can be a Jabber/XMPP standard port @@ -769,6 +760,7 @@ The socket will listen only in that network interface. It is possible to specify a generic address, so \ejabberd{} will listen in all addresses. Depending in the type of the IP address, IPv4 or IPv6 will be used. +When not specified the IP address, it will listen on all IPv4 network addresses. Some example values for IP address: \begin{itemize} @@ -781,6 +773,9 @@ Some example values for IP address: \item \verb|{16#fdca, 16#8ab6, 16#a243, 16#75ef, 0, 0, 0, 1}| is the IPv6 address \verb|FDCA:8AB6:A243:75EF::1/128| \end{itemize} +The transport protocol can be \term{tcp} or \term{udp}. +Default is \term{tcp}. + \makesubsubsection{listened-module}{Listening Module} @@ -801,6 +796,10 @@ The available modules, their purpose and the options allowed by each one are: (as defined in the Jabber Component Protocol (\xepref{0114}).\\ Options: \texttt{access}, \texttt{hosts}, \texttt{shaper}, \texttt{service\_check\_from} + \titem{\texttt{ejabberd\_stun}} + Handles STUN Binding requests as defined in + \footahref{http://tools.ietf.org/html/rfc5389}{RFC 5389}.\\ + Options: \texttt{certfile} \titem{\texttt{ejabberd\_http}} Handles incoming HTTP connections.\\ Options: \texttt{captcha}, \texttt{certfile}, \texttt{http\_bind}, \texttt{http\_poll}, @@ -812,19 +811,19 @@ The available modules, their purpose and the options allowed by each one are: This is a detailed description of each option allowed by the listening modules: \begin{description} - \titem{\{access, <access rule>\}} \ind{options!access}This option defines + \titem{\{access, AccessName\}} \ind{options!access}This option defines access to the port. The default value is \term{all}. \titem{\{certfile, Path\}} Full path to a file containing the default SSL certificate. To define a certificate file specific for a given domain, use the global option \term{domain\_certfile}. - \titem{service\_check\_from} \ind{options!service\_check\_from} + \titem{\{service\_check\_from, true|false\}} \ind{options!service\_check\_from} This option can be used with \term{ejabberd\_service} only. It is used to disable control on the from field on packets send by an external components. The option can be either \term{true} or \term{false}. The default value is \term{true} which conforms to \xepref{0114}. - \titem{\{hosts, [Hostnames], [HostOptions]\}} \ind{options!hosts} + \titem{\{hosts, [Hostname, ...], [HostOption, ...]\}} \ind{options!hosts} The external Jabber component that connects to this \term{ejabberd\_service} can serve one or more hostnames. - In \term{HostOptions} you can define options for the component; + As \term{HostOption} you can define options for the component; currently the only allowed option is the password required to the component when attempt to connect to ejabberd: \poption{\{password, Secret\}}. Note that you cannot define in a single \term{ejabberd\_service} components of @@ -873,7 +872,7 @@ This is a detailed description of each option allowed by the listening modules: connections and 131072 for s2s connections. s2s max stanza size must always much higher than c2s limit. Change this value with extreme care as it can cause unwanted disconnect if set too low. - \titem{\{request\_handlers, [\{Path, Module\}]\}} To define one or several handlers that will serve HTTP requests. + \titem{\{request\_handlers, [ \{Path, Module\}, ...]\}} To define one or several handlers that will serve HTTP requests. The Path is a list of strings; so the URIs that start with that Path will be served by Module. For example, if you want \term{mod\_foo} to serve the URIs that start with \term{/a/b/}, and you also want \term{mod\_http\_bind} to serve the URIs \term{/http-bind/}, @@ -883,7 +882,7 @@ This is a detailed description of each option allowed by the listening modules: Note that \xepref{0114} requires that the domain must match the hostname of the component. Only enable this option if you are completely sure you need to enable it. Default value: false. - \titem{\{shaper, <access rule>\}} \ind{options!shaper}This option defines a + \titem{\{shaper, none|ShaperName\}} \ind{options!shaper}This option defines a shaper for the port (see section~\ref{shapers}). The default value is \term{none}. \titem{starttls} \ind{options!starttls}\ind{STARTTLS}This option @@ -901,7 +900,7 @@ This is a detailed description of each option allowed by the listening modules: commonly on port 5223 for client-to-server communications. But this method is nowadays deprecated and not recommended. The preferable encryption method is STARTTLS on port 5222, as defined - \footahref{http://www.xmpp.org/specs/rfc3920.html\#tls}{RFC 3920: XMPP Core}, + \footahref{http://xmpp.org/specs/rfc3920.html\#tls}{RFC 3920: XMPP Core}, which can be enabled in \ejabberd{} with the option \term{starttls}. If this option is set, you should also set the \option{certfile} option. \titem{web\_admin} \ind{options!web\_admin}\ind{web admin}This option @@ -930,6 +929,10 @@ There are some additional global options that can be specified in the ejabberd c Specify which address families to try, in what order, and connect timeout in milliseconds. By default it first tries connecting with IPv4, if that fails it tries using IPv6, with a timeout of 10000 milliseconds. + \titem{\{s2s\_dns\_options, [ \{Property, Value\}, ...]\}} + \ind{options!s2s\_dns\_options}Define properties to use for DNS resolving. + Allowed Properties are: \term{timeout} in seconds which default value is \term{10} + and \term{retries} which default value is \term{2}. \titem{\{s2s\_default\_policy, allow|deny\}} The default policy for incoming and outgoing s2s connections to other Jabber servers. The default value is \term{allow}. @@ -952,6 +955,7 @@ However, the c2s and s2s connections to the domain \term{example.com} use the fi and also allows plain connections for old clients. \item Port 5223 listens for c2s connections with the old SSL. \item Port 5269 listens for s2s connections with STARTTLS. The socket is set for IPv6 instead of IPv4. +\item Port 3478 listens for STUN requests over UDP. \item Port 5280 listens for HTTP requests, and serves the HTTP Poll service. \item Port 5281 listens for HTTP requests, and serves the Web Admin using HTTPS as explained in section~\ref{webadmin}. The socket only listens connections to the IP address 127.0.0.1. @@ -976,6 +980,7 @@ However, the c2s and s2s connections to the domain \term{example.com} use the fi {shaper, s2s_shaper}, {max_stanza_size, 131072} ]}, + {{3478, udp}, ejabberd_stun, []}, {5280, ejabberd_http, [ http_poll ]}, @@ -1119,11 +1124,9 @@ you have to make the transports log and do \ind{XDB}XDB by themselves: \makesubsection{auth}{Authentication} \ind{authentication}\ind{options!auth\_method} -The option \option{auth\_method} defines the authentication method that is used -for user authentication: -\begin{verbatim} -{auth_method, [<method>]}. -\end{verbatim} +The option \option{auth\_method} defines the authentication methods that are used +for user authentication. The syntax is: +\esyntax{\{auth\_method, [Method, ...]\}.} The following authentication methods are supported by \ejabberd{}: \begin{itemize} @@ -1143,11 +1146,7 @@ Account creation is only supported by internal and odbc methods. \ind{internal authentication}\ind{Mnesia} \ejabberd{} uses its internal Mnesia database as the default authentication method. - -\begin{itemize} -\item \term{auth\_method}: The value \term{internal} will enable the internal - authentication method. -\end{itemize} +The value \term{internal} will enable the internal authentication method. Examples: \begin{itemize} @@ -1166,6 +1165,8 @@ Examples: \makesubsubsection{saslanonymous}{SASL Anonymous and Anonymous Login} \ind{sasl anonymous}\ind{anonymous login} +The value \term{anonymous} will enable the internal authentication method. + %TODO: introduction; tell what people can do with this The anonymous authentication method can be configured with the following options. Remember that you can use the \term{host\_config} option to set virtual @@ -1173,21 +1174,19 @@ host specific options (see section~\ref{virtualhost}). Note that there also is a detailed tutorial regarding \footahref{http://support.process-one.net/doc/display/MESSENGER/Anonymous+users+support}{SASL Anonymous and anonymous login configuration}. -\begin{itemize} -\item \term{auth\_method}: The value \term{anonymous} will enable the anonymous - authentication method. -\item \term{allow\_multiple\_connections}: This value for this option can be - either \term{true} or \term{false} and is only used when the anonymous mode is +\begin{description} +\titem{\{allow\_multiple\_connections, false|true\}} This option is only used + when the anonymous mode is enabled. Setting it to \term{true} means that the same username can be taken multiple times in anonymous login mode if different resource are used to connect. This option is only useful in very special occasions. The default value is \term{false}. -\item \term{anonymous\_protocol}: This option can take three values: - \term{sasl\_anon}, \term{login\_anon} or \term{both}. \term{sasl\_anon} means +\titem{\{anonymous\_protocol, sasl\_anon | login\_anon | both\}} + \term{sasl\_anon} means that the SASL Anonymous method will be used. \term{login\_anon} means that the anonymous login method will be used. \term{both} means that SASL Anonymous and login anonymous are both enabled. -\end{itemize} +\end{description} Those options are defined for each virtual host with the \term{host\_config} parameter (see section~\ref{virtualhost}). @@ -1240,7 +1239,7 @@ PAM authentication is disabled by default, so you have to configure and compile Options: \begin{description} -\titem{pam\_service}\ind{options!pam\_service}This option defines the PAM service name. +\titem{\{pam\_service, Name\}}\ind{options!pam\_service}This option defines the PAM service name. Default is \term{"ejabberd"}. Refer to the PAM documentation of your operation system for more information. \end{description} @@ -1297,75 +1296,74 @@ then \term{/etc/nssswitch.conf} must be configured to use \term{winbind} as well Access control in \ejabberd{} is performed via Access Control Lists (ACLs). The declarations of ACLs in the configuration file have the following syntax: -\begin{verbatim} -{acl, <aclname>, {<acltype>, ...}}. -\end{verbatim} -\term{<acltype>} can be one of the following: +\esyntax{\{acl, ACLName, ACLValue\}.} + +\term{ACLValue} can be one of the following: \begin{description} \titem{all} Matches all JIDs. Example: \begin{verbatim} {acl, all, all}. \end{verbatim} -\titem{\{user, <username>\}} Matches the user with the name - \term{<username>} at the first virtual host. Example: +\titem{\{user, Username\}} Matches the user with the name + \term{Username} at the first virtual host. Example: \begin{verbatim} {acl, admin, {user, "yozhik"}}. \end{verbatim} -\titem{\{user, <username>, <server>\}} Matches the user with the JID - \term{<username>@<server>} and any resource. Example: +\titem{\{user, Username, Server\}} Matches the user with the JID + \term{Username@Server} and any resource. Example: \begin{verbatim} {acl, admin, {user, "yozhik", "example.org"}}. \end{verbatim} -\titem{\{server, <server>\}} Matches any JID from server - \term{<server>}. Example: +\titem{\{server, Server\}} Matches any JID from server + \term{Server}. Example: \begin{verbatim} {acl, exampleorg, {server, "example.org"}}. \end{verbatim} -\titem{\{resource, <resource>\}} Matches any JID with a resource - \term{<resource>}. Example: +\titem{\{resource, Resource\}} Matches any JID with a resource + \term{Resource}. Example: \begin{verbatim} {acl, mucklres, {resource, "muckl"}}. \end{verbatim} -\titem{\{shared\_group, <groupname>\}} Matches any member of a Shared Roster Group with name \term{<groupname>} in the virtual host. Example: +\titem{\{shared\_group, Groupname\}} Matches any member of a Shared Roster Group with name \term{Groupname} in the virtual host. Example: \begin{verbatim} {acl, techgroupmembers, {shared_group, "techteam"}}. \end{verbatim} -\titem{\{shared\_group, <groupname>, <server>\}} Matches any member of a Shared Roster Group with name \term{<groupname>} in the virtual host \term{<server>}. Example: +\titem{\{shared\_group, Groupname, Server\}} Matches any member of a Shared Roster Group with name \term{Groupname} in the virtual host \term{Server}. Example: \begin{verbatim} {acl, techgroupmembers, {shared_group, "techteam", "example.org"}}. \end{verbatim} -\titem{\{user\_regexp, <regexp>\}} Matches any local user with a name that - matches \term{<regexp>} on local virtual hosts. Example: +\titem{\{user\_regexp, Regexp\}} Matches any local user with a name that + matches \term{Regexp} on local virtual hosts. Example: \begin{verbatim} {acl, tests, {user_regexp, "^test[0-9]*$"}}. \end{verbatim} %$ -\titem{\{user\_regexp, <regexp>, <server>\}} Matches any user with a name - that matches \term{<regexp>} at server \term{<server>}. Example: +\titem{\{user\_regexp, UserRegexp, Server\}} Matches any user with a name + that matches \term{Regexp} at server \term{Server}. Example: \begin{verbatim} -{acl, tests, {user_regexp, "^test", "example.org"}}. +{acl, tests, {user_Userregexp, "^test", "example.org"}}. \end{verbatim} -\titem{\{server\_regexp, <regexp>\}} Matches any JID from the server that - matches \term{<regexp>}. Example: +\titem{\{server\_regexp, Regexp\}} Matches any JID from the server that + matches \term{Regexp}. Example: \begin{verbatim} {acl, icq, {server_regexp, "^icq\\."}}. \end{verbatim} -\titem{\{resource\_regexp, <regexp>\}} Matches any JID with a resource that - matches \term{<regexp>}. Example: +\titem{\{resource\_regexp, Regexp\}} Matches any JID with a resource that + matches \term{Regexp}. Example: \begin{verbatim} {acl, icq, {resource_regexp, "^laptop\\."}}. \end{verbatim} -\titem{\{node\_regexp, <user\_regexp>, <server\_regexp>\}} Matches any user - with a name that matches \term{<user\_regexp>} at any server that matches - \term{<server\_regexp>}. Example: +\titem{\{node\_regexp, UserRegexp, ServerRegexp\}} Matches any user + with a name that matches \term{UserRegexp} at any server that matches + \term{ServerRegexp}. Example: \begin{verbatim} {acl, yohzik, {node_regexp, "^yohzik$", "^example.(com|org)$"}}. \end{verbatim} -\titem{\{user\_glob, <glob>\}} -\titem{\{user\_glob, <glob>, <server>\}} -\titem{\{server\_glob, <glob>\}} -\titem{\{resource\_glob, <glob>\}} -\titem{\{node\_glob, <user\_glob>, <server\_glob>\}} This is the same as +\titem{\{user\_glob, Glob\}} +\titem{\{user\_glob, Glob, Server\}} +\titem{\{server\_glob, Glob\}} +\titem{\{resource\_glob, Glob\}} +\titem{\{node\_glob, UserGlob, ServerGlob\}} This is the same as above. However, it uses shell glob patterns instead of regexp. These patterns can have the following special characters: \begin{description} @@ -1378,7 +1376,7 @@ declarations of ACLs in the configuration file have the following syntax: \end{description} \end{description} -The following ACLs are pre-defined: +The following \term{ACLName} are pre-defined: \begin{description} \titem{all} Matches any JID. \titem{none} Matches no JID. @@ -1387,15 +1385,11 @@ The following ACLs are pre-defined: \makesubsubsection{AccessRights}{Access Rights} \ind{access}\ind{ACL}\ind{options!acl}\ind{ACL}\ind{Access Control List} -An entry allowing or denying access to different services looks similar to -this: -\begin{verbatim} -{access, <accessname>, [{allow, <aclname>}, - {deny, <aclname>}, - ... - ]}. -\end{verbatim} -When a JID is checked to have access to \term{<accessname>}, the server +An entry allowing or denying access to different services. +The syntax is: +\esyntax{\{access, AccessName, [ \{allow|deny, ACLName\}, ...]\}.} + +When a JID is checked to have access to \term{Accessname}, the server sequentially checks if that JID matches any of the ACLs that are named in the second elements of the tuples in the list. If it matches, the first element of the first matched tuple is returned, otherwise the value `\term{deny}' is @@ -1408,7 +1402,7 @@ Example: {allow, all}]}. \end{verbatim} -The following access rules are pre-defined: +The following \term{AccessName} are pre-defined: \begin{description} \titem{all} Always returns the value `\term{allow}'. \titem{none} Always returns the value `\term{deny}'. @@ -1426,19 +1420,12 @@ can be either a number, or \term{infinity}. The default value is \term{infinity}. The syntax is: -\begin{verbatim} -{access, max_user_sessions, [{<maxnumber>, <aclname>}, - ... - ]}. -\end{verbatim} +\esyntax{\{access, max\_user\_sessions, [ \{MaxNumber, ACLName\}, ...]\}.} -Examples: -\begin{itemize} -\item To limit the number of sessions per user to 10 for all users: +This example limits the number of sessions per user to 5 for all users, and to 10 for admins: \begin{verbatim} -{access, max_user_sessions, [{10, all}]}. +{access, max_user_sessions, [{10, admin}, {5, all}]}. \end{verbatim} -\end{itemize} \makesubsubsection{configmaxs2sconns}{Several connections to a remote Jabber server with ACL} \ind{options!max\_s2s\_connections} @@ -1449,11 +1436,7 @@ The default value is \term{1}. There's also available the access \term{max\_s2s\_connections\_per\_node}. The syntax is: -\begin{verbatim} -{access, max_s2s_connections, [{<maxnumber>, <aclname>}, - ... - ]}. -\end{verbatim} +\esyntax{\{access, max\_s2s\_connections, [ \{MaxNumber, ACLName\}, ...]\}.} Examples: \begin{itemize} @@ -1466,17 +1449,13 @@ Examples: \makesubsection{shapers}{Shapers} \ind{options!shaper}\ind{options!maxrate}\ind{shapers}\ind{maxrate}\ind{traffic speed} -Shapers enable you to limit connection traffic. The syntax of -shapers is like this: -\begin{verbatim} -{shaper, <shapername>, <kind>}. -\end{verbatim} +Shapers enable you to limit connection traffic. +The syntax is: +\esyntax{\{shaper, ShaperName, Kind\}.} Currently only one kind of shaper called \term{maxrate} is available. It has the following syntax: -\begin{verbatim} -{maxrate, <rate>} -\end{verbatim} -where \term{<rate>} stands for the maximum allowed incoming rate in bytes per +\esyntax{\{maxrate, Rate\}} +where \term{Rate} stands for the maximum allowed incoming rate in bytes per second. When a connection exceeds this limit, \ejabberd{} stops reading from the socket until the average rate is again below the allowed maximum. @@ -1500,9 +1479,14 @@ Examples: The option \option{language} defines the default language of server strings that can be seen by \Jabber{} clients. If a \Jabber{} client does not support -\option{xml:lang}, the specified language is used. The default value is -\term{en}. In order to take effect there must be a translation file -\term{<language>.msg} in \ejabberd{}'s \term{msgs} directory. +\option{xml:lang}, the specified language is used. + +The option syntax is: +\esyntax{\{language, Language\}.} + +The default value is \term{en}. +In order to take effect there must be a translation file +\term{Language.msg} in \ejabberd{}'s \term{msgs} directory. For example, to set Russian as default language: \begin{verbatim} @@ -1556,21 +1540,56 @@ Example configuration: ]}. \end{verbatim} +\makesubsection{stun}{STUN} +\ind{options!stun}\ind{stun} -\makesubsection{includeconfigfile}{Include Additional Configuration Files} -\ind{options!includeconfigfile}\ind{includeconfigfile} +\ejabberd{} is able to act as a stand-alone STUN server +(\footahref{http://tools.ietf.org/html/rfc5389}{RFC 5389}). Currently only Binding usage +is supported. In that role \ejabberd{} helps clients with Jingle ICE (\xepref{0176}) support to discover their external addresses and ports. -The option \option{include\_config\_file} in a configuration file instructs \ejabberd{} to include other configuration files immediately. +You should configure \term{ejabberd\_stun} listening module as described in \ref{listened} section. +If \option{certfile} option is defined, \ejabberd{} multiplexes TCP and +TLS over TCP connections on the same port. Obviously, \option{certfile} option +is defined for \term{tcp} only. Note however that TCP or TLS over TCP +support is not required for Binding usage and is reserved for +\footahref{http://tools.ietf.org/html/draft-ietf-behave-turn-16}{TURN} +functionality. Feel free to configure \term{udp} transport only. -The basic usage is: +Example configuration: \begin{verbatim} -{include_config_file, <filename>}. +{listen, + [ + ... + {{3478, udp}, ejabberd_stun, []}, + {3478, ejabberd_stun, []}, + {5349, ejabberd_stun, [{certfile, "/etc/ejabberd/server.pem"}]}, + ... + ] +}. \end{verbatim} -It is also possible to specify suboptions: + +You also need to configure DNS SRV records properly so clients can easily discover a +STUN server serving your XMPP domain. Refer to section +\footahref{http://tools.ietf.org/html/rfc5389\#section-9}{DNS Discovery of a Server} +of \footahref{http://tools.ietf.org/html/rfc5389}{RFC 5389} for details. + +Example DNS SRV configuration: \begin{verbatim} -{include_config_file, <filename>, [<suboption>, <suboption>, ...]}. +_stun._udp IN SRV 0 0 3478 stun.example.com. +_stun._tcp IN SRV 0 0 3478 stun.example.com. +_stuns._tcp IN SRV 0 0 5349 stun.example.com. \end{verbatim} +\makesubsection{includeconfigfile}{Include Additional Configuration Files} +\ind{options!includeconfigfile}\ind{includeconfigfile} + +The option \option{include\_config\_file} in a configuration file instructs \ejabberd{} to include other configuration files immediately. + +The basic syntax is: +\esyntax{\{include\_config\_file, Filename\}.} +It is possible to specify suboptions using the full syntax: +\esyntax{\{include\_config\_file, Filename, [Suboption, ...]\}.} + The filename can be indicated either as an absolute path, or relative to the main \ejabberd{} configuration file. It isn't possible to use wildcards. @@ -1578,10 +1597,10 @@ The file must exist and be readable. The allowed suboptions are: \begin{description} - \titem{\{disallow, [<option>, <option>, ...]\}} Disallows the usage of those options in the included configuration file. + \titem{\{disallow, [Optionname, ...]\}} Disallows the usage of those options in the included configuration file. The options that match this criteria are not accepted. The default value is an empty list: \term{[]} - \titem{\{allow\_only, [<option>, <option>, ...]\}} Allows only the usage of those options in the included configuration file. + \titem{\{allow\_only, [Optionname, ...]\}} Allows only the usage of those options in the included configuration file. The options that do not match this criteria are not accepted. The default value is: \term{all} \end{description} @@ -1620,9 +1639,7 @@ it is possible to define a macro for a value and later use this macro when defining an option. A macro is defined with this syntax: -\begin{verbatim} -{define_macro, '<MACRO>', <value>}. -\end{verbatim} +\esyntax{\{define\_macro, 'MACRO', Value\}.} The \term{MACRO} must be surrounded by single quotation marks, and all letters in uppercase; check the examples bellow. The \term{value} can be any valid arbitrary Erlang term. @@ -1641,20 +1658,20 @@ of another macro. There are two ways to use a macro: \begin{description} - \titem{'<MACRO>'} + \titem{'MACRO'} You can put this instead of a value in an \ejabberd{} option, and will be replaced with the \term{value} previously defined. If the macro is not defined previously, the program will crash and report an error. - \titem{\{use\_macro, '<MACRO>', <defaultvalue>\}} + \titem{\{use\_macro, 'MACRO', Defaultvalue\}} Use a macro even if it may not be defined. If the macro is not defined previously, the provided \term{defaultvalue} is used. This usage behaves as if it were defined and used this way: \begin{verbatim} -{define_macro, '<MACRO>', <defaultvalue>}. -'<MACRO>' +{define_macro, 'MACRO', Defaultvalue}. +'MACRO' \end{verbatim} \end{description} @@ -1783,27 +1800,19 @@ interface available, PostgreSQL or MySQL. To use the native MySQL interface, you can pass a tuple of the following form as parameter: -\begin{verbatim} -{mysql, "Server", "Database", "Username", "Password"} -\end{verbatim} +\esyntax{\{mysql, "Server", "Database", "Username", "Password"\}} \term{mysql} is a keyword that should be kept as is. For example: -\begin{verbatim} -{odbc_server, {mysql, "localhost", "test", "root", "password"}}. -\end{verbatim} +\esyntax{\{odbc\_server, \{mysql, "localhost", "test", "root", "password"\}\}.} Optionally, it is possible to define the MySQL port to use. This option is only useful, in very rare cases, when you are not running MySQL with the default port setting. The \term{mysql} parameter can thus take the following form: -\begin{verbatim} -{mysql, "Server", Port, "Database", "Username", "Password"} -\end{verbatim} +\esyntax{\{mysql, "Server", Port, "Database", "Username", "Password"\}} The \term{Port} value should be an integer, without quotes. For example: -\begin{verbatim} -{odbc_server, {mysql, "localhost", Port, "test", "root", "password"}}. -\end{verbatim} +\esyntax{\{odbc\_server, \{mysql, "localhost", Port, "test", "root", "password"\}\}.} By default \ejabberd{} opens 10 connections to the database for each virtual host. Use this option to modify the value: @@ -1961,27 +1970,20 @@ interface available, PostgreSQL or MySQL. To use the native PostgreSQL interface, you can pass a tuple of the following form as parameter: -\begin{verbatim} -{pgsql, "Server", "Database", "Username", "Password"} -\end{verbatim} +\esyntax{\{pgsql, "Server", "Database", "Username", "Password"\}} \term{pgsql} is a keyword that should be kept as is. For example: -\begin{verbatim} -{odbc_server, {pgsql, "localhost", "database", "ejabberd", "password"}}. -\end{verbatim} +\esyntax{\{odbc\_server, \{pgsql, "localhost", "database", "ejabberd", "password"\}\}.} Optionally, it is possible to define the PostgreSQL port to use. This option is only useful, in very rare cases, when you are not running PostgreSQL with the default port setting. The \term{pgsql} parameter can thus take the following form: -\begin{verbatim} -{pgsql, "Server", Port, "Database", "Username", "Password"} -\end{verbatim} +\esyntax{\{pgsql, "Server", Port, "Database", "Username", "Password"\}} The \term{Port} value should be an integer, without quotes. For example: -\begin{verbatim} -{odbc_server, {pgsql, "localhost", 5432, "database", "ejabberd", "password"}}. -\end{verbatim} +\esyntax{\{odbc\_server, \{pgsql, "localhost", 5432, "database", "ejabberd", "password"\}\}.} + By default \ejabberd{} opens 10 connections to the database for each virtual host. Use this option to modify the value: \begin{verbatim} @@ -2114,20 +2116,20 @@ create accounts, change password or edit vCard that is stored in LDAP. Parameters: \begin{description} -\titem{ldap\_servers} \ind{options!ldap\_server}List of IP addresses or DNS names of your +\titem{\{ldap\_servers, [Servers, ...]\}} \ind{options!ldap\_server}List of IP addresses or DNS names of your LDAP servers. This option is required. -\titem{ldap\_encrypt} \ind{options!ldap\_encrypt}Type of connection encryption to the LDAP server. +\titem{\{ldap\_encrypt, none|tls\}} \ind{options!ldap\_encrypt}Type of connection encryption to the LDAP server. Allowed values are: \term{none}, \term{tls}. Note that STARTTLS is not supported. The default value is: \term{none}. -\titem{ldap\_port} \ind{options!ldap\_port}Port to connect to your LDAP server. +\titem{\{ldap\_port, Number\}} \ind{options!ldap\_port}Port to connect to your LDAP server. The default port is~389 if encryption is disabled; and 636 if encryption is enabled. If you configure a value, it is stored in \ejabberd{}'s database. Then, if you remove that value from the configuration file, the value previously stored in the database will be used instead of the default port. -\titem{ldap\_rootdn} \ind{options!ldap\_rootdn}Bind DN. The default value +\titem{\{ldap\_rootdn, RootDN\}} \ind{options!ldap\_rootdn}Bind DN. The default value is~\term{""} which means `anonymous connection'. -\titem{ldap\_password} \ind{options!ldap\_password}Bind password. The default +\titem{\{ldap\_password, Password\}} \ind{options!ldap\_password}Bind password. The default value is \term{""}. \end{description} @@ -2148,15 +2150,15 @@ and SASL authentication. You can authenticate users against an LDAP directory. Available options are: \begin{description} -\titem{ldap\_base}\ind{options!ldap\_base}LDAP base directory which stores +\titem{\{ldap\_base, Base\}}\ind{options!ldap\_base}LDAP base directory which stores users accounts. This option is required. - \titem{ldap\_uids}\ind{options!ldap\_uids}LDAP attribute which holds a list - of attributes to use as alternatives for getting the JID. The value is of - the form: \term{[\{ldap\_uidattr\}]} or \term{[\{ldap\_uidattr, - ldap\_uidattr\_format\}]}. You can use as many comma separated tuples - \term{\{ldap\_uidattr, ldap\_uidattr\_format\}} that is needed. The default - value is \term{[\{"uid", "\%u"\}]}. The defaut \term{ldap\_uidattr\_format} - is \term{"\%u"}. The values for \term{ldap\_uidattr} and + \titem{\{ldap\_uids, [ \{ldap\_uidattr\} | \{ldap\_uidattr, ldap\_uidattr\_format\}, ...]\}}\ind{options!ldap\_uids} + LDAP attribute which holds a list of attributes to use as alternatives for getting the JID. + The default attributes are \term{[\{"uid", "\%u"\}]}. + The attributes are of the form: + \term{[\{ldap\_uidattr\}]} or \term{[\{ldap\_uidattr, ldap\_uidattr\_format\}]}. + You can use as many comma separated attributes as needed. + The values for \term{ldap\_uidattr} and \term{ldap\_uidattr\_format} are described as follow: \begin{description} \titem{ldap\_uidattr}\ind{options!ldap\_uidattr}LDAP attribute which holds @@ -2167,16 +2169,16 @@ You can authenticate users against an LDAP directory. Available options are: user's part of a JID. For example, \term{"\%u@example.org"}. The default value is \term{"\%u"}. \end{description} - \titem{ldap\_filter}\ind{options!ldap\_filter}\ind{protocols!RFC 2254: The - String Representation of LDAP Search Filters} - \footahref{http://www.faqs.org/rfcs/rfc2254.html}{RFC 2254} LDAP filter. The + \titem{\{ldap\_filter, Filter\}}\ind{options!ldap\_filter}\ind{protocols!RFC 4515: + LDAP String Representation of Search Filters} + \footahref{http://tools.ietf.org/html/rfc4515}{RFC 4515} LDAP filter. The default is \term{none}. Example: \term{"(\&(objectClass=shadowAccount)(memberOf=Jabber Users))"}. Please, do not forget to close brackets and do not use superfluous whitespaces. Also you \emph{must not} use \option{ldap\_uidattr} attribute in filter because this attribute will be substituted in LDAP filter automatically. - \titem{ldap\_local\_filter}\ind{options!ldap\_local\_filter} + \titem{\{ldap\_local\_filter, Filter\}}\ind{options!ldap\_local\_filter} If you can't use \term{ldap\_filter} due to performance reasons (the LDAP server has many users registered), you can use this local filter. @@ -2339,6 +2341,9 @@ The option \term{modules} defines the list of modules that will be loaded after element is the name of a module and the second is a list of options for that module. +The syntax is: +\esyntax{\{modules, [ \{ModuleName, ModuleOptions\}, ...]\}.} + Examples: \begin{itemize} \item In this example only the module \modecho{} is loaded and no module @@ -2385,12 +2390,14 @@ The following table lists all modules included in \ejabberd{}. \hline \ahrefloc{modmuclog}{\modmuclog{}} & Multi-User Chat room logging & \modmuc{} \\ \hline \ahrefloc{modoffline}{\modoffline{}} & Offline message storage (\xepref{0160}) & \\ \hline \ahrefloc{modoffline}{\modofflineodbc{}} & Offline message storage (\xepref{0160}) & supported DB (*) \\ + \hline \ahrefloc{modping}{\modping{}} & XMPP Ping and periodic keepalives (\xepref{0199}) & \\ \hline \ahrefloc{modprivacy}{\modprivacy{}} & Blocking Communication (XMPP IM) & \\ \hline \ahrefloc{modprivacy}{\modprivacyodbc{}} & Blocking Communication (XMPP IM) & supported DB (*) \\ \hline \ahrefloc{modprivate}{\modprivate{}} & Private XML Storage (\xepref{0049}) & \\ \hline \ahrefloc{modprivate}{\modprivateodbc{}} & Private XML Storage (\xepref{0049}) & supported DB (*) \\ \hline \ahrefloc{modproxy}{\modproxy{}} & SOCKS5 Bytestreams (\xepref{0065}) & \\ \hline \ahrefloc{modpubsub}{\modpubsub{}} & Pub-Sub (\xepref{0060}), PEP (\xepref{0163}) & \modcaps{} \\ + \hline \ahrefloc{modpubsub}{\modpubsubodbc{}} & Pub-Sub (\xepref{0060}), PEP (\xepref{0163}) & supported DB (*) and \modcaps{} \\ \hline \ahrefloc{modregister}{\modregister{}} & In-Band Registration (\xepref{0077}) & \\ \hline \ahrefloc{modroster}{\modroster{}} & Roster management (XMPP IM) & \\ \hline \ahrefloc{modroster}{\modrosterodbc{}} & Roster management (XMPP IM) & supported DB (*) \\ @@ -2398,7 +2405,7 @@ The following table lists all modules included in \ejabberd{}. \hline \ahrefloc{modsharedroster}{\modsharedroster{}} & Shared roster management & \modroster{} or \\ & & \modrosterodbc\\ \hline \ahrefloc{modstats}{\modstats{}} & Statistics Gathering (\xepref{0039}) & \\ - \hline \ahrefloc{modtime}{\modtime{}} & Entity Time (\xepref{0090}) & \\ + \hline \ahrefloc{modtime}{\modtime{}} & Entity Time (\xepref{0202}) & \\ \hline \ahrefloc{modvcard}{\modvcard{}} & vcard-temp (\xepref{0054}) & \\ \hline \ahrefloc{modvcardldap}{\modvcardldap{}} & vcard-temp (\xepref{0054}) & LDAP server \\ \hline \ahrefloc{modvcard}{\modvcardodbc{}} & vcard-temp (\xepref{0054}) & supported DB (*) \\ @@ -2455,7 +2462,12 @@ this separate section. Many modules define handlers for processing IQ queries of different namespaces to this server or to a user (e.\,g.\ to \jid{example.org} or to \jid{user@example.org}). This option defines processing discipline for -these queries. Possible values are: +these queries. + +The syntax is: +\esyntax{\{iqdisc, Value\}} + +Possible \term{Value} are: \begin{description} \titem{no\_queue} All queries of a namespace with this processing discipline are processed immediately. This also means that no other packets can be processed @@ -2489,7 +2501,12 @@ Example: \ind{options!host} This option defines the Jabber ID of a service provided by an \ejabberd{} module. -The keyword "@HOST@" is replaced at start time with the real virtual host string. + +The syntax is: +\esyntax{\{host, HostName\}} + +If you include the keyword "@HOST@" in the HostName, +it is replaced at start time with the real virtual host string. This example configures the \ind{modules!\modecho{}}echo module to provide its echoing service @@ -2553,7 +2570,7 @@ hosts in ejabberd. Options: \begin{description} -\titem{access} \ind{options!access}This option specifies who is allowed to +\titem{\{access, AccessName\}} \ind{options!access}This option specifies who is allowed to send announcements and to set the message of the day (by default, nobody is able to send such messages). \end{description} @@ -2600,6 +2617,7 @@ disabled for instances of \ejabberd{} with hundreds of thousands users. \ind{protocols!XEP-0030: Service Discovery} \ind{protocols!XEP-0011: Jabber Browsing} \ind{protocols!XEP-0094: Agent Information} +\ind{protocols!XEP-0157: Contact Addresses for XMPP Services} This module adds support for Service Discovery (\xepref{0030}). With this module enabled, services on your server can be discovered by @@ -2613,8 +2631,16 @@ Options: \begin{description} \iqdiscitem{Service Discovery (\ns{http://jabber.org/protocol/disco\#items} and \ns{http://jabber.org/protocol/disco\#info})} -\titem{extra\_domains} \ind{options!extra\_domains}With this option, - extra domains can be added to the Service Discovery item list. +\titem{\{extra\_domains, [Domain, ...]\}} \ind{options!extra\_domains}With this option, + you can specify a list of extra domains that are added to the Service Discovery item list. +\titem{\{server\_info, [ \{Modules, Field, [Value, ...]\}, ... ]\}} \ind{options!server\_info} + Specify additional information about the server, + as described in Contact Addresses for XMPP Services (\xepref{0157}). + \term{Modules} can be the keyword `all', + in which case the information is reported in all the services; + or a list of \ejabberd{} modules, + in which case the information is only specified for the services provided by those modules. + Any arbitrary \term{Field} and \term{Value} can be specified, not only contact addresses. \end{description} Examples: @@ -2648,9 +2674,32 @@ Examples: ... ]}. \end{verbatim} +\item With this configuration, all services show abuse addresses, +feedback address on the main server, +and admin addresses for both the main server and the vJUD service: +\begin{verbatim} +{modules, + [ + ... + {mod_disco, [{server_info, [ + {all, + "abuse-addresses", + ["mailto:abuse@shakespeare.lit"]}, + {[mod_muc], + "Web chatroom logs", + ["http://www.example.org/muc-logs"]}, + {[mod_disco], + "feedback-addresses", + ["http://shakespeare.lit/feedback.php", "mailto:feedback@shakespeare.lit", "xmpp:feedback@shakespeare.lit"]}, + {[mod_disco, mod_vcard], + "admin-addresses", + ["mailto:xmpp@shakespeare.lit", "xmpp:admins@shakespeare.lit"]} + ]}]}, + ... + ]}. +\end{verbatim} \end{itemize} - \makesubsection{modecho}{\modecho{}} \ind{modules!\modecho{}}\ind{debugging} @@ -2727,9 +2776,12 @@ For example: ]}. \end{verbatim} -The maximum inactivity period is by default 30 seconds. -This can be configured with the module option \term{max\_inactivity}. -For example, to set 50 seconds: +Options: +\begin{description} + \titem{\{max\_inactivity, Seconds\}} \ind{options!max\_inactivity} + Define the maximum inactivity period in seconds. + Default value is 30 seconds. + For example, to set 50 seconds: \begin{verbatim} {modules, [ @@ -2738,6 +2790,8 @@ For example, to set 50 seconds: ... ]}. \end{verbatim} +\end{description} + \makesubsection{modhttpfileserver}{\modhttpfileserver{}} \ind{modules!\modhttpfileserver{}}\ind{modhttpfileserver} @@ -2746,21 +2800,35 @@ This simple module serves files from the local disk over HTTP. Options: \begin{description} - \titem{docroot} \ind{options!docroot} + \titem{\{docroot, Path\}} \ind{options!docroot} Directory to serve the files. - \titem{accesslog} \ind{options!accesslog} + \titem{\{accesslog, Path\}} \ind{options!accesslog} File to log accesses using an Apache-like format. No log will be recorded if this option is not specified. - \titem{directory\_indices} \ind{options!directoryindices} + \titem{\{directory\_indices, [Index, ...]\}} \ind{options!directoryindices} Indicate one or more directory index files, similarly to Apache's DirectoryIndex variable. When a web request hits a directory instead of a regular file, those directory indices are looked in order, and the first one found is returned. + %B \titem{content\_types} \ind{options!contenttypes} + %M \titem{\{content\_types, \{Extension, Type\} \}} \ind{options!contenttypes} + %B \titem{\{content\_types, [ Extension, Type, ... ]\}} \ind{options!contenttypes} + %B \titem{\{content\_types, [ {Extension, Type}, ... ]\}} \ind{options!contenttypes} + %M \titem{\{content\_types, [ \{Extension, Type\}, ... ]\}} \ind{options!contenttypes} + Specify a mapping of extensions to content types. + There are several content types already defined, + with this option you can add new definitions, modify or delete existing ones. + To delete an existing definition, simply define it with a value: `undefined'. + \titem{\{default\_content\_type, Type\}} \ind{options!defaultcontenttype} + Specify the content type to use for unknown extensions. + Default value is `application/octet-stream'. \end{description} This example configuration will serve the files from the local directory \verb|/var/www| in the address \verb|http://example.org:5280/pub/archive/|. +In this example a new content type \term{ogg} is defined, +\term{png} is redefined, and \term{jpg} definition is deleted. To use this module you must enable it: \begin{verbatim} {modules, @@ -2768,8 +2836,13 @@ To use this module you must enable it: ... {mod_http_fileserver, [ {docroot, "/var/www"}, - {directory_indices, ["index.html", "main.htm"]}, - {accesslog, "/var/log/ejabberd/access.log"} + {accesslog, "/var/log/ejabberd/access.log"}, + {directory_indices, ["index.html", "main.htm"]}, + {content_types, [{".ogg", "audio/ogg"}, + {".png", "image/png"}, + {".jpg", undefined} + ]}, + {default_content_type, "text/html"} ] }, ... @@ -2825,9 +2898,10 @@ End user information: Options: \begin{description} \hostitem{irc} -\titem{access} \ind{options!access}This option can be used to specify who +\titem{\{access, AccessName\}} \ind{options!access}This option can be used to specify who may use the IRC transport (default value: \term{all}). -\titem{default\_encoding} \ind{options!defaultencoding}Set the default IRC encoding (default value: \term{"koi8-r"}). +\titem{\{default\_encoding, Encoding\}} \ind{options!defaultencoding}Set the default IRC encoding. + Default value: \term{"koi8-r"} \end{description} Examples: @@ -2908,15 +2982,15 @@ on an available node on first connection attempt. Module options: \begin{description} \hostitem{conference} -\titem{access} \ind{options!access}You can specify who is allowed to use +\titem{\{access, AccessName\}} \ind{options!access}You can specify who is allowed to use the Multi-User Chat service. By default everyone is allowed to use it. -\titem{access\_create} \ind{options!access\_create}To configure who is +\titem{\{access\_create, AccessName\}} \ind{options!access\_create}To configure who is allowed to create new rooms at the Multi-User Chat service, this option can be used. By default everybody is allowed to create rooms. -\titem{access\_persistent} \ind{options!access\_persistent}To configure who is +\titem{\{access\_persistent, AccessName\}} \ind{options!access\_persistent}To configure who is allowed to modify the 'persistent' room option. By default everybody is allowed to modify that option. -\titem{access\_admin} \ind{options!access\_admin}This option specifies +\titem{\{access\_admin, AccessName\}} \ind{options!access\_admin}This option specifies who is allowed to administrate the Multi-User Chat service. The default value is \term{none}, which means that only the room creator can administer his room. @@ -2924,7 +2998,7 @@ Module options: and it will be shown in all active rooms as a service message. The administrators can send a groupchat message to the JID of an active room, and the message will be shown in the room as a service message. -\titem{history\_size} \ind{options!history\_size}A small history of +\titem{\{history\_size, Size\}} \ind{options!history\_size}A small history of the current discussion is sent to users when they enter the room. With this option you can define the number of history messages to keep and send to users joining the room. The value is an @@ -2932,35 +3006,35 @@ Module options: and, as a result, nothing is kept in memory. The default value is \term{20}. This value is global and thus affects all rooms on the service. -\titem{max\_users} \ind{options!max\_users} This option defines at +\titem{\{max\_users, Number\}} \ind{options!max\_users} This option defines at the service level, the maximum number of users allowed per room. It can be lowered in each room configuration but cannot be increased in individual room configuration. The default value is 200. -\titem{max\_users\_admin\_threshold} +\titem{\{max\_users\_admin\_threshold, Number\}} \ind{options!max\_users\_admin\_threshold} This option defines the number of service admins or room owners allowed to enter the room when the maximum number of allowed occupants was reached. The default limit is 5. -\titem{max\_user\_conferences} +\titem{\{max\_user\_conferences, Number\}} \ind{options!max\_user\_conferences} This option defines the maximum number of rooms that any given user can join. The default value is 10. This option is used to prevent possible abuses. Note that this is a soft limit: some users can sometimes join more conferences in cluster configurations. -\titem{max\_room\_id} \ind{options!max\_room\_id} +\titem{\{max\_room\_id, Number\}} \ind{options!max\_room\_id} This option defines the maximum number of characters that Room ID can have when creating a new room. The default value is to not limit: infinite. -\titem{max\_room\_name} \ind{options!max\_room\_name} +\titem{\{max\_room\_name, Number\}} \ind{options!max\_room\_name} This option defines the maximum number of characters that Room Name can have when configuring the room. The default value is to not limit: infinite. -\titem{max\_room\_desc} \ind{options!max\_room\_desc} +\titem{\{max\_room\_desc, Number\}} \ind{options!max\_room\_desc} This option defines the maximum number of characters that Room Description can have when configuring the room. The default value is to not limit: infinite. -\titem{min\_message\_interval} \ind{options!min\_message\_interval} +\titem{\{min\_message\_interval, Number\}} \ind{options!min\_message\_interval} This option defines the minimum interval between two messages send by an occupant in seconds. This option is global and valid for all rooms. A decimal value can be used. When this option is not defined, @@ -2970,7 +3044,7 @@ Module options: interval is 0.4 second. If an occupant tries to send messages faster, an error is send back explaining that the message has been discarded and describing the reason why the message is not acceptable. -\titem{min\_presence\_interval} +\titem{\{min\_presence\_interval, Number\}} \ind{options!min\_presence\_interval} This option defines the minimum of time between presence changes coming from a given occupant in seconds. This option is global and valid for all rooms. A @@ -2982,36 +3056,36 @@ Module options: broadcasted to all occupants in the room after expiration of the interval delay. Intermediate presence packets are silently discarded. A good value for this option is 4 seconds. -\titem{default\_room\_options} \ind{options!default\_room\_options} +\titem{\{default\_room\_options, [ \{OptionName, OptionValue\}, ...]\}} \ind{options!default\_room\_options} This module option allows to define the desired default room options. Note that the creator of a room can modify the options of his room at any time using a Jabber client with MUC capability. The available room options and the default values are: \begin{description} - \titem{\{allow\_change\_subj, true\}} Allow occupants to change the subject. - \titem{\{allow\_private\_messages, true\}} Occupants can send private messages to other occupants. - \titem{\{allow\_query\_users, true\}} Occupants can send IQ queries to other occupants. - \titem{\{allow\_user\_invites, false\}} Allow occupants to send invitations. - \titem{\{allow\_visitor\_nickchange, true\}} Allow visitors to + \titem{\{allow\_change\_subj, true|false\}} Allow occupants to change the subject. + \titem{\{allow\_private\_messages, true|false\}} Occupants can send private messages to other occupants. + \titem{\{allow\_query\_users, true|false\}} Occupants can send IQ queries to other occupants. + \titem{\{allow\_user\_invites, false|true\}} Allow occupants to send invitations. + \titem{\{allow\_visitor\_nickchange, true|false\}} Allow visitors to change nickname. - \titem{\{allow\_visitor\_status, true\}} Allow visitors to send + \titem{\{allow\_visitor\_status, true|false\}} Allow visitors to send status text in presence updates. If disallowed, the \term{status} text is stripped before broadcasting the presence update to all the room occupants. - \titem{\{anonymous, true\}} The room is anonymous: + \titem{\{anonymous, true|false\}} The room is anonymous: occupants don't see the real JIDs of other occupants. Note that the room moderators can always see the real JIDs of the occupants. - \titem{\{logging, false\}} The public messages are logged using \term{mod\_muc\_log}. + \titem{\{logging, false|true\}} The public messages are logged using \term{mod\_muc\_log}. \titem{\{max\_users, 200\}} Maximum number of occupants in the room. - \titem{\{members\_by\_default, true\}} The occupants that enter the room are participants by default, so they have 'voice'. - \titem{\{members\_only, false\}} Only members of the room can enter. - \titem{\{moderated, true\}} Only occupants with 'voice' can send public messages. - \titem{\{password, ""\}} Password of the room. You may want to enable the next option too. - \titem{\{password\_protected, false\}} The password is required to enter the room. - \titem{\{persistent, false\}} The room persists even if the last participant leaves. - \titem{\{public, true\}} The room is public in the list of the MUC service, so it can be discovered. - \titem{\{public\_list, true\}} The list of participants is public, without requiring to enter the room. - \titem{\{title, ""\}} A human-readable title of the room. + \titem{\{members\_by\_default, true|false\}} The occupants that enter the room are participants by default, so they have 'voice'. + \titem{\{members\_only, false|true\}} Only members of the room can enter. + \titem{\{moderated, true|false\}} Only occupants with 'voice' can send public messages. + \titem{\{password, "roompass123"\}} Password of the room. You may want to enable the next option too. + \titem{\{password\_protected, false|true\}} The password is required to enter the room. + \titem{\{persistent, false|true\}} The room persists even if the last participant leaves. + \titem{\{public, true|false\}} The room is public in the list of the MUC service, so it can be discovered. + \titem{\{public\_list, true|false\}} The list of participants is public, without requiring to enter the room. + \titem{\{title, "Room Title"\}} A human-readable title of the room. \end{description} All of those room options can be set to \term{true} or \term{false}, except \term{password} and \term{title} which are strings, @@ -3133,7 +3207,7 @@ Features: author, subject and configuration. \item \ind{protocols!RFC 5122: Internationalized Resource Identifiers (IRIs) and Uniform Resource Identifiers (URIs) for the Extensible Messaging and Presence Protocol (XMPP)} The room JID in the generated HTML is a link to join the room (using - \footahref{http://www.xmpp.org/rfcs/rfc5122.html}{XMPP URI}). + \footahref{http://xmpp.org/rfcs/rfc5122.html}{XMPP URI}). \item Subject and room configuration changes are tracked and displayed. \item Joins, leaves, nick changes, kicks, bans and `/me' are tracked and displayed, including the reason if available. @@ -3148,53 +3222,52 @@ Features: Options: \begin{description} -\titem{access\_log}\ind{options!access\_log} +\titem{\{access\_log, AccessName\}}\ind{options!access\_log} This option restricts which occupants are allowed to enable or disable room logging. The default value is \term{muc\_admin}. Note for this default setting you need to have an access rule for \term{muc\_admin} in order to take effect. -\titem{cssfile}\ind{options!cssfile} +\titem{\{cssfile, false|URL\}}\ind{options!cssfile} With this option you can set whether the HTML files should have a custom CSS file or if they need to use the embedded CSS file. Allowed values are \term{false} and an URL to a CSS file. With the first value, HTML files will include the embedded CSS code. With the latter, you can specify the URL of the - custom CSS file (for example: `http://example.com/my.css'). The default value + custom CSS file (for example: \term{"http://example.com/my.css"}). The default value is \term{false}. -\titem{dirname}\ind{options!dirname} +\titem{\{dirname, room\_jid|room\_name\}}\ind{options!dirname} Allows to configure the name of the room directory. Allowed values are \term{room\_jid} and \term{room\_name}. With the first value, the room directory name will be the full room JID. With the latter, the room directory name will be only the room name, not including the MUC service name. The default value is \term{room\_jid}. -\titem{dirtype}\ind{options!dirtype} +\titem{\{dirtype, subdirs|plain\}}\ind{options!dirtype} The type of the created directories can be specified with this option. Allowed values are \term{subdirs} and \term{plain}. With the first value, subdirectories are created for each year and month. With the latter, the names of the log files contain the full date, and there are no subdirectories. The default value is \term{subdirs}. -\titem{file\_format}\ind{options!file\_format} +\titem{\{file\_format, html|plaintext\}}\ind{options!file\_format} Define the format of the log files: \term{html} stores in HTML format, \term{plaintext} stores in plain text. The default value is \term{html}. -\titem{outdir}\ind{options!outdir} +\titem{\{outdir, Path\}}\ind{options!outdir} This option sets the full path to the directory in which the HTML files should be stored. Make sure the \ejabberd{} daemon user has write access on that directory. The default value is \term{"www/muc"}. -\titem{spam\_prevention}\ind{options!spam\_prevention} +\titem{\{spam\_prevention true|false\}}\ind{options!spam\_prevention} To prevent spam, the \term{spam\_prevention} option adds a special attribute to links that prevent their indexation by search engines. The default value is \term{true}, which mean that nofollow attributes will be added to user submitted links. -\titem{timezone}\ind{options!timezone} +\titem{\{timezone, local|universal\}}\ind{options!timezone} The time zone for the logs is configurable with this option. Allowed values are \term{local} and \term{universal}. With the first value, the local time, as reported to Erlang by the operating system, will be used. With the latter, GMT/UTC time will be used. The default value is \term{local}. -\titem{top\_link}\ind{options!top\_link} +\titem{\{top\_link, \{URL, Text\}\}}\ind{options!top\_link} With this option you can customize the link on the top right corner of each - log file. The syntax of this option is \term{\{"URL", "Text"\}}. The default - value is \term{\{"/", "Home"\}}. + log file. The default value is \term{\{"/", "Home"\}}. \end{description} Examples: @@ -3255,14 +3328,15 @@ Examples: \makesubsection{modoffline}{\modoffline{}} \ind{modules!\modoffline{}} -This module implements offline message storage. This means that all messages +This module implements offline message storage (\xepref{0160}). +This means that all messages sent to an offline user will be stored on the server until that user comes online again. Thus it is very similar to how email works. Note that \term{ejabberdctl}\ind{ejabberdctl} has a command to delete expired messages (see section~\ref{ejabberdctl}). \begin{description} - \titem{access\_max\_user\_messages}\ind{options!access\_max\_user\_messages} + \titem{\{access\_max\_user\_messages, Number\}}\ind{options!access\_max\_user\_messages} This option defines which access rule will be enforced to limit the maximum number of offline messages that a user can have (quota). When a user has too many offline messages, any new messages that he receive are discarded, @@ -3291,6 +3365,43 @@ and all the other users up to 100. ]}. \end{verbatim} +\makesubsection{modping}{\modping{}} +\ind{modules!\modping{}} + +This module implements support for XMPP Ping (\xepref{0199}) and periodic keepalives. +When this module is enabled ejabberd responds correctly to +ping requests, as defined in the protocol. + +Configuration options: +\begin{description} + \titem{\{send\_pings, true|false\}}\ind{options!send\_pings} + If this option is set to \term{true}, the server sends pings to connected clients + that are not active in a given interval \term{ping\_interval}. + This is useful to keep client connections alive or checking availability. + By default this option is disabled. + % because it is mostly not needed and consumes resources. + \titem{\{ping\_interval, Seconds\}}\ind{options!ping\_interval} + How often to send pings to connected clients, if the previous option is enabled. + If a client connection does not send or receive any stanza in this interval, + a ping request is sent to the client. + The default value is 60 seconds. + \titem{\{timeout\_action, none|kill\}}\ind{options!timeout\_action} + What to do when a client does not answer to a server ping request in less than 32 seconds. + % Those 32 seconds are defined in ejabberd_local.erl: -define(IQ_TIMEOUT, 32000). + The default is to do nothing. +\end{description} + +This example enables Ping responses, configures the module to send pings +to client connections that are inactive for 4 minutes, +and if a client does not answer to the ping in less than 32 seconds, its connection is closed: +\begin{verbatim} +{modules, + [ + ... + {mod_ping, [{send_pings, true}, {ping_interval, 240}, {timeout_action, kill}]}, + ... + ]}. +\end{verbatim} \makesubsection{modprivacy}{\modprivacy{}} \ind{modules!\modprivacy{}}\ind{Blocking Communication}\ind{Privacy Rules}\ind{protocols!RFC 3921: XMPP IM} @@ -3316,7 +3427,7 @@ their \Jabber{} client, they will be able to: \item Allowing or blocking all communications based on JID, group, or subscription type (or globally). \end{itemize} -(from \ahrefurl{http://www.xmpp.org/specs/rfc3921.html\#privacy}) +(from \ahrefurl{http://xmpp.org/specs/rfc3921.html\#privacy}) \end{quote} Options: @@ -3349,24 +3460,22 @@ XMPP clients. Options: \begin{description} -\titem{host}\ind{options!host}This option defines the hostname of the service. -If this option is not set, the prefix `\jid{proxy.}' is added to \ejabberd{} -hostname. -\titem{name}\ind{options!name}Defines Service Discovery name of the service. +\hostitem{proxy} +\titem{\{name, Text\}}\ind{options!name}Defines Service Discovery name of the service. Default is \term{"SOCKS5 Bytestreams"}. -\titem{ip}\ind{options!ip}This option specifies which network interface +\titem{\{ip, IPTuple\}}\ind{options!ip}This option specifies which network interface to listen for. Default is an IP address of the service's DNS name, or, if fails, \verb|{127,0,0,1}|. -\titem{port}\ind{options!port}This option defines port to listen for +\titem{\{port, Number\}}\ind{options!port}This option defines port to listen for incoming connections. Default is~7777. -\titem{auth\_type}\ind{options!auth\_type}SOCKS5 authentication type. +\titem{\{auth\_type, anonymous|plain\}}\ind{options!auth\_type}SOCKS5 authentication type. Possible values are \term{anonymous} and \term{plain}. Default is \term{anonymous}. -\titem{access}\ind{options!access}Defines ACL for file transfer initiators. +\titem{\{access, AccessName\}}\ind{options!access}Defines ACL for file transfer initiators. Default is \term{all}. -\titem{max\_connections}\ind{options!max\_connections}Maximum number of +\titem{\{max\_connections, Number\}}\ind{options!max\_connections}Maximum number of active connections per file transfer initiator. No limit by default. -\titem{shaper}\ind{options!shaper}This option defines shaper for +\titem{\{shaper, none|ShaperName\}}\ind{options!shaper}This option defines shaper for the file transfer peers. Shaper with the maximum bandwidth will be selected. Default is \term{none}. \end{description} @@ -3418,26 +3527,44 @@ and it requires \modcaps{}. Options: \begin{description} \hostitem{pubsub} -\titem{access\_createnode} \ind{options!access\_createnode} +\titem{\{access\_createnode, AccessName\}} \ind{options!access\_createnode} This option restricts which users are allowed to create pubsub nodes using ACL and ACCESS. The default value is \term{pubsub\_createnode}. % Not clear enough + do not use abbreviations. -\titem{plugins} \ind{options!plugins} - To specify which pubsub node plugins to use. If not defined, the default - pubsub plugin is always used. -\titem{nodetree} \ind{options!nodetree} - To specify which nodetree to use. If not defined, the default pubsub - nodetree is used. Only one nodetree can be used per host, - and is shared by all node plugins. -\titem{pep\_sendlast\_offline} \ind{options!pep\_sendlast\_offline} +\titem{\{plugins, [ Plugin, ...]\}} \ind{options!plugins} + To specify which pubsub node plugins to use. + The first one in the list is used by default. + If this option is not defined, the default plugins list is: \term{["flat"]}. + PubSub clients can define which plugin to use when creating a node: + add \term{type='plugin-name'} attribute to the \term{create} stanza element. +\titem{\{nodetree, Nodetree\}} \ind{options!nodetree} + To specify which nodetree to use. + If not defined, the default pubsub nodetree is used: "tree". + Only one nodetree can be used per host, and is shared by all node plugins. + + The "virtual" nodetree does not store nodes on database. + This saves resources on systems with tons of nodes. + If using the "virtual" nodetree, + you can only enable those node plugins: + ["flat","pep"] or ["flat"]; + any other plugins configuration will not work. + Also, all nodes will have the defaut configuration, + and this can not be changed. + Using "virtual" nodetree requires to start from a clean database, + it will not work if you used the default "tree" nodetree before. + + The "dag" nodetree provides experimental support for PubSub Collection Nodes (\xepref{0248}). + In that case you should also add "dag" node plugin as default, for example: + \term{\{plugins, ["dag","flat","hometree","pep"]\}} +\titem{\{pep\_sendlast\_offline, false|true\}} \ind{options!pep\_sendlast\_offline} To specify whether or not we should get last published PEP items from users in our roster which are offline when we connect. Value is true or false. If not defined, pubsub assumes false so we only get last items of online contacts. -\titem{last\_item\_cache} \ind{options!last\_item\_cache} +\titem{\{last\_item\_cache, false|true\}} \ind{options!last\_item\_cache} To specify whether or not pubsub should cache last items. Value is true or false. If not defined, pubsub do not cache last items. On systems with not so many nodes, caching last items speeds up pubsub and allows to raise user connection rate. The cost is memory usage, as every item is stored in memory. -\titem{pep\_mapping} \ind{pep\_mapping} +\titem{\{pep\_mapping, [ \{Key, Value\}, ...]\}} \ind{pep\_mapping} This allow to define a Key-Value list to choose defined node plugins on given PEP namespace. The following example will use node\_tune instead of node\_pep for every PEP node with tune namespace: \begin{verbatim} @@ -3447,19 +3574,32 @@ Options: % This option allows to create additional pubsub virtual hosts in a single module instance. \end{description} -Example: +Example of configuration that uses flat nodes as default, and allows use of flat, nodetree and pep nodes: \begin{verbatim} {modules, [ ... {mod_pubsub, [ {access_createnode, pubsub_createnode}, - {plugins, ["default", "pep"]} - ]} + {plugins, ["flat", "hometree", "pep"]} + ]}, + ... + ]}. +\end{verbatim} + +Using ODBC database requires use of dedicated plugins. The following example shows previous configuration +with ODBC usage: +\begin{verbatim} +{modules, + [ + ... + {mod_pubsub_odbc, [ + {access_createnode, pubsub_createnode}, + {plugins, ["flat_odbc", "hometree_odbc", "pep_odbc"]} + ]}, ... ]}. \end{verbatim} -% {served_hosts, ["example.com", "example.org"]} \makesubsection{modregister}{\modregister{}} \ind{modules!\modregister{}}\ind{protocols!XEP-0077: In-Band Registration}\ind{public registration} @@ -3475,15 +3615,15 @@ enables end users to use a \Jabber{} client to: Options: \begin{description} -\titem{access} \ind{options!access}This option can be configured to specify +\titem{\{access, AccessName\}} \ind{options!access}This option can be configured to specify rules to restrict registration. If a rule returns `deny' on the requested user name, registration for that user name is denied. (there are no restrictions by default). -\titem{welcome\_message} \ind{options!welcomem}Set a welcome message that +\titem{\{welcome\_message, Message\}} \ind{options!welcomem}Set a welcome message that is sent to each newly registered account. The first string is the subject, and the second string is the message body. In the body you can set a newline with the characters: \verb|\n| -\titem{registration\_watchers} \ind{options!rwatchers}This option defines a +\titem{\{registration\_watchers, [ JID, ...]\}} \ind{options!rwatchers}This option defines a list of JIDs which will be notified each time a new account is registered. \iqdiscitem{In-Band Registration (\ns{jabber:iq:register})} \end{description} @@ -3552,13 +3692,36 @@ Also define a registration timeout of one hour: \makesubsection{modroster}{\modroster{}} \ind{modules!\modroster{}}\ind{roster management}\ind{protocols!RFC 3921: XMPP IM} -This module implements roster management as defined in \footahref{http://www.xmpp.org/specs/rfc3921.html\#roster}{RFC 3921: XMPP IM}. +This module implements roster management as defined in +\footahref{http://xmpp.org/specs/rfc3921.html\#roster}{RFC 3921: XMPP IM}. +It also supports Roster Versioning (\xepref{0237}). Options: \begin{description} \iqdiscitem{Roster Management (\ns{jabber:iq:roster})} + \titem{\{versioning, false|true\}} \ind{options!versioning}Enables + Roster Versioning. + This option is disabled by default. + \titem{\{store\_current\_id, false|true\}} \ind{options!storecurrentid} + If this option is enabled, the current version number is stored on the database. + If disabled, the version number is calculated on the fly each time. + Enabling this option reduces the load for both ejabberd and the database. + This option does not affect the client in any way. + This option is only useful if Roster Versioning is enabled. + This option is disabled by default. + Important: if you use \modsharedroster, you must disable this option. \end{description} +This example configuration enables Roster Versioning with storage of current id: +\begin{verbatim} +{modules, + [ + ... + {mod_roster, [{versioning, true}, {store_current_id, true}]}, + ... + ]}. +\end{verbatim} + \makesubsection{modservicelog}{\modservicelog{}} \ind{modules!\modservicelog{}}\ind{message auditing}\ind{Bandersnatch} @@ -3570,7 +3733,7 @@ service(s). Options: \begin{description} -\titem{loggers} \ind{options!loggers}With this option a (list of) service(s) +\titem{\{loggers, [Names, ...]\}} \ind{options!loggers}With this option a (list of) service(s) that will receive the packets can be specified. \end{description} @@ -3751,9 +3914,9 @@ in order to get the statistics. Here they are: \end{itemize} \makesubsection{modtime}{\modtime{}} -\ind{modules!\modtime{}}\ind{protocols!XEP-0090: Entity Time} +\ind{modules!\modtime{}}\ind{protocols!XEP-0202: Entity Time} -This module features support for Entity Time (\xepref{0090}). By using this XEP, +This module features support for Entity Time (\xepref{0202}). By using this XEP, you are able to discover the time at another entity's location. Options: @@ -3773,19 +3936,19 @@ Options: \begin{description} \hostitem{vjud} \iqdiscitem{\ns{vcard-temp}} -\titem{search}\ind{options!search}This option specifies whether the search - functionality is enabled (value: \term{true}) or disabled (value: - \term{false}). If disabled, the option \term{host} will be ignored and the +\titem{\{search, true|false\}}\ind{options!search}This option specifies whether the search + functionality is enabled or not + If disabled, the option \term{host} will be ignored and the \Jabber{} User Directory service will not appear in the Service Discovery item list. The default value is \term{true}. -\titem{matches}\ind{options!matches}With this option, the number of reported +\titem{\{matches, infinity|Number\}}\ind{options!matches}With this option, the number of reported search results can be limited. If the option's value is set to \term{infinity}, all search results are reported. The default value is \term{30}. -\titem{allow\_return\_all}\ind{options!allow\_return\_all}This option enables +\titem{\{allow\_return\_all, false|true\}}\ind{options!allow\_return\_all}This option enables you to specify if search operations with empty input fields should return all users who added some information to their vCard. The default value is \term{false}. -\titem{search\_all\_hosts}\ind{options!search\_all\_hosts}If this option is set +\titem{\{search\_all\_hosts, true|false\}}\ind{options!search\_all\_hosts}If this option is set to \term{true}, search operations will apply to all virtual hosts. Otherwise only the current host will be searched. The default value is \term{true}. This option is available in \modvcard, but not available in \modvcardodbc. @@ -3849,25 +4012,28 @@ consists of the following \modvcardldap{}-specific options: \begin{description} \hostitem{vjud} \iqdiscitem{\ns{vcard-temp}} -\titem{search}\ind{options!search}This option specifies whether the search +\titem{\{search, true|false\}}\ind{options!search}This option specifies whether the search functionality is enabled (value: \term{true}) or disabled (value: \term{false}). If disabled, the option \term{host} will be ignored and the \Jabber{} User Directory service will not appear in the Service Discovery item list. The default value is \term{true}. -\titem{matches}\ind{options!matches}With this option, the number of reported +\titem{\{matches, infinity|Number\}}\ind{options!matches}With this option, the number of reported search results can be limited. If the option's value is set to \term{infinity}, all search results are reported. The default value is \term{30}. -\titem{ldap\_vcard\_map}\ind{options!ldap\_vcard\_map}With this option you can - set the table that maps LDAP attributes to vCard fields. The format is: - \term{[{Name\_of\_vCard\_field, Pattern, List\_of\_LDAP\_attributes}, ...]}.\ind{protocols!RFC 2426: vCard MIME Directory Profile} - \term{Name\_of\_vcard\_field} is the type name of the vCard as defined in - \footahref{http://www.ietf.org/rfc/rfc2426.txt}{RFC 2426}. \term{Pattern} is a - string which contains pattern variables \term{"\%u"}, \term{"\%d"} or - \term{"\%s"}. \term{List\_of\_LDAP\_attributes} is the list containing LDAP - attributes. The pattern variables \term{"\%s"} will be sequentially replaced +\titem{\{ldap\_vcard\_map, [ \{Name, Pattern, LDAPattributes\}, ...]\}} \ind{options!ldap\_vcard\_map} + With this option you can set the table that maps LDAP attributes to vCard fields. + \ind{protocols!RFC 2426: vCard MIME Directory Profile} + \term{Name} is the type name of the vCard as defined in + \footahref{http://tools.ietf.org/html/rfc2426}{RFC 2426}. + \term{Pattern} is a string which contains pattern variables + \term{"\%u"}, \term{"\%d"} or \term{"\%s"}. + \term{LDAPattributes} is the list containing LDAP attributes. + The pattern variables + \term{"\%s"} will be sequentially replaced with the values of LDAP attributes from \term{List\_of\_LDAP\_attributes}, - \term{"\%u"} will be replaced with the user part of a JID, and \term{"\%d"} - will be replaced with the domain part of a JID. The default is: + \term{"\%u"} will be replaced with the user part of a JID, + and \term{"\%d"} will be replaced with the domain part of a JID. + The default is: \begin{verbatim} [{"NICKNAME", "%u", []}, {"FN", "%s", ["displayName"]}, @@ -3890,9 +4056,9 @@ consists of the following \modvcardldap{}-specific options: {"ROLE", "%s", ["employeeType"]}, {"PHOTO", "%s", ["jpegPhoto"]}] \end{verbatim} -\titem{ldap\_search\_fields}\ind{options!ldap\_search\_fields}This option - defines the search form and the LDAP attributes to search within. The format - is: \term{[{Name, Attribute}, ...]}. \term{Name} is the name of a search form +\titem{\{ldap\_search\_fields, [ \{Name, Attribute\}, ...]\}}\ind{options!ldap\_search\_fields}This option + defines the search form and the LDAP attributes to search within. + \term{Name} is the name of a search form field which will be automatically translated by using the translation files (see \term{msgs/*.msg} for available words). \term{Attribute} is the LDAP attribute or the pattern \term{"\%u"}. The default is: @@ -3910,11 +4076,11 @@ consists of the following \modvcardldap{}-specific options: {"Organization Name", "o"}, {"Organization Unit", "ou"}] \end{verbatim} -\titem{ldap\_search\_reported}\ind{options!ldap\_search\_reported}This option - defines which search fields should be reported. The format is: - \term{[{Name, vCard\_Name}, ...]}. \term{Name} is the name of a search form +\titem{\{ldap\_search\_reported, [ \{SearchField, VcardField\}, ...]\}}\ind{options!ldap\_search\_reported}This option + defines which search fields should be reported. + \term{SearchField} is the name of a search form field which will be automatically translated by using the translation - files (see \term{msgs/*.msg} for available words). \term{vCard\_Name} is the + files (see \term{msgs/*.msg} for available words). \term{VcardField} is the vCard field name defined in the \option{ldap\_vcard\_map} option. The default is: \begin{verbatim} @@ -4041,7 +4207,7 @@ answers \ejabberd{}'s version when queried. Options: \begin{description} -\titem{show\_os}\ind{options!showos}Should the operating system be revealed or not. +\titem{\{show\_os, true|false\}}\ind{options!showos}Should the operating system be revealed or not. The default value is \term{true}. \iqdiscitem{Software Version (\ns{jabber:iq:version})} \end{description} @@ -4192,6 +4358,10 @@ The command line parameters: Maximum number of Erlang processes. \titem{-remsh ejabberd@localhost} Open an Erlang shell in a remote Erlang node. + \titem{-hidden} + The connections to other nodes are hidden (not published). + The result is that this node is not considered part of the cluster. + This is important when starting a temporary \term{ctl} or \term{debug} node. \end{description} Note that some characters need to be escaped when used in shell scripts, for instance \verb|"| and \verb|{}|. You can find other options in the Erlang manual page (\shell{erl -man erl}). @@ -4231,7 +4401,7 @@ Available commands in this ejabberd node: The more interesting ones are: \begin{description} -\titem{reopen-log} Reopen the log files after they were renamed. +\titem{reopen\_log} Reopen the log files after they were renamed. If the old files were not renamed before calling this command, they are automatically renamed to \term{"*-old.log"}. See section \ref{logfiles}. \titem {backup ejabberd.backup} @@ -4239,7 +4409,7 @@ The more interesting ones are: \titem {restore ejabberd.backup} Restore immediately from a binary backup file the internal Mnesia database. 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: it will be used to restore the database at the next ejabberd start. Similar to \term{restore}, but requires less memory. @@ -4248,13 +4418,23 @@ The more interesting ones are: \titem {load ejabberd.dump} Restore immediately from a text file dump. This is not recommended for big databases, as it will consume much time, - memory and processor. In that case it's preferable to use \term{backup} and \term{install-fallback}. + memory and processor. In that case it's preferable to use \term{backup} and \term{install\_fallback}. %%More information about backuping can %% be found in section~\ref{backup}. -\titem{import-file, import-dir} \ind{migration from other software} - These options can be used to migrate from other \Jabber{}/XMPP servers. There - exist tutorials to \footahref{http://www.ejabberd.im/migrate-to-ejabberd}{migrate from other software to ejabberd}. -\titem{delete-expired-messages} This option can be used to delete old messages +\titem{import\_piefxis, export\_piefxis, export\_piefxis\_host} \ind{migrate between servers} + These options can be used to migrate accounts + using \xepref{0227} formatted XML files + from/to other \Jabber{}/XMPP servers + or move users of a vhost to another ejabberd installation. + See also + \footahref{https://support.process-one.net/doc/display/P1/ejabberd+migration+kit}{ejabberd migration kit}. +\titem{import\_file, import\_dir} \ind{migration from other software} + These options can be used to migrate accounts + using jabberd1.4 formatted XML files. + from other \Jabber{}/XMPP servers + There exist tutorials to + \footahref{http://www.ejabberd.im/migrate-to-ejabberd}{migrate from other software to ejabberd}. +\titem{delete\_expired\_messages} This option can be used to delete old messages in offline storage. This might be useful when the number of offline messages is very high. \end{description} @@ -4266,11 +4446,11 @@ In that case, authentication information must be provided. In each frontend the \term{AccessCommands} option is defined in a different place. But in all cases the option syntax is the same: \begin{verbatim} -AccessCommands = [ {Access, CommandNames, Arguments} ] +AccessCommands = [ {Access, CommandNames, Arguments}, ...] Access = atom() CommandNames = all | [CommandName] CommandName = atom() -Arguments = [{ArgumentName, ArgumentValue}] +Arguments = [ {ArgumentName, ArgumentValue}, ...] ArgumentName = atom() ArgumentValue = any() \end{verbatim} @@ -4762,10 +4942,7 @@ domain. The default distribution algorithm try to deliver to a local instance of a component. If several local instances are available, one instance is chosen randomly. If no instance is available locally, one instance is chosen randomly among the remote component instances. If you need a different behaviour, you can change the load balancing behaviour with the option \option{domain\_balancing}. The syntax of the option is the following: - -\begin{verbatim} -{domain_balancing, "component.example.com", <balancing_criterium>}. -\end{verbatim} +\esyntax{\{domain\_balancing, "component.example.com", BalancingCriteria\}.} Several balancing criteria are available: \begin{itemize} @@ -4784,10 +4961,8 @@ When there is a risk of failure for a given component, domain balancing can caus In this case, it is best to limit the problem to the sessions handled by the failing component. This is what the \term{domain\_balancing\_component\_number} option does, making the load balancing algorithm not dynamic, but sticky on a fix number of component instances. -The syntax is the following: -\begin{verbatim} -{domain_balancing_component_number, "component.example.com", N} -\end{verbatim} +The syntax is: +\esyntax{\{domain\_balancing\_component\_number, "component.example.com", Number\}.} @@ -4808,8 +4983,10 @@ An \ejabberd{} node writes two log files: \titem{sasl.log} is the Erlang/OTP system log, with the messages reported by Erlang/OTP using SASL (System Architecture Support Libraries) \end{description} -The option \term{loglevel} modifies the verbosity of the file ejabberd.log. -The possible levels are: +The option \term{loglevel} modifies the verbosity of the file ejabberd.log. The syntax is: +\esyntax{\{loglevel, Level\}.} + +The possible \term{Level} are: \begin{description} \titem{0} No ejabberd log at all (not recommended) \titem{1} Critical @@ -4854,6 +5031,9 @@ a message is sent to the Jabber accounts defined with the option \term{watchdog\_admins} \ind{options!watchdog\_admins} in the \ejabberd{} configuration file. +The syntax is: +\esyntax{\{watchdog\_admins, [JID, ...]\}.} + The memory consumed is measured in \term{words}: a word on 32-bit architecture is 4 bytes, and a word on 64-bit architecture is 8 bytes. @@ -4861,6 +5041,9 @@ The threshold by default is 1000000 words. This value can be configured with the option \term{watchdog\_large\_heap}, or in a conversation with the watchdog alert bot. +The syntax is: +\esyntax{\{watchdog\_large\_heap, Number\}.} + Example configuration: \begin{verbatim} {watchdog_admins, ["admin2@localhost", "admin2@example.org"]}. doc/guide.tex @@ -8,7 +8,7 @@ Joeri} %ejabberd is a free and open source instant messaging server written in Erlang. ejabberd is cross-platform, distributed, fault-tolerant, and based on open standards to achieve real-time communication (Jabber/XMPP). -\ejabberd{} is a \marking{free and open source} instant messaging server written in \footahref{http://www.erlang.org/}{Erlang}. +\ejabberd{} is a \marking{free and open source} instant messaging server written in \footahref{http://www.erlang.org/}{Erlang/OTP}. \ejabberd{} is \marking{cross-platform}, distributed, fault-tolerant, and based on open standards to achieve real-time communication. doc/introduction.tex @@ -63,7 +63,7 @@ endif prefix = @prefix@ exec_prefix = @exec_prefix@ -SUBDIRS = @mod_irc@ @mod_pubsub@ @mod_muc@ @mod_proxy65@ @eldap@ @pam@ @web@ stringprep @tls@ @odbc@ @ejabberd_zlib@ +SUBDIRS = @mod_irc@ @mod_pubsub@ @mod_muc@ @mod_proxy65@ @eldap@ @pam@ @web@ stringprep stun @tls@ @odbc@ @ejabberd_zlib@ ERLSHLIBS = expat_erl.so ERLBEHAVS = cyrsasl.erl gen_mod.erl p1_fsm.erl SOURCES_ALL = $(wildcard *.erl) @@ -183,7 +183,7 @@ install: all install -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc # # Administration script - [ -d $(SBINDIR) ] || install -d -m 750 $(SBINDIR) + [ -d $(SBINDIR) ] || install -d -m 755 $(SBINDIR) install -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl # # Binary Erlang files src/Makefile.in @@ -1,62 +1,83 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for ejabberd.erl version. +# Generated by GNU Autoconf 2.64 for ejabberd.erl version. # # Report bugs to <ejabberd@process-one.net>. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software +# Foundation, Inc. +# # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' else - PATH_SEPARATOR=: + as_echo_body='eval expr "X$1" : "X\$.*\$"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\$.*\$$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;; + esac; + expr "X$arg" : "X\$.*\$" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' fi - rm -f conf$$.sh + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi @@ -65,20 +86,18 @@ fi # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) -as_nl=' -' IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -89,354 +108,322 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' PS4='+ ' # NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '$a$' >/dev/null 2>&1 && - test "X`expr 00001 : '.*$...$'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \ - X"$0" : 'X$//$$' \| \ - X"$0" : 'X$/$' \| . 2>/dev/null || -echo X/"$0" | - sed '/^.*\/$[^/][^/]*$\/*$/{ - s//\1/ - q - } - /^X\/$\/\/$$/{ - s//\1/ - q - } - /^X\/$\/$.*/{ - s//\1/ - q - } - s/.*/./; q'` +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE # CDPATH. -$as_unset CDPATH - +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST else - as_have_required=no + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac fi - - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes else - exitcode=1 - echo positional parameters were not saved. + as_have_required=no fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -test \$exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=\$LINENO - as_lineno_2=\$LINENO - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -") 2> /dev/null; then - : else - as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - case $as_dir in + as_found=: + case $as_dir in #( /*) for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi done;; esac + as_found=false done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } IFS=$as_save_IFS - for as_shell in $as_candidate_shells $SHELL; do - # Try only shells that exist, to save several forks. - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { ("$as_shell") 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - + if test "x$CONFIG_SHELL" != x; then : + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also + # works around shells that cannot unset nonexistent variables. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} fi - -: -_ASEOF -}; then - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell bug-autoconf@gnu.org and +$0: ejabberd@process-one.net about your system, including +$0: any error possibly output before this message. Then +$0: install a modern shell, or manually run the script +$0: under such a shell if you do have one." + fi + exit 1 fi +fi +fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS - -: -(as_func_return () { - (exit $1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} } +as_unset=as_fn_unset -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ -if as_func_ret_success; then - : + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X$//$[^/]' \| \ + X"$as_dir" : 'X$//$$' \| \ + X"$as_dir" : 'X$/$' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X$\/\/$[^/].*/{ + s//\1/ + q + } + /^X$\/\/$$/{ + s//\1/ + q + } + /^X$\/$.*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + + +} # as_fn_mkdir_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = "$1" ); then - : + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' else - exitcode=1 - echo positional parameters were not saved. -fi - -test $exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } - -_ASEOF -}; then - break -fi - -fi - - done - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -fi - - - if test $as_have_required = no; then - echo This script requires a shell more modern than all the - echo shells that I found on your system. Please install a - echo modern shell, or manually run the script under such a - echo shell if you do have one. - { (exit 1); exit 1; } -fi - - -fi - -fi - + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith -(eval "as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with status $?, using 1 if that was 0. +as_fn_error () +{ + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + fi + $as_echo "$as_me: error: $1" >&2 + as_fn_exit $as_status +} # as_fn_error -exitcode=0 -if as_func_success; then - : +if expr a : '$a$' >/dev/null 2>&1 && + test "X`expr 00001 : '.*$...$'`" = X001; then + as_expr=expr else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. + as_expr=false fi -if as_func_ret_success; then - : +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. + as_basename=false fi -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname else - exitcode=1 - echo positional parameters were not saved. + as_dirname=false fi -test \$exitcode = 0") || { - echo No shell found that supports shell functions. - echo Please tell autoconf@gnu.org about your system, - echo including any error possibly output before this - echo message -} - +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \ + X"$0" : 'X$//$$' \| \ + X"$0" : 'X$/$' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/$[^/][^/]*$\/*$/{ + s//\1/ + q + } + /^X\/$\/\/$$/{ + s//\1/ + q + } + /^X\/$\/$.*/{ + s//\1/ + q + } + s/.*/./; q'` +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) sed -n ' p /[$]LINENO/= @@ -453,8 +440,7 @@ test \$exitcode = 0") || { s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the @@ -464,49 +450,40 @@ test \$exitcode = 0") || { exit } - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; *) ECHO_N='-n';; esac -if expr a : '$a$' >/dev/null 2>&1 && - test "X`expr 00001 : '.*$...$'`" = X001; then - as_expr=expr -else - as_expr=false -fi - rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir - mkdir conf$$.dir -fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + fi else as_ln_s='cp -p' fi @@ -514,7 +491,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -531,12 +508,12 @@ else as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else - case $1 in - -*)set "./$1";; + case $1 in #( + -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -550,7 +527,6 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - exec 7<&0 </dev/null 6>&1 # Name of the host. @@ -569,7 +545,6 @@ cross_compiling=no subdirs= MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='ejabberd.erl' @@ -577,6 +552,7 @@ PACKAGE_TARNAME='ejabberd' PACKAGE_VERSION='version' PACKAGE_STRING='ejabberd.erl version' PACKAGE_BUGREPORT='ejabberd@process-one.net' +PACKAGE_URL='' # Factoring default headers for most tests. ac_includes_default="\ @@ -615,97 +591,123 @@ ac_includes_default="\ #endif" ac_default_prefix=/ -ac_subst_vars='SHELL -PATH_SEPARATOR -PACKAGE_NAME -PACKAGE_TARNAME -PACKAGE_VERSION -PACKAGE_STRING -PACKAGE_BUGREPORT -exec_prefix -prefix -program_transform_name -bindir -sbindir -libexecdir -datarootdir -datadir -sysconfdir -sharedstatedir -localstatedir -includedir -oldincludedir -docdir -infodir -htmldir -dvidir -pdfdir -psdir -libdir -localedir -mandir -DEFS -ECHO_C -ECHO_N -ECHO_T -LIBS -build_alias -host_alias -target_alias -CC -CFLAGS -LDFLAGS -CPPFLAGS -ac_ct_CC -EXEEXT -OBJEXT -SET_MAKE -ERLC -ERL -ERLANG_CFLAGS -ERLANG_LIBS -ERLANG_SSL39 -LIBICONV -CPP -GREP -EGREP -EXPAT_CFLAGS -EXPAT_LIBS -LIBOBJS -mod_irc -make_mod_irc -mod_muc -make_mod_muc -mod_proxy65 -make_mod_proxy65 -mod_pubsub -make_mod_pubsub -eldap -make_eldap -odbc -make_odbc -tls -make_tls -web -make_web -ejabberd_zlib -make_ejabberd_zlib -ZLIB_CFLAGS -ZLIB_LIBS -pam -make_pam -PAM_CFLAGS -PAM_LIBS -hipe -roster_gateway_workaround -db_type -transient_supervisors -full_xml -SSL_LIBS -SSL_CFLAGS +ac_subst_vars='LTLIBOBJS INSTALLUSER -LTLIBOBJS' +SSL_CFLAGS +SSL_LIBS +full_xml +transient_supervisors +db_type +roster_gateway_workaround +hipe +PAM_LIBS +PAM_CFLAGS +make_pam +pam +ZLIB_LIBS +ZLIB_CFLAGS +make_ejabberd_zlib +ejabberd_zlib +make_web +web +make_tls +tls +make_odbc +odbc +make_eldap +eldap +make_mod_pubsub +mod_pubsub +make_mod_proxy65 +mod_proxy65 +make_mod_muc +mod_muc +make_mod_irc +mod_irc +LIBOBJS +EXPAT_LIBS +EXPAT_CFLAGS +EGREP +GREP +CPP +LIBICONV +ERLANG_SSL39 +ERLANG_LIBS +ERLANG_CFLAGS +ERL +ERLC +SET_MAKE +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC +target_alias +host_alias +build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_URL +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL' ac_subst_files='' +ac_user_opts=' +enable_option_checking +with_erlang +with_libiconv_prefix +with_expat +enable_mod_irc +enable_mod_muc +enable_mod_proxy65 +enable_mod_pubsub +enable_eldap +enable_odbc +enable_tls +enable_web +enable_ejabberd_zlib +with_zlib +enable_pam +with_pam +enable_hipe +enable_roster_gateway_workaround +enable_mssql +enable_transient_supervisors +enable_full_xml +with_openssl +enable_user +' ac_precious_vars='build_alias host_alias target_alias @@ -720,6 +722,8 @@ CPP' # Initialize some variables set by options. ac_init_help= ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= # The variables have the same names as the options, with # dashes changed to underlines. cache_file=/dev/null @@ -818,13 +822,20 @@ do datarootdir=$ac_optarg ;; -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-$.*$'` + ac_useropt=`expr "x$ac_option" : 'x-*disable-$.*$'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=no ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; -docdir | --docdir | --docdi | --doc | --do) ac_prev=docdir ;; @@ -837,13 +848,20 @@ do dvidir=$ac_optarg ;; -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-$[^=]*$'` + ac_useropt=`expr "x$ac_option" : 'x-*enable-$[^=]*$'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=\$ac_optarg ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -1034,22 +1052,36 @@ do ac_init_version=: ;; -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-$[^=]*$'` + ac_useropt=`expr "x$ac_option" : 'x-*with-$[^=]*$'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=\$ac_optarg ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=\$ac_optarg ;; -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-$.*$'` + ac_useropt=`expr "x$ac_option" : 'x-*without-$.*$'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=no ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; --x) # Obsolete; use --with-x. @@ -1069,25 +1101,25 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } + -*) as_fn_error "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information." ;; *=*) ac_envvar=`expr "x$ac_option" : 'x$[^=]*$='` # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error "invalid variable name: \`$ac_envvar'" ;; + esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; *) # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; @@ -1096,23 +1128,36 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } + as_fn_error "missing argument to $ac_option" fi -# Be sure to have absolute directory names. +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; + fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac +fi + +# Check all directory arguments for consistency. for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ libdir localedir mandir do eval ac_val=\$$ac_var + # Remove trailing slashes. + case $ac_val in + */ ) + ac_val=`expr "X$ac_val" : 'X$.*[^/]$' \| "X$ac_val" : 'X$.*$'` + eval $ac_var=\$ac_val;; + esac + # Be sure to have absolute directory names. case $ac_val in [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } + as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1126,7 +1171,7 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes @@ -1142,23 +1187,21 @@ test "$silent" = yes && exec 6>/dev/null ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { echo "$as_me: error: Working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } + as_fn_error "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } + as_fn_error "pwd does not report name of working directory" # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$0" || -$as_expr X"$0" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ - X"$0" : 'X$//$[^/]' \| \ - X"$0" : 'X$//$$' \| \ - X"$0" : 'X$/$' \| . 2>/dev/null || -echo X"$0" | + ac_confdir=`$as_dirname -- "$as_myself" || +$as_expr X"$as_myself" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ + X"$as_myself" : 'X$//$[^/]' \| \ + X"$as_myself" : 'X$//$$' \| \ + X"$as_myself" : 'X$/$' \| . 2>/dev/null || +$as_echo X"$as_myself" | sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1185,13 +1228,11 @@ else fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } + as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1239,9 +1280,9 @@ Configuration: Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -1251,25 +1292,25 @@ for instance \`--prefix=\$HOME'. For better control, use the options below. Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/ejabberd] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/ejabberd] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF @@ -1283,6 +1324,7 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-mod_irc enable mod_irc (default: yes) @@ -1307,7 +1349,8 @@ Optional Features: (default: yes) --enable-full-xml use XML features in XMPP stream (ex: CDATA) (default: no, requires XML compliant clients) - --enable-user[=USER] allow this system user to start ejabberd (default: + --enable-user[[[=USER]]] + allow this system user to start ejabberd (default: no) Optional Packages: @@ -1342,15 +1385,17 @@ fi if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || continue + test -d "$ac_dir" || + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || + continue ac_builddir=. case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -1386,7 +1431,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix echo && $SHELL "$ac_srcdir/configure" --help=recursive else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -1396,21 +1441,311 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF ejabberd.erl configure version -generated by GNU Autoconf 2.61 +generated by GNU Autoconf 2.64 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF exit fi + +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + return $ac_retval + +} # ac_fn_c_try_compile + +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + return $ac_retval + +} # ac_fn_c_try_link + +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + return $ac_retval + +} # ac_fn_c_try_cpp + +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_c_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_header_compiler=yes +else + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + ac_header_preproc=yes +else + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} +( cat <<\_ASBOX +## --------------------------------------- ## +## Report this to ejabberd@process-one.net ## +## --------------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_header_mongrel + +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + return $ac_retval + +} # ac_fn_c_try_run + +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_header_compile cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by ejabberd.erl $as_me version, which was -generated by GNU Autoconf 2.61. Invocation command line was +generated by GNU Autoconf 2.64. Invocation command line was $ $0 $@ @@ -1446,8 +1781,8 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" -done + $as_echo "PATH: $as_dir" + done IFS=$as_save_IFS } >&5 @@ -1481,12 +1816,12 @@ do | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" + as_fn_append ac_configure_args1 " '$ac_arg'" if test $ac_must_keep_next = true; then ac_must_keep_next=false # Got value, back to normal. else @@ -1502,13 +1837,13 @@ do -* ) ac_must_keep_next=true ;; esac fi - ac_configure_args="$ac_configure_args '$ac_arg'" + as_fn_append ac_configure_args " '$ac_arg'" ;; esac done done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there @@ -1533,12 +1868,13 @@ _ASBOX case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( - *) $as_unset $ac_var ;; + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -1567,9 +1903,9 @@ _ASBOX do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - echo "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo @@ -1584,9 +1920,9 @@ _ASBOX do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - echo "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo fi @@ -1602,64 +1938,69 @@ _ASBOX echo fi test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h +$as_echo "/* confdefs.h */" > confdefs.h + # Predefined preprocessor variables. cat >>confdefs.h <<_ACEOF #define PACKAGE_NAME "$PACKAGE_NAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_TARNAME "$PACKAGE_TARNAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION "$PACKAGE_VERSION" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_STRING "$PACKAGE_STRING" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" _ACEOF +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + # Let the site file select an alternate cache file if it wants to. -# Prefer explicitly selected file to automatically selected ones. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - set x "$CONFIG_SITE" + ac_site_file1=$CONFIG_SITE elif test "x$prefix" != xNONE; then - set x "$prefix/share/config.site" "$prefix/etc/config.site" + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site else - set x "$ac_default_prefix/share/config.site" \ - "$ac_default_prefix/etc/config.site" + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site fi -shift -for ac_site_file +for ac_site_file in "$ac_site_file1" "$ac_site_file2" do + test "x$ac_site_file" = xNONE && continue if test -r "$ac_site_file"; then - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -echo "$as_me: loading site script $ac_site_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi @@ -1669,16 +2010,16 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1692,68 +2033,56 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; + *) as_fn_append ac_configure_args " '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi - - - - - - - - - - - - - - - - - - - - - - - - +## -------------------- ## +## Main body of script. ## +## -------------------- ## ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -1772,10 +2101,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1785,25 +2114,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -1812,10 +2141,10 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -1825,25 +2154,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -1851,12 +2180,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -1869,10 +2194,10 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1882,25 +2207,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -1909,10 +2234,10 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1923,18 +2248,18 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -1953,11 +2278,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -1968,10 +2293,10 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1981,25 +2306,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2012,10 +2337,10 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -2025,25 +2350,25 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2055,12 +2380,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2070,98 +2391,82 @@ fi fi -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "no acceptable C compiler found in \$PATH +See \`config.log' for more details." "$LINENO" 5; } # Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + rm -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - +#include <stdio.h> int main () { +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; ; return 0; } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe b.out" +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -# -# List of possible output files, starting from the most likely. -# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) -# only as a last resort. b.out is created by i960 compilers. -ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' -# -# The IRIX 6 linker writes into existing files which may not be -# executable, retaining their permissions. Remove them first so a -# subsequent execution test works. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + ac_rmfiles= for ac_file in $ac_files do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; * ) ac_rmfiles="$ac_rmfiles $ac_file";; esac done rm -f $ac_rmfiles -if { (ac_try="$ac_link_default" +if { { ac_try="$ac_link_default" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -2171,14 +2476,14 @@ for ac_file in $ac_files '' do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; [ab].out ) # We found the default executable, but exeext='' is most # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'` fi @@ -2197,78 +2502,75 @@ test "$ac_cv_exeext" = no && ac_cv_exeext= else ac_file='' fi - -{ echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6; } -if test -z "$ac_file"; then - echo "$as_me: failed program was:" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } +if test -z "$ac_file"; then : + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ as_fn_set_status 77 +as_fn_error "C compiler cannot create executables +See \`config.log' for more details." "$LINENO" 5; }; } fi - ac_exeext=$ac_cv_exeext # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (case "(($ac_try" in + { { case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:$LINENO: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run C compiled programs. + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +See \`config.log' for more details." "$LINENO" 5; } fi fi fi -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -rm -f a.out a.exe conftest$ac_cv_exeext b.out +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out ac_clean_files=$ac_clean_files_save # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } -{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6; } - -{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } -if { (ac_try="$ac_link" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } +if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -2276,37 +2578,31 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'` break;; * ) break;; esac done else - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." "$LINENO" 5; } fi - rm -f conftest$ac_cv_exeext -{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } -if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } +if test "${ac_cv_objext+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2318,51 +2614,46 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (ac_try="$ac_compile" +if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.$.*$'` break;; esac done else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot compute suffix of object files: cannot compile +See \`config.log' for more details." "$LINENO" 5; } fi - rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if test "${ac_cv_c_compiler_gnu+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2376,54 +2667,34 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_compiler_gnu=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } -GCC=`test $ac_compiler_gnu = yes && echo yes` +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if test "${ac_cv_prog_cc_g+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2434,34 +2705,11 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2472,35 +2720,12 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_compile "$LINENO"; then : - ac_c_werror_flag=$ac_save_c_werror_flag +else + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2511,42 +2736,18 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -2562,18 +2763,14 @@ else CFLAGS= fi fi -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdarg.h> #include <stdio.h> @@ -2630,31 +2827,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done @@ -2665,17 +2840,19 @@ fi # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; xno) - { echo "$as_me:$LINENO: result: unsupported" >&5 -echo "${ECHO_T}unsupported" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac +if test "x$ac_cv_prog_cc_c89" != xno; then : +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -2683,11 +2860,12 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } -set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF SHELL = /bin/sh @@ -2704,12 +2882,12 @@ esac rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } SET_MAKE= else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -2721,7 +2899,7 @@ fi #locating erlang # Check whether --with-erlang was given. -if test "${with_erlang+set}" = set; then +if test "${with_erlang+set}" = set; then : withval=$with_erlang; fi @@ -2729,10 +2907,10 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}erlc", so it can be a program name with args. set dummy ${ac_tool_prefix}erlc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_ERLC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_ERLC+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $ERLC in [\\/]* | ?:[\\/]*) @@ -2745,14 +2923,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ERLC="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -2760,11 +2938,11 @@ esac fi ERLC=$ac_cv_path_ERLC if test -n "$ERLC"; then - { echo "$as_me:$LINENO: result: $ERLC" >&5 -echo "${ECHO_T}$ERLC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ERLC" >&5 +$as_echo "$ERLC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2773,10 +2951,10 @@ if test -z "$ac_cv_path_ERLC"; then ac_pt_ERLC=$ERLC # Extract the first word of "erlc", so it can be a program name with args. set dummy erlc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_ac_pt_ERLC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_ac_pt_ERLC+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $ac_pt_ERLC in [\\/]* | ?:[\\/]*) @@ -2789,14 +2967,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_ERLC="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -2804,11 +2982,11 @@ esac fi ac_pt_ERLC=$ac_cv_path_ac_pt_ERLC if test -n "$ac_pt_ERLC"; then - { echo "$as_me:$LINENO: result: $ac_pt_ERLC" >&5 -echo "${ECHO_T}$ac_pt_ERLC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_ERLC" >&5 +$as_echo "$ac_pt_ERLC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_pt_ERLC" = x; then @@ -2816,12 +2994,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac ERLC=$ac_pt_ERLC @@ -2833,10 +3007,10 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}erl", so it can be a program name with args. set dummy ${ac_tool_prefix}erl; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_ERL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_ERL+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $ERL in [\\/]* | ?:[\\/]*) @@ -2849,14 +3023,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ERL="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -2864,11 +3038,11 @@ esac fi ERL=$ac_cv_path_ERL if test -n "$ERL"; then - { echo "$as_me:$LINENO: result: $ERL" >&5 -echo "${ECHO_T}$ERL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ERL" >&5 +$as_echo "$ERL" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2877,10 +3051,10 @@ if test -z "$ac_cv_path_ERL"; then ac_pt_ERL=$ERL # Extract the first word of "erl", so it can be a program name with args. set dummy erl; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_ac_pt_ERL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_ac_pt_ERL+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $ac_pt_ERL in [\\/]* | ?:[\\/]*) @@ -2893,14 +3067,14 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_ERL="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -2908,11 +3082,11 @@ esac fi ac_pt_ERL=$ac_cv_path_ac_pt_ERL if test -n "$ac_pt_ERL"; then - { echo "$as_me:$LINENO: result: $ac_pt_ERL" >&5 -echo "${ECHO_T}$ac_pt_ERL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_ERL" >&5 +$as_echo "$ac_pt_ERL" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_pt_ERL" = x; then @@ -2920,12 +3094,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac ERL=$ac_pt_ERL @@ -2936,9 +3106,7 @@ fi if test "z$ERLC" = "z" || test "z$ERL" = "z"; then - { { echo "$as_me:$LINENO: error: erlang not found" >&5 -echo "$as_me: error: erlang not found" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "erlang not found" "$LINENO" 5 fi @@ -2995,21 +3163,15 @@ libpath(App) -> _EOF if ! $ERLC conftest.erl; then - { { echo "$as_me:$LINENO: error: could not compile sample program" >&5 -echo "$as_me: error: could not compile sample program" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "could not compile sample program" "$LINENO" 5 fi if ! $ERL -s conftest -noshell; then - { { echo "$as_me:$LINENO: error: could not run sample program" >&5 -echo "$as_me: error: could not run sample program" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "could not run sample program" "$LINENO" 5 fi if ! test -f conftest.out; then - { { echo "$as_me:$LINENO: error: erlang program was not properly executed, (conftest.out was not produced)" >&5 -echo "$as_me: error: erlang program was not properly executed, (conftest.out was not produced)" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "erlang program was not properly executed, (conftest.out was not produced)" "$LINENO" 5 fi # First line @@ -3035,7 +3197,7 @@ echo "$as_me: error: erlang program was not properly executed, (conftest.out was # Check whether --with-libiconv-prefix was given. -if test "${with_libiconv_prefix+set}" = set; then +if test "${with_libiconv_prefix+set}" = set; then : withval=$with_libiconv_prefix; for dir in `echo "$withval" | tr : ' '`; do if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi @@ -3046,19 +3208,15 @@ if test "${with_libiconv_prefix+set}" = set; then fi - { echo "$as_me:$LINENO: checking for iconv" >&5 -echo $ECHO_N "checking for iconv... $ECHO_C" >&6; } -if test "${am_cv_func_iconv+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 +$as_echo_n "checking for iconv... " >&6; } +if test "${am_cv_func_iconv+set}" = set; then : + $as_echo_n "(cached) " >&6 else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> #include <iconv.h> @@ -3072,42 +3230,15 @@ iconv_t cd = iconv_open("",""); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : am_cv_func_iconv=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test "$am_cv_func_iconv" != yes; then am_save_LIBS="$LIBS" LIBS="$LIBS -liconv" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> #include <iconv.h> @@ -3121,35 +3252,12 @@ iconv_t cd = iconv_open("",""); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : am_cv_lib_iconv=yes am_cv_func_iconv=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS="$am_save_LIBS" fi if test "$am_cv_func_iconv" != yes; then @@ -3159,11 +3267,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ LIBS="$LIBS -liconv" LDFLAGS="$LDFLAGS -L/usr/local/lib" CFLAGS="$CFLAGS -I/usr/local/include" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> #include <iconv.h> @@ -3177,61 +3281,34 @@ iconv_t cd = iconv_open("",""); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : am_cv_lib_iconv=yes am_cv_func_iconv=yes CPPFLAGS="$CPPFLAGS -I/usr/local/include" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - LDFLAGS="$am_save_LDFLAGS" + LDFLAGS="$am_save_LDFLAGS" CFLAGS="$am_save_CFLAGS" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS="$am_save_LIBS" fi fi -{ echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5 -echo "${ECHO_T}$am_cv_func_iconv" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 +$as_echo "$am_cv_func_iconv" >&6; } if test "$am_cv_func_iconv" = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_ICONV 1 -_ACEOF +$as_echo "#define HAVE_ICONV 1" >>confdefs.h - { echo "$as_me:$LINENO: checking for iconv declaration" >&5 -echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6; } - if test "${am_cv_proto_iconv+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5 +$as_echo_n "checking for iconv declaration... " >&6; } + if test "${am_cv_proto_iconv+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> @@ -3254,39 +3331,19 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : am_cv_proto_iconv_arg1="" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - am_cv_proto_iconv_arg1="const" + am_cv_proto_iconv_arg1="const" fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" fi am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - { echo "$as_me:$LINENO: result: ${ac_t:- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:- }$am_cv_proto_iconv" >&5 -echo "${ECHO_T}${ac_t:- +$as_echo "${ac_t:- }$am_cv_proto_iconv" >&6; } cat >>confdefs.h <<_ACEOF @@ -3306,15 +3363,15 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + if test "${ac_cv_prog_CPP+set}" = set; then : + $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" @@ -3328,11 +3385,7 @@ do # <limits.h> exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include <limits.h> @@ -3341,76 +3394,34 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <ac_nonexistent.h> _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then +if $ac_preproc_ok; then : break fi @@ -3422,8 +3433,8 @@ fi else ac_cv_prog_CPP=$CPP fi -{ echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -3433,11 +3444,7 @@ do # <limits.h> exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include <limits.h> @@ -3446,83 +3453,40 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <ac_nonexistent.h> _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : +if $ac_preproc_ok; then : + else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." "$LINENO" 5; } fi ac_ext=c @@ -3532,45 +3496,40 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 -echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } -if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Extract the first word of "grep ggrep" to use in msg output -if test -z "$GREP"; then -set dummy grep ggrep; ac_prog_name=$2 -if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if test "${ac_cv_path_GREP+set}" = set; then : + $as_echo_n "(cached) " >&6 else + if test -z "$GREP"; then ac_path_GREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue - # Check for GNU ac_path_GREP and select it if it is found. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue +# Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in *GNU*) ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; *) ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - echo 'GREP' >> "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_GREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_GREP="$ac_path_GREP" @@ -3582,77 +3541,61 @@ case `"$ac_path_GREP" --version 2>&1` in rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - - $ac_path_GREP_found && break 3 + $ac_path_GREP_found && break 3 + done + done done -done - -done IFS=$as_save_IFS - - -fi - -GREP="$ac_cv_path_GREP" -if test -z "$GREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -fi - + if test -z "$ac_cv_path_GREP"; then + as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi else ac_cv_path_GREP=$GREP fi - fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 -echo "${ECHO_T}$ac_cv_path_GREP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" -{ echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if test "${ac_cv_path_EGREP+set}" = set; then : + $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 then ac_cv_path_EGREP="$GREP -E" else - # Extract the first word of "egrep" to use in msg output -if test -z "$EGREP"; then -set dummy egrep; ac_prog_name=$2 -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else + if test -z "$EGREP"; then ac_path_EGREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue - # Check for GNU ac_path_EGREP and select it if it is found. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue +# Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in *GNU*) ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; *) ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - echo 'EGREP' >> "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_EGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_EGREP="$ac_path_EGREP" @@ -3664,46 +3607,31 @@ case `"$ac_path_EGREP" --version 2>&1` in rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - - $ac_path_EGREP_found && break 3 + $ac_path_EGREP_found && break 3 + done + done done -done - -done IFS=$as_save_IFS - - -fi - -EGREP="$ac_cv_path_EGREP" -if test -z "$EGREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -fi - + if test -z "$ac_cv_path_EGREP"; then + as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi else ac_cv_path_EGREP=$EGREP fi - fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 -echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if test "${ac_cv_header_stdc+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> #include <stdarg.h> @@ -3718,47 +3646,23 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no + ac_cv_header_stdc=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <string.h> _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : + $EGREP "memchr" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -3768,18 +3672,14 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : + $EGREP "free" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -3789,14 +3689,10 @@ fi if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : : else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <ctype.h> #include <stdlib.h> @@ -3823,113 +3719,36 @@ main () return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_run "$LINENO"; then : -( exit $ac_status ) -ac_cv_header_stdc=no +else + ac_cv_header_stdc=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF +$as_echo "#define STDC_HEADERS 1" >>confdefs.h fi # On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - - - - - - - for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Header'}'` = yes; then +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi @@ -3939,7 +3758,7 @@ done # Check whether --with-expat was given. -if test "${with_expat+set}" = set; then +if test "${with_expat+set}" = set; then : withval=$with_expat; fi @@ -3951,18 +3770,14 @@ fi EXPAT_LIBS="-L$with_expat/lib" fi - { echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5 -echo $ECHO_N "checking for XML_ParserCreate in -lexpat... $ECHO_C" >&6; } -if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML_ParserCreate in -lexpat" >&5 +$as_echo_n "checking for XML_ParserCreate in -lexpat... " >&6; } +if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lexpat "$EXPAT_LIBS" $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -3980,39 +3795,18 @@ return XML_ParserCreate (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_expat_XML_ParserCreate=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_expat_XML_ParserCreate=no + ac_cv_lib_expat_XML_ParserCreate=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5 -echo "${ECHO_T}$ac_cv_lib_expat_XML_ParserCreate" >&6; } -if test $ac_cv_lib_expat_XML_ParserCreate = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_expat_XML_ParserCreate" >&5 +$as_echo "$ac_cv_lib_expat_XML_ParserCreate" >&6; } +if test "x$ac_cv_lib_expat_XML_ParserCreate" = x""yes; then : EXPAT_LIBS="$EXPAT_LIBS -lexpat" expat_found=yes else @@ -4020,153 +3814,18 @@ else fi if test $expat_found = no; then - { { echo "$as_me:$LINENO: error: Could not find development files of Expat library" >&5 -echo "$as_me: error: Could not find development files of Expat library" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "Could not find development files of Expat library" "$LINENO" 5 fi expat_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $EXPAT_CFLAGS" expat_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $EXPAT_CFLAGS" - -for ac_header in expat.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## --------------------------------------- ## -## Report this to ejabberd@process-one.net ## -## --------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then + for ac_header in expat.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "expat.h" "ac_cv_header_expat_h" "$ac_includes_default" +if test "x$ac_cv_header_expat_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_EXPAT_H 1 _ACEOF else @@ -4176,9 +3835,7 @@ fi done if test $expat_found = no; then - { { echo "$as_me:$LINENO: error: Could not find expat.h" >&5 -echo "$as_me: error: Could not find expat.h" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "Could not find expat.h" "$LINENO" 5 fi CFLAGS="$expat_save_CFLAGS" CPPFLAGS="$expat_save_CPPFLAGS" @@ -4188,16 +3845,12 @@ echo "$as_me: error: Could not find expat.h" >&2;} # Checks for typedefs, structures, and compiler characteristics. -{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; } -if test "${ac_cv_c_const+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 +$as_echo_n "checking for an ANSI C-conforming const... " >&6; } +if test "${ac_cv_c_const+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4257,40 +3910,18 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_const=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c_const=no + ac_cv_c_const=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 -echo "${ECHO_T}$ac_cv_c_const" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 +$as_echo "$ac_cv_c_const" >&6; } if test $ac_cv_c_const = no; then -cat >>confdefs.h <<\_ACEOF -#define const -_ACEOF +$as_echo "#define const /**/" >>confdefs.h fi @@ -4302,164 +3933,27 @@ fi # Checks for library functions. - for ac_header in stdlib.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## --------------------------------------- ## -## Report this to ejabberd@process-one.net ## -## --------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then +do : + ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" +if test "x$ac_cv_header_stdlib_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_STDLIB_H 1 _ACEOF fi done -{ echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5 -echo $ECHO_N "checking for GNU libc compatible malloc... $ECHO_C" >&6; } -if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5 +$as_echo_n "checking for GNU libc compatible malloc... " >&6; } +if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then : + $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : ac_cv_func_malloc_0_nonnull=no else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #if defined STDC_HEADERS || defined HAVE_STDLIB_H # include <stdlib.h> @@ -4475,52 +3969,24 @@ return ! malloc (0); return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_run "$LINENO"; then : ac_cv_func_malloc_0_nonnull=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_malloc_0_nonnull=no + ac_cv_func_malloc_0_nonnull=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5 -echo "${ECHO_T}$ac_cv_func_malloc_0_nonnull" >&6; } -if test $ac_cv_func_malloc_0_nonnull = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5 +$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; } +if test $ac_cv_func_malloc_0_nonnull = yes; then : -cat >>confdefs.h <<\_ACEOF -#define HAVE_MALLOC 1 -_ACEOF +$as_echo "#define HAVE_MALLOC 1" >>confdefs.h else - cat >>confdefs.h <<\_ACEOF -#define HAVE_MALLOC 0 -_ACEOF + $as_echo "#define HAVE_MALLOC 0" >>confdefs.h case " $LIBOBJS " in *" malloc.$ac_objext "* ) ;; @@ -4529,24 +3995,17 @@ _ACEOF esac -cat >>confdefs.h <<\_ACEOF -#define malloc rpl_malloc -_ACEOF +$as_echo "#define malloc rpl_malloc" >>confdefs.h fi - -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if test "${ac_cv_header_stdc+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> #include <stdarg.h> @@ -4561,47 +4020,23 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no + ac_cv_header_stdc=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <string.h> _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : + $EGREP "memchr" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -4611,18 +4046,14 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : + $EGREP "free" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -4632,14 +4063,10 @@ fi if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : : else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <ctype.h> #include <stdlib.h> @@ -4666,48 +4093,22 @@ main () return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_run "$LINENO"; then : -( exit $ac_status ) -ac_cv_header_stdc=no +else + ac_cv_header_stdc=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF +$as_echo "#define STDC_HEADERS 1" >>confdefs.h fi @@ -4715,10 +4116,10 @@ fi mod_irc= make_mod_irc= -{ echo "$as_me:$LINENO: checking whether build mod_irc" >&5 -echo $ECHO_N "checking whether build mod_irc... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build mod_irc" >&5 +$as_echo_n "checking whether build mod_irc... " >&6; } # Check whether --enable-mod_irc was given. -if test "${enable_mod_irc+set}" = set; then +if test "${enable_mod_irc+set}" = set; then : enableval=$enable_mod_irc; mr_enable_mod_irc="$enableval" else mr_enable_mod_irc=yes @@ -4728,8 +4129,8 @@ if test "$mr_enable_mod_irc" = "yes"; then mod_irc=mod_irc make_mod_irc=mod_irc/Makefile fi -{ echo "$as_me:$LINENO: result: $mr_enable_mod_irc" >&5 -echo "${ECHO_T}$mr_enable_mod_irc" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mr_enable_mod_irc" >&5 +$as_echo "$mr_enable_mod_irc" >&6; } @@ -4737,10 +4138,10 @@ echo "${ECHO_T}$mr_enable_mod_irc" >&6; } mod_muc= make_mod_muc= -{ echo "$as_me:$LINENO: checking whether build mod_muc" >&5 -echo $ECHO_N "checking whether build mod_muc... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build mod_muc" >&5 +$as_echo_n "checking whether build mod_muc... " >&6; } # Check whether --enable-mod_muc was given. -if test "${enable_mod_muc+set}" = set; then +if test "${enable_mod_muc+set}" = set; then : enableval=$enable_mod_muc; mr_enable_mod_muc="$enableval" else mr_enable_mod_muc=yes @@ -4750,8 +4151,8 @@ if test "$mr_enable_mod_muc" = "yes"; then mod_muc=mod_muc make_mod_muc=mod_muc/Makefile fi -{ echo "$as_me:$LINENO: result: $mr_enable_mod_muc" >&5 -echo "${ECHO_T}$mr_enable_mod_muc" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mr_enable_mod_muc" >&5 +$as_echo "$mr_enable_mod_muc" >&6; } @@ -4759,10 +4160,10 @@ echo "${ECHO_T}$mr_enable_mod_muc" >&6; } mod_proxy65= make_mod_proxy65= -{ echo "$as_me:$LINENO: checking whether build mod_proxy65" >&5 -echo $ECHO_N "checking whether build mod_proxy65... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build mod_proxy65" >&5 +$as_echo_n "checking whether build mod_proxy65... " >&6; } # Check whether --enable-mod_proxy65 was given. -if test "${enable_mod_proxy65+set}" = set; then +if test "${enable_mod_proxy65+set}" = set; then : enableval=$enable_mod_proxy65; mr_enable_mod_proxy65="$enableval" else mr_enable_mod_proxy65=yes @@ -4772,8 +4173,8 @@ if test "$mr_enable_mod_proxy65" = "yes"; then mod_proxy65=mod_proxy65 make_mod_proxy65=mod_proxy65/Makefile fi -{ echo "$as_me:$LINENO: result: $mr_enable_mod_proxy65" >&5 -echo "${ECHO_T}$mr_enable_mod_proxy65" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mr_enable_mod_proxy65" >&5 +$as_echo "$mr_enable_mod_proxy65" >&6; } @@ -4781,10 +4182,10 @@ echo "${ECHO_T}$mr_enable_mod_proxy65" >&6; } mod_pubsub= make_mod_pubsub= -{ echo "$as_me:$LINENO: checking whether build mod_pubsub" >&5 -echo $ECHO_N "checking whether build mod_pubsub... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build mod_pubsub" >&5 +$as_echo_n "checking whether build mod_pubsub... " >&6; } # Check whether --enable-mod_pubsub was given. -if test "${enable_mod_pubsub+set}" = set; then +if test "${enable_mod_pubsub+set}" = set; then : enableval=$enable_mod_pubsub; mr_enable_mod_pubsub="$enableval" else mr_enable_mod_pubsub=yes @@ -4794,8 +4195,8 @@ if test "$mr_enable_mod_pubsub" = "yes"; then mod_pubsub=mod_pubsub make_mod_pubsub=mod_pubsub/Makefile fi -{ echo "$as_me:$LINENO: result: $mr_enable_mod_pubsub" >&5 -echo "${ECHO_T}$mr_enable_mod_pubsub" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mr_enable_mod_pubsub" >&5 +$as_echo "$mr_enable_mod_pubsub" >&6; } @@ -4803,10 +4204,10 @@ echo "${ECHO_T}$mr_enable_mod_pubsub" >&6; } eldap= make_eldap= -{ echo "$as_me:$LINENO: checking whether build eldap" >&5 -echo $ECHO_N "checking whether build eldap... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build eldap" >&5 +$as_echo_n "checking whether build eldap... " >&6; } # Check whether --enable-eldap was given. -if test "${enable_eldap+set}" = set; then +if test "${enable_eldap+set}" = set; then : enableval=$enable_eldap; mr_enable_eldap="$enableval" else mr_enable_eldap=yes @@ -4816,8 +4217,8 @@ if test "$mr_enable_eldap" = "yes"; then eldap=eldap make_eldap=eldap/Makefile fi -{ echo "$as_me:$LINENO: result: $mr_enable_eldap" >&5 -echo "${ECHO_T}$mr_enable_eldap" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mr_enable_eldap" >&5 +$as_echo "$mr_enable_eldap" >&6; } @@ -4825,10 +4226,10 @@ echo "${ECHO_T}$mr_enable_eldap" >&6; } odbc= make_odbc= -{ echo "$as_me:$LINENO: checking whether build odbc" >&5 -echo $ECHO_N "checking whether build odbc... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build odbc" >&5 +$as_echo_n "checking whether build odbc... " >&6; } # Check whether --enable-odbc was given. -if test "${enable_odbc+set}" = set; then +if test "${enable_odbc+set}" = set; then : enableval=$enable_odbc; mr_enable_odbc="$enableval" else mr_enable_odbc=no @@ -4838,8 +4239,8 @@ if test "$mr_enable_odbc" = "yes"; then odbc=odbc make_odbc=odbc/Makefile fi -{ echo "$as_me:$LINENO: result: $mr_enable_odbc" >&5 -echo "${ECHO_T}$mr_enable_odbc" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mr_enable_odbc" >&5 +$as_echo "$mr_enable_odbc" >&6; } @@ -4847,10 +4248,10 @@ echo "${ECHO_T}$mr_enable_odbc" >&6; } tls= make_tls= -{ echo "$as_me:$LINENO: checking whether build tls" >&5 -echo $ECHO_N "checking whether build tls... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build tls" >&5 +$as_echo_n "checking whether build tls... " >&6; } # Check whether --enable-tls was given. -if test "${enable_tls+set}" = set; then +if test "${enable_tls+set}" = set; then : enableval=$enable_tls; mr_enable_tls="$enableval" else mr_enable_tls=yes @@ -4860,8 +4261,8 @@ if test "$mr_enable_tls" = "yes"; then tls=tls make_tls=tls/Makefile fi -{ echo "$as_me:$LINENO: result: $mr_enable_tls" >&5 -echo "${ECHO_T}$mr_enable_tls" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mr_enable_tls" >&5 +$as_echo "$mr_enable_tls" >&6; } @@ -4869,10 +4270,10 @@ echo "${ECHO_T}$mr_enable_tls" >&6; } web= make_web= -{ echo "$as_me:$LINENO: checking whether build web" >&5 -echo $ECHO_N "checking whether build web... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build web" >&5 +$as_echo_n "checking whether build web... " >&6; } # Check whether --enable-web was given. -if test "${enable_web+set}" = set; then +if test "${enable_web+set}" = set; then : enableval=$enable_web; mr_enable_web="$enableval" else mr_enable_web=yes @@ -4882,8 +4283,8 @@ if test "$mr_enable_web" = "yes"; then web=web make_web=web/Makefile fi -{ echo "$as_me:$LINENO: result: $mr_enable_web" >&5 -echo "${ECHO_T}$mr_enable_web" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mr_enable_web" >&5 +$as_echo "$mr_enable_web" >&6; } @@ -4892,10 +4293,10 @@ echo "${ECHO_T}$mr_enable_web" >&6; } ejabberd_zlib= make_ejabberd_zlib= -{ echo "$as_me:$LINENO: checking whether build ejabberd_zlib" >&5 -echo $ECHO_N "checking whether build ejabberd_zlib... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build ejabberd_zlib" >&5 +$as_echo_n "checking whether build ejabberd_zlib... " >&6; } # Check whether --enable-ejabberd_zlib was given. -if test "${enable_ejabberd_zlib+set}" = set; then +if test "${enable_ejabberd_zlib+set}" = set; then : enableval=$enable_ejabberd_zlib; mr_enable_ejabberd_zlib="$enableval" else mr_enable_ejabberd_zlib=yes @@ -4905,8 +4306,8 @@ if test "$mr_enable_ejabberd_zlib" = "yes"; then ejabberd_zlib=ejabberd_zlib make_ejabberd_zlib=ejabberd_zlib/Makefile fi -{ echo "$as_me:$LINENO: result: $mr_enable_ejabberd_zlib" >&5 -echo "${ECHO_T}$mr_enable_ejabberd_zlib" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mr_enable_ejabberd_zlib" >&5 +$as_echo "$mr_enable_ejabberd_zlib" >&6; } @@ -4914,7 +4315,7 @@ echo "${ECHO_T}$mr_enable_ejabberd_zlib" >&6; } #locating zlib # Check whether --with-zlib was given. -if test "${with_zlib+set}" = set; then +if test "${with_zlib+set}" = set; then : withval=$with_zlib; fi @@ -4927,18 +4328,14 @@ if test x"$ejabberd_zlib" != x; then ZLIB_LIBS="-L$with_zlib/lib" fi - { echo "$as_me:$LINENO: checking for gzgets in -lz" >&5 -echo $ECHO_N "checking for gzgets in -lz... $ECHO_C" >&6; } -if test "${ac_cv_lib_z_gzgets+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzgets in -lz" >&5 +$as_echo_n "checking for gzgets in -lz... " >&6; } +if test "${ac_cv_lib_z_gzgets+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lz "$ZLIB_LIBS" $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -4956,39 +4353,18 @@ return gzgets (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_z_gzgets=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_z_gzgets=no + ac_cv_lib_z_gzgets=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzgets" >&5 -echo "${ECHO_T}$ac_cv_lib_z_gzgets" >&6; } -if test $ac_cv_lib_z_gzgets = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzgets" >&5 +$as_echo "$ac_cv_lib_z_gzgets" >&6; } +if test "x$ac_cv_lib_z_gzgets" = x""yes; then : ZLIB_LIBS="$ZLIB_LIBS -lz" zlib_found=yes else @@ -4996,153 +4372,18 @@ else fi if test $zlib_found = no; then - { { echo "$as_me:$LINENO: error: Could not find development files of zlib library. Install them or disable \`ejabberd_zlib' with: --disable-ejabberd_zlib" >&5 -echo "$as_me: error: Could not find development files of zlib library. Install them or disable \`ejabberd_zlib' with: --disable-ejabberd_zlib" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "Could not find development files of zlib library. Install them or disable \`ejabberd_zlib' with: --disable-ejabberd_zlib" "$LINENO" 5 fi zlib_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $ZLIB_CFLAGS" zlib_save_CPPFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS" - -for ac_header in zlib.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## --------------------------------------- ## -## Report this to ejabberd@process-one.net ## -## --------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then + for ac_header in zlib.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" +if test "x$ac_cv_header_zlib_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_ZLIB_H 1 _ACEOF else @@ -5152,9 +4393,7 @@ fi done if test $zlib_found = no; then - { { echo "$as_me:$LINENO: error: Could not find zlib.h. Install it or disable \`ejabberd_zlib' with: --disable-ejabberd_zlib" >&5 -echo "$as_me: error: Could not find zlib.h. Install it or disable \`ejabberd_zlib' with: --disable-ejabberd_zlib" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "Could not find zlib.h. Install it or disable \`ejabberd_zlib' with: --disable-ejabberd_zlib" "$LINENO" 5 fi CFLAGS="$zlib_save_CFLAGS" CPPFLAGS="$zlib_save_CPPFLAGS" @@ -5167,10 +4406,10 @@ fi pam= make_pam= -{ echo "$as_me:$LINENO: checking whether build pam" >&5 -echo $ECHO_N "checking whether build pam... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build pam" >&5 +$as_echo_n "checking whether build pam... " >&6; } # Check whether --enable-pam was given. -if test "${enable_pam+set}" = set; then +if test "${enable_pam+set}" = set; then : enableval=$enable_pam; mr_enable_pam="$enableval" else mr_enable_pam=no @@ -5180,8 +4419,8 @@ if test "$mr_enable_pam" = "yes"; then pam=pam make_pam=pam/Makefile fi -{ echo "$as_me:$LINENO: result: $mr_enable_pam" >&5 -echo "${ECHO_T}$mr_enable_pam" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mr_enable_pam" >&5 +$as_echo "$mr_enable_pam" >&6; } @@ -5189,7 +4428,7 @@ echo "${ECHO_T}$mr_enable_pam" >&6; } #locating PAM # Check whether --with-pam was given. -if test "${with_pam+set}" = set; then +if test "${with_pam+set}" = set; then : withval=$with_pam; fi @@ -5201,18 +4440,14 @@ if test x"$pam" != x; then PAM_LIBS="-L$with_pam/lib" fi - { echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5 -echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6; } -if test "${ac_cv_lib_pam_pam_start+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5 +$as_echo_n "checking for pam_start in -lpam... " >&6; } +if test "${ac_cv_lib_pam_pam_start+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lpam "$PAM_LIBS" $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -5230,39 +4465,18 @@ return pam_start (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_pam_pam_start=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_pam_pam_start=no + ac_cv_lib_pam_pam_start=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_start" >&5 -echo "${ECHO_T}$ac_cv_lib_pam_pam_start" >&6; } -if test $ac_cv_lib_pam_pam_start = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_start" >&5 +$as_echo "$ac_cv_lib_pam_pam_start" >&6; } +if test "x$ac_cv_lib_pam_pam_start" = x""yes; then : PAM_LIBS="$PAM_LIBS -lpam" pam_found=yes else @@ -5270,153 +4484,18 @@ else fi if test $pam_found = no; then - { { echo "$as_me:$LINENO: error: Could not find development files of PAM library. Install them or disable \`pam' with: --disable-pam" >&5 -echo "$as_me: error: Could not find development files of PAM library. Install them or disable \`pam' with: --disable-pam" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "Could not find development files of PAM library. Install them or disable \`pam' with: --disable-pam" "$LINENO" 5 fi pam_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $PAM_CFLAGS" pam_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $PAM_CFLAGS" - -for ac_header in security/pam_appl.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## --------------------------------------- ## -## Report this to ejabberd@process-one.net ## -## --------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then + for ac_header in security/pam_appl.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "security/pam_appl.h" "ac_cv_header_security_pam_appl_h" "$ac_includes_default" +if test "x$ac_cv_header_security_pam_appl_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_SECURITY_PAM_APPL_H 1 _ACEOF else @@ -5426,9 +4505,7 @@ fi done if test $pam_found = no; then - { { echo "$as_me:$LINENO: error: Could not find security/pam_appl.h. Install it or disable \`pam' with: --disable-pam" >&5 -echo "$as_me: error: Could not find security/pam_appl.h. Install it or disable \`pam' with: --disable-pam" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "Could not find security/pam_appl.h. Install it or disable \`pam' with: --disable-pam" "$LINENO" 5 fi CFLAGS="$pam_save_CFLAGS" CPPFLAGS="$pam_save_CPPFLAGS" @@ -5439,13 +4516,11 @@ fi # Check whether --enable-hipe was given. -if test "${enable_hipe+set}" = set; then +if test "${enable_hipe+set}" = set; then : enableval=$enable_hipe; case "${enableval}" in yes) hipe=true ;; no) hipe=false ;; - *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-hipe" >&5 -echo "$as_me: error: bad value ${enableval} for --enable-hipe" >&2;} - { (exit 1); exit 1; }; } ;; + *) as_fn_error "bad value ${enableval} for --enable-hipe" "$LINENO" 5 ;; esac else hipe=false @@ -5454,13 +4529,11 @@ fi # Check whether --enable-roster_gateway_workaround was given. -if test "${enable_roster_gateway_workaround+set}" = set; then +if test "${enable_roster_gateway_workaround+set}" = set; then : enableval=$enable_roster_gateway_workaround; case "${enableval}" in yes) roster_gateway_workaround=true ;; no) roster_gateway_workaround=false ;; - *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-roster-gateway-workaround" >&5 -echo "$as_me: error: bad value ${enableval} for --enable-roster-gateway-workaround" >&2;} - { (exit 1); exit 1; }; } ;; + *) as_fn_error "bad value ${enableval} for --enable-roster-gateway-workaround" "$LINENO" 5 ;; esac else roster_gateway_workaround=false @@ -5469,13 +4542,11 @@ fi # Check whether --enable-mssql was given. -if test "${enable_mssql+set}" = set; then +if test "${enable_mssql+set}" = set; then : enableval=$enable_mssql; case "${enableval}" in yes) db_type=mssql ;; no) db_type=generic ;; - *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-mssql" >&5 -echo "$as_me: error: bad value ${enableval} for --enable-mssql" >&2;} - { (exit 1); exit 1; }; } ;; + *) as_fn_error "bad value ${enableval} for --enable-mssql" "$LINENO" 5 ;; esac else db_type=generic @@ -5484,13 +4555,11 @@ fi # Check whether --enable-transient_supervisors was given. -if test "${enable_transient_supervisors+set}" = set; then +if test "${enable_transient_supervisors+set}" = set; then : enableval=$enable_transient_supervisors; case "${enableval}" in yes) transient_supervisors=true ;; no) transient_supervisors=false ;; - *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-full-xml" >&5 -echo "$as_me: error: bad value ${enableval} for --enable-full-xml" >&2;} - { (exit 1); exit 1; }; } ;; + *) as_fn_error "bad value ${enableval} for --enable-full-xml" "$LINENO" 5 ;; esac else transient_supervisors=true @@ -5499,13 +4568,11 @@ fi # Check whether --enable-full_xml was given. -if test "${enable_full_xml+set}" = set; then +if test "${enable_full_xml+set}" = set; then : enableval=$enable_full_xml; case "${enableval}" in yes) full_xml=true ;; no) full_xml=false ;; - *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-full-xml" >&5 -echo "$as_me: error: bad value ${enableval} for --enable-full-xml" >&2;} - { (exit 1); exit 1; }; } ;; + *) as_fn_error "bad value ${enableval} for --enable-full-xml" "$LINENO" 5 ;; esac else full_xml=false @@ -5513,12 +4580,12 @@ fi -ac_config_files="$ac_config_files Makefile $make_mod_irc $make_mod_muc $make_mod_pubsub $make_mod_proxy65 $make_eldap $make_pam $make_web stringprep/Makefile $make_tls $make_odbc $make_ejabberd_zlib" +ac_config_files="$ac_config_files Makefile $make_mod_irc $make_mod_muc $make_mod_pubsub $make_mod_proxy65 $make_eldap $make_pam $make_web stringprep/Makefile stun/Makefile $make_tls $make_odbc $make_ejabberd_zlib" #openssl # Check whether --with-openssl was given. -if test "${with_openssl+set}" = set; then +if test "${with_openssl+set}" = set; then : withval=$with_openssl; fi @@ -5530,18 +4597,14 @@ if test x"$tls" != x; then printf "looking for openssl in $ssl_prefix...\n" SSL_CFLAGS="-I$ssl_prefix/include" SSL_LIBS="-L$ssl_prefix/lib -lcrypto" - { echo "$as_me:$LINENO: checking for SSL_new in -lssl" >&5 -echo $ECHO_N "checking for SSL_new in -lssl... $ECHO_C" >&6; } -if test "${ac_cv_lib_ssl_SSL_new+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_new in -lssl" >&5 +$as_echo_n "checking for SSL_new in -lssl... " >&6; } +if test "${ac_cv_lib_ssl_SSL_new+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lssl $SSL_LIBS $SSL_CFLAGS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -5559,39 +4622,18 @@ return SSL_new (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_ssl_SSL_new=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_ssl_SSL_new=no + ac_cv_lib_ssl_SSL_new=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_new" >&5 -echo "${ECHO_T}$ac_cv_lib_ssl_SSL_new" >&6; } -if test $ac_cv_lib_ssl_SSL_new = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_new" >&5 +$as_echo "$ac_cv_lib_ssl_SSL_new" >&6; } +if test "x$ac_cv_lib_ssl_SSL_new" = x""yes; then : have_openssl=yes else have_openssl=no @@ -5600,145 +4642,12 @@ fi if test x"$have_openssl" = xyes; then save_CPPFLAGS=$CPPFLAGS CPPFLAGS="-I$ssl_prefix/include $CPPFLAGS" - -for ac_header in openssl/ssl.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## --------------------------------------- ## -## Report this to ejabberd@process-one.net ## -## --------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then + for ac_header in openssl/ssl.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default" +if test "x$ac_cv_header_openssl_ssl_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_OPENSSL_SSL_H 1 _ACEOF have_openssl_h=yes fi @@ -5761,9 +4670,7 @@ done fi done if test x${have_openssl} != xyes; then - { { echo "$as_me:$LINENO: error: Could not find development files of OpenSSL library. Install them or disable \`tls' with: --disable-tls" >&5 -echo "$as_me: error: Could not find development files of OpenSSL library. Install them or disable \`tls' with: --disable-tls" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "Could not find development files of OpenSSL library. Install them or disable \`tls' with: --disable-tls" "$LINENO" 5 fi @@ -5783,134 +4690,8 @@ else fi done fi -if test "${ac_cv_header_krb5_h+set}" = set; then - { echo "$as_me:$LINENO: checking for krb5.h" >&5 -echo $ECHO_N "checking for krb5.h... $ECHO_C" >&6; } -if test "${ac_cv_header_krb5_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_krb5_h" >&5 -echo "${ECHO_T}$ac_cv_header_krb5_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking krb5.h usability" >&5 -echo $ECHO_N "checking krb5.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <krb5.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking krb5.h presence" >&5 -echo $ECHO_N "checking krb5.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <krb5.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: krb5.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: krb5.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: krb5.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: krb5.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: krb5.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: krb5.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: krb5.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: krb5.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: krb5.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: krb5.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: krb5.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: krb5.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: krb5.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: krb5.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: krb5.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: krb5.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## --------------------------------------- ## -## Report this to ejabberd@process-one.net ## -## --------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for krb5.h" >&5 -echo $ECHO_N "checking for krb5.h... $ECHO_C" >&6; } -if test "${ac_cv_header_krb5_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_krb5_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_krb5_h" >&5 -echo "${ECHO_T}$ac_cv_header_krb5_h" >&6; } +ac_fn_c_check_header_mongrel "$LINENO" "krb5.h" "ac_cv_header_krb5_h" "$ac_includes_default" +if test "x$ac_cv_header_krb5_h" = x""yes; then : fi @@ -5918,7 +4699,7 @@ fi ENABLEUSER="" # Check whether --enable-user was given. -if test "${enable_user+set}" = set; then +if test "${enable_user+set}" = set; then : enableval=$enable_user; case "${enableval}" in yes) ENABLEUSER=`whoami` ;; no) ENABLEUSER="" ;; @@ -5959,12 +4740,13 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( - *) $as_unset $ac_var ;; + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -5972,8 +4754,8 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1='\\2'/p" @@ -5996,12 +4778,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then test "x$cache_file" != "x/dev/null" && - { echo "$as_me:$LINENO: updating cache $cache_file" >&5 -echo "$as_me: updating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -echo "$as_me: not updating unwritable cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -6018,6 +4800,12 @@ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' # take arguments), then branch to the quote section. Otherwise, # look for a macro that doesn't take arguments. ac_script=' +:mline +/\\$/{ + N + s,\\\n,, + b mline +} t clear :clear s/^[ ]*#[ ]*define[ ][ ]*$[^ (][^ (]*([^)]*)$[ ]*$.*$/-D\1=\2/g @@ -6047,11 +4835,11 @@ ac_ltlibobjs= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`echo "$ac_i" | sed "$ac_script"` + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs @@ -6060,11 +4848,13 @@ LTLIBOBJS=$ac_ltlibobjs : ${CONFIG_STATUS=./config.status} +ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -6074,59 +4864,79 @@ cat >$CONFIG_STATUS <<_ACEOF debug=false ac_cs_recheck=false ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' else - PATH_SEPARATOR=: + as_echo_body='eval expr "X$1" : "X\$.*\$"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\$.*\$$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;; + esac; + expr "X$arg" : "X\$.*\$" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' fi - rm -f conf$$.sh + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi @@ -6135,20 +4945,18 @@ fi # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) -as_nl=' -' IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -6159,32 +4967,111 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' PS4='+ ' # NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with status $?, using 1 if that was 0. +as_fn_error () +{ + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 fi -done + $as_echo "$as_me: error: $1" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + -# Required to use basename. if expr a : '$a$' >/dev/null 2>&1 && test "X`expr 00001 : '.*$...$'`" = X001; then as_expr=expr @@ -6198,13 +5085,17 @@ else as_basename=false fi +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi -# Name of the executable. as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \ X"$0" : 'X$//$$' \| \ X"$0" : 'X$/$' \| . 2>/dev/null || -echo X/"$0" | +$as_echo X/"$0" | sed '/^.*\/$[^/][^/]*$\/*$/{ s//\1/ q @@ -6219,104 +5110,103 @@ echo X/"$0" | } s/.*/./; q'` -# CDPATH. -$as_unset CDPATH - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO$[^'$as_cr_alnum'_].*\n$$.*$/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; *) ECHO_N='-n';; esac -if expr a : '$a$' >/dev/null 2>&1 && - test "X`expr 00001 : '.*$...$'`" = X001; then - as_expr=expr -else - as_expr=false -fi - rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir - mkdir conf$$.dir -fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + fi else as_ln_s='cp -p' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X$//$[^/]' \| \ + X"$as_dir" : 'X$//$$' \| \ + X"$as_dir" : 'X$/$' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X$\/\/$[^/].*/{ + s//\1/ + q + } + /^X$\/\/$$/{ + s//\1/ + q + } + /^X$\/$.*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + + +} # as_fn_mkdir_p if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -6333,12 +5223,12 @@ else as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else - case $1 in - -*)set "./$1";; + case $1 in #( + -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -6353,13 +5243,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 -# Save the log message, to keep $[0] and so on meaningful, and to +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" This file was extended by ejabberd.erl $as_me version, which was -generated by GNU Autoconf 2.61. Invocation command line was +generated by GNU Autoconf 2.64. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -6372,50 +5268,58 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q` _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +case $ac_config_files in *" +"*) set x $ac_config_files; shift; ac_config_files=$*;; +esac + + + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. config_files="$ac_config_files" _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. -Usage: $0 [OPTIONS] [FILE]... +Usage: $0 [OPTION]... [TAG]... -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit - -q, --quiet do not print progress messages + -q, --quiet, --silent + do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE Configuration files: $config_files -Report bugs to <bug-autoconf@gnu.org>." +Report bugs to <ejabberd@process-one.net>." _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ ejabberd.erl config.status version -configured by $0, generated by GNU Autoconf 2.61, - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.64, + with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2006 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." ac_pwd='$ac_pwd' srcdir='$srcdir' +test -n "\$AWK" || AWK=awk _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# The default lists apply if the user does not specify any file. ac_need_defaults=: while test $# != 0 do @@ -6437,25 +5341,27 @@ do -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - echo "$ac_cs_version"; exit ;; + $as_echo "$ac_cs_version"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; --he | --h | --help | --hel | -h ) - echo "$ac_cs_usage"; exit ;; + $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; # This is an error. - -*) { echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; + -*) as_fn_error "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; - *) ac_config_targets="$ac_config_targets $1" + *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; esac @@ -6470,30 +5376,32 @@ if $ac_cs_silent; then fi _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - CONFIG_SHELL=$SHELL + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' export CONFIG_SHELL - exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + exec "\$@" fi _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 exec 5>>config.log { echo sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - echo "$ac_log" + $as_echo "$ac_log" } >&5 _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # Handling of arguments. for ac_config_target in $ac_config_targets @@ -6508,13 +5416,12 @@ do "$make_pam") CONFIG_FILES="$CONFIG_FILES $make_pam" ;; "$make_web") CONFIG_FILES="$CONFIG_FILES $make_web" ;; "stringprep/Makefile") CONFIG_FILES="$CONFIG_FILES stringprep/Makefile" ;; + "stun/Makefile") CONFIG_FILES="$CONFIG_FILES stun/Makefile" ;; "$make_tls") CONFIG_FILES="$CONFIG_FILES $make_tls" ;; "$make_odbc") CONFIG_FILES="$CONFIG_FILES $make_odbc" ;; "$make_ejabberd_zlib") CONFIG_FILES="$CONFIG_FILES $make_ejabberd_zlib" ;; - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; + *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -6539,7 +5446,7 @@ $debug || trap 'exit_status=$? { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 + trap 'as_fn_exit 1' 1 2 13 15 } # Create a (secure) tmp directory for tmp files. @@ -6550,157 +5457,140 @@ $debug || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || -{ - echo "$me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} +} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 -# -# Set up the sed scripts for CONFIG_FILES section. -# - -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. if test -n "$CONFIG_FILES"; then -_ACEOF +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\r' +else + ac_cs_awk_cr=$ac_cr +fi + +echo 'BEGIN {' >"$tmp/subs1.awk" && +_ACEOF +{ + echo "cat >conf$$subs.awk <<_ACEOF" && + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" +} >conf$$subs.sh || + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -SHELL!$SHELL$ac_delim -PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim -PACKAGE_NAME!$PACKAGE_NAME$ac_delim -PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim -PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim -PACKAGE_STRING!$PACKAGE_STRING$ac_delim -PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim -exec_prefix!$exec_prefix$ac_delim -prefix!$prefix$ac_delim -program_transform_name!$program_transform_name$ac_delim -bindir!$bindir$ac_delim -sbindir!$sbindir$ac_delim -libexecdir!$libexecdir$ac_delim -datarootdir!$datarootdir$ac_delim -datadir!$datadir$ac_delim -sysconfdir!$sysconfdir$ac_delim -sharedstatedir!$sharedstatedir$ac_delim -localstatedir!$localstatedir$ac_delim -includedir!$includedir$ac_delim -oldincludedir!$oldincludedir$ac_delim -docdir!$docdir$ac_delim -infodir!$infodir$ac_delim -htmldir!$htmldir$ac_delim -dvidir!$dvidir$ac_delim -pdfdir!$pdfdir$ac_delim -psdir!$psdir$ac_delim -libdir!$libdir$ac_delim -localedir!$localedir$ac_delim -mandir!$mandir$ac_delim -DEFS!$DEFS$ac_delim -ECHO_C!$ECHO_C$ac_delim -ECHO_N!$ECHO_N$ac_delim -ECHO_T!$ECHO_T$ac_delim -LIBS!$LIBS$ac_delim -build_alias!$build_alias$ac_delim -host_alias!$host_alias$ac_delim -target_alias!$target_alias$ac_delim -CC!$CC$ac_delim -CFLAGS!$CFLAGS$ac_delim -LDFLAGS!$LDFLAGS$ac_delim -CPPFLAGS!$CPPFLAGS$ac_delim -ac_ct_CC!$ac_ct_CC$ac_delim -EXEEXT!$EXEEXT$ac_delim -OBJEXT!$OBJEXT$ac_delim -SET_MAKE!$SET_MAKE$ac_delim -ERLC!$ERLC$ac_delim -ERL!$ERL$ac_delim -ERLANG_CFLAGS!$ERLANG_CFLAGS$ac_delim -ERLANG_LIBS!$ERLANG_LIBS$ac_delim -ERLANG_SSL39!$ERLANG_SSL39$ac_delim -LIBICONV!$LIBICONV$ac_delim -CPP!$CPP$ac_delim -GREP!$GREP$ac_delim -EGREP!$EGREP$ac_delim -EXPAT_CFLAGS!$EXPAT_CFLAGS$ac_delim -EXPAT_LIBS!$EXPAT_LIBS$ac_delim -LIBOBJS!$LIBOBJS$ac_delim -mod_irc!$mod_irc$ac_delim -make_mod_irc!$make_mod_irc$ac_delim -mod_muc!$mod_muc$ac_delim -make_mod_muc!$make_mod_muc$ac_delim -mod_proxy65!$mod_proxy65$ac_delim -make_mod_proxy65!$make_mod_proxy65$ac_delim -mod_pubsub!$mod_pubsub$ac_delim -make_mod_pubsub!$make_mod_pubsub$ac_delim -eldap!$eldap$ac_delim -make_eldap!$make_eldap$ac_delim -odbc!$odbc$ac_delim -make_odbc!$make_odbc$ac_delim -tls!$tls$ac_delim -make_tls!$make_tls$ac_delim -web!$web$ac_delim -make_web!$make_web$ac_delim -ejabberd_zlib!$ejabberd_zlib$ac_delim -make_ejabberd_zlib!$make_ejabberd_zlib$ac_delim -ZLIB_CFLAGS!$ZLIB_CFLAGS$ac_delim -ZLIB_LIBS!$ZLIB_LIBS$ac_delim -pam!$pam$ac_delim -make_pam!$make_pam$ac_delim -PAM_CFLAGS!$PAM_CFLAGS$ac_delim -PAM_LIBS!$PAM_LIBS$ac_delim -hipe!$hipe$ac_delim -roster_gateway_workaround!$roster_gateway_workaround$ac_delim -db_type!$db_type$ac_delim -transient_supervisors!$transient_supervisors$ac_delim -full_xml!$full_xml$ac_delim -SSL_LIBS!$SSL_LIBS$ac_delim -SSL_CFLAGS!$SSL_CFLAGS$ac_delim -INSTALLUSER!$INSTALLUSER$ac_delim -LTLIBOBJS!$LTLIBOBJS$ac_delim -_ACEOF + . ./conf$$subs.sh || + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi done +rm -f conf$$subs.sh + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +_ACEOF +sed -n ' +h +s/^/S["/; s/!.*/"]=/ +p +g +s/^[^!]*!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/$.\{148\}$.*/\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/$.\{148\}$.*/\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' <conf$$subs.awk | sed ' +/^[^""]/{ + N + s/\n// +} +' >>$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK +cat >>"\$tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "*" -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` -fi +} +{ + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end + print line +} + +_ACAWK _ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS <conf$$subs.sed -rm -f conf$$subs.sed -cat >>$CONFIG_STATUS <<_ACEOF -:end -s/|#_!!_#|//g -CEOF$ac_eof +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ + || as_fn_error "could not setup config files machinery" "$LINENO" 5 _ACEOF - # VPATH may cause trouble with some makes, so we remove $(srcdir), # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty @@ -6716,20 +5606,20 @@ s/^[^=]*=[ ]*$// }' fi -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 fi # test -n "$CONFIG_FILES" -for ac_tag in :F $CONFIG_FILES +eval set X " :F $CONFIG_FILES " +shift +for ac_tag do case $ac_tag in :[FHLC]) ac_mode=$ac_tag; continue;; esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 -echo "$as_me: error: Invalid tag $ac_tag." >&2;} - { (exit 1); exit 1; }; };; + :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -6757,26 +5647,34 @@ echo "$as_me: error: Invalid tag $ac_tag." >&2;} [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; + as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac - ac_file_inputs="$ac_file_inputs $ac_f" + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" done # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ - configure_input="Generated from "`IFS=: - echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." + configure_input='Generated from '` + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) + ac_sed_conf_input=`$as_echo "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin";; + *:-:* | *:-) cat >"$tmp/stdin" \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -6786,7 +5684,7 @@ $as_expr X"$ac_file" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X$//$[^/]' \| \ X"$ac_file" : 'X$//$$' \| \ X"$ac_file" : 'X$/$' \| . 2>/dev/null || -echo X"$ac_file" | +$as_echo X"$ac_file" | sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -6804,55 +5702,15 @@ echo X"$ac_file" | q } s/.*/./; q'` - { as_dir="$ac_dir" - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X$//$[^/]' \| \ - X"$as_dir" : 'X$//$$' \| \ - X"$as_dir" : 'X$/$' \| . 2>/dev/null || -echo X"$as_dir" | - sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X$\/\/$[^/].*/{ - s//\1/ - q - } - /^X$\/\/$$/{ - s//\1/ - q - } - /^X$\/$.*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir="$ac_dir"; as_fn_mkdir_p ac_builddir=. case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -6888,12 +5746,12 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # If the template does not know about datarootdir, expand it. # FIXME: This hack should be removed a few years after 2.60. ac_datarootdir_hack=; ac_datarootdir_seen= - -case `sed -n '/datarootdir/ { +ac_sed_dataroot=' +/datarootdir/ { p q } @@ -6901,36 +5759,37 @@ case `sed -n '/datarootdir/ { /@docdir@/p /@infodir@/p /@localedir@/p -/@mandir@/p -' $ac_file_inputs` in +/@mandir@/p' +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' s&@datadir@&$datadir&g s&@docdir@&$docdir&g s&@infodir@&$infodir&g s&@localedir@&$localedir&g s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; + s&\\\${datarootdir}&$datarootdir&g' ;; esac _ACEOF # Neutralize VPATH when `$srcdir' = `.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? -cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_sed_extra="$ac_vpsub $extrasub _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s&@configure_input@&$configure_input&;t t +s|@configure_input@|$ac_sed_conf_input|;t t s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t s&@srcdir@&$ac_srcdir&;t t s&@abs_srcdir@&$ac_abs_srcdir&;t t s&@top_srcdir@&$ac_top_srcdir&;t t @@ -6939,21 +5798,24 @@ s&@builddir@&$ac_builddir&;t t s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t $ac_datarootdir_hack -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out +" +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&5 -echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&2;} rm -f "$tmp/stdin" case $ac_file in - -) cat "$tmp/out"; rm -f "$tmp/out";; - *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; - esac + -) cat "$tmp/out" && rm -f "$tmp/out";; + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + esac \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; @@ -6963,11 +5825,13 @@ which seems to be undefined. Please make sure it is defined." >&2;} done # for ac_tag -{ (exit 0); exit 0; } +as_fn_exit 0 _ACEOF -chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save +test $ac_write_fail = 0 || + as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. @@ -6987,6 +5851,10 @@ if test "$no_create" != yes; then exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } + $ac_cs_success || as_fn_exit $? +fi +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi src/configure @@ -103,6 +103,7 @@ AC_CONFIG_FILES([Makefile $make_pam $make_web stringprep/Makefile + stun/Makefile $make_tls $make_odbc $make_ejabberd_zlib]) src/configure.ac @@ -149,10 +149,15 @@ %% } %% ]}, + %% + %% ejabberd_stun: Handles STUN Binding requests + %% + %%{{3478, udp}, ejabberd_stun, []}, + {5280, ejabberd_http, [ %%{request_handlers, %% [ - %% {["pub", "archive"], mod_http_fileserver}, + %% {["pub", "archive"], mod_http_fileserver} %% ]}, captcha, http_bind, @@ -496,6 +501,7 @@ ]}, %%{mod_muc_log,[]}, {mod_offline, [{access_max_user_messages, max_user_offline_messages}]}, + {mod_ping, []}, {mod_privacy, []}, {mod_private, []}, %%{mod_proxy65,[]}, @@ -503,7 +509,7 @@ {access_createnode, pubsub_createnode}, {pep_sendlast_offline, false}, {last_item_cache, false}, - {plugins, ["flat", "pep"]} % pep requires mod_caps + {plugins, ["flat", "hometree", "pep"]} % pep requires mod_caps ]}, {mod_register, [ %% src/ejabberd.cfg.example @@ -33,15 +33,15 @@ %% Accounts register/3, unregister/2, registered_users/1, - %% Migration + %% Migration jabberd1.4 import_file/1, import_dir/1, %% Purge DB delete_expired_messages/0, delete_old_messages/1, %% Mnesia backup_mnesia/1, restore_mnesia/1, - dump_mnesia/1, load_mnesia/1, + dump_mnesia/1, dump_table/2, load_mnesia/1, install_fallback_mnesia/1, - dump_to_textfile/1, + dump_to_textfile/1, dump_to_textfile/2, mnesia_change_nodename/4, restore/1 % Still used by some modules ]). @@ -79,6 +79,14 @@ commands() -> desc = "Reopen the log files", module = ?MODULE, function = reopen_log, args = [], result = {res, rescode}}, + #ejabberd_commands{name = get_loglevel, tags = [logs, server], + desc = "Get the current loglevel", + module = ejabberd_loglevel, function = get, + args = [], + result = {leveltuple, {tuple, [{levelnumber, integer}, + {levelatom, atom}, + {leveldesc, string} + ]}}}, #ejabberd_commands{name = register, tags = [accounts], desc = "Register a user", @@ -101,11 +109,24 @@ commands() -> module = ?MODULE, function = import_file, args = [{file, string}], result = {res, restuple}}, #ejabberd_commands{name = import_dir, tags = [mnesia], - desc = "Import user data from jabberd14 spool dir", + desc = "Import users data from jabberd14 spool dir", module = ?MODULE, function = import_dir, args = [{file, string}], result = {res, restuple}}, + #ejabberd_commands{name = import_piefxis, tags = [mnesia], + desc = "Import users data from a PIEFXIS file (XEP-0227)", + module = ejabberd_piefxis, function = import_file, + args = [{file, string}], result = {res, rescode}}, + #ejabberd_commands{name = export_piefxis, tags = [mnesia], + desc = "Export data of all users in the server to PIEFXIS files (XEP-0227)", + module = ejabberd_piefxis, function = export_server, + args = [{dir, string}], result = {res, rescode}}, + #ejabberd_commands{name = export_piefxis_host, tags = [mnesia], + desc = "Export data of users in a host to PIEFXIS files (XEP-0227)", + module = ejabberd_piefxis, function = export_host, + args = [{dir, string}, {host, string}], result = {res, rescode}}, + #ejabberd_commands{name = delete_expired_messages, tags = [purge], desc = "Delete expired offline messages from database", module = ?MODULE, function = delete_expired_messages, @@ -133,6 +154,10 @@ commands() -> desc = "Dump the database to text file", module = ?MODULE, function = dump_mnesia, args = [{file, string}], result = {res, restuple}}, + #ejabberd_commands{name = dump_table, tags = [mnesia], + desc = "Dump a table to text file", + module = ?MODULE, function = dump_table, + args = [{file, string}, {table, string}], result = {res, restuple}}, #ejabberd_commands{name = load, tags = [mnesia], desc = "Restore the database from text file", module = ?MODULE, function = load_mnesia, @@ -320,8 +345,28 @@ module_tables(mod_shared_roster) -> [sr_group, sr_user]; module_tables(mod_vcard) -> [vcard, vcard_search]; module_tables(_Other) -> []. +get_local_tables() -> + Tabs1 = lists:delete(schema, mnesia:system_info(local_tables)), + Tabs = lists:filter( + fun(T) -> + case mnesia:table_info(T, storage_type) of + disc_copies -> true; + disc_only_copies -> true; + _ -> false + end + end, Tabs1), + Tabs. + dump_mnesia(Path) -> - case dump_to_textfile(Path) of + Tabs = get_local_tables(), + dump_tables(Path, Tabs). + +dump_table(Path, STable) -> + Table = list_to_atom(STable), + dump_tables(Path, [Table]). + +dump_tables(Path, Tables) -> + case dump_to_textfile(Path, Tables) of ok -> {ok, ""}; {error, Reason} -> @@ -331,17 +376,12 @@ dump_mnesia(Path) -> end. dump_to_textfile(File) -> - dump_to_textfile(mnesia:system_info(is_running), file:open(File, [write])). -dump_to_textfile(yes, {ok, F}) -> - Tabs1 = lists:delete(schema, mnesia:system_info(local_tables)), - Tabs = lists:filter( - fun(T) -> - case mnesia:table_info(T, storage_type) of - disc_copies -> true; - disc_only_copies -> true; - _ -> false - end - end, Tabs1), + Tabs = get_local_tables(), + dump_to_textfile(File, Tabs). + +dump_to_textfile(File, Tabs) -> + dump_to_textfile(mnesia:system_info(is_running), Tabs, file:open(File, [write])). +dump_to_textfile(yes, Tabs, {ok, F}) -> Defs = lists:map( fun(T) -> {T, [{record_name, mnesia:table_info(T, record_name)}, {attributes, mnesia:table_info(T, attributes)}]} @@ -350,10 +390,10 @@ dump_to_textfile(yes, {ok, F}) -> io:format(F, "~p.~n", [{tables, Defs}]), lists:foreach(fun(T) -> dump_tab(F, T) end, Tabs), file:close(F); -dump_to_textfile(_, {ok, F}) -> +dump_to_textfile(_, _, {ok, F}) -> file:close(F), {error, mnesia_not_running}; -dump_to_textfile(_, {error, Reason}) -> +dump_to_textfile(_, _, {error, Reason}) -> {error, Reason}. dump_tab(F, T) -> src/ejabberd_admin.erl @@ -84,7 +84,7 @@ check_password(User, Server, Password) -> end. %% @doc Check if the user and password can login in server. -%% @spec (User::string(), Server::string(), Password::string() +%% @spec (User::string(), Server::string(), Password::string(), %% Digest::string(), DigestGen::function()) -> %% true | false check_password(User, Server, Password, Digest, DigestGen) -> src/ejabberd_auth.erl @@ -49,16 +49,27 @@ -include("ejabberd.hrl"). -record(passwd, {us, password}). +-record(reg_users_counter, {vhost, count}). %%%---------------------------------------------------------------------- %%% API %%%---------------------------------------------------------------------- -start(_Host) -> +start(Host) -> mnesia:create_table(passwd, [{disc_copies, [node()]}, {attributes, record_info(fields, passwd)}]), + mnesia:create_table(reg_users_counter, + [{ram_copies, [node()]}, + {attributes, record_info(fields, reg_users_counter)}]), update_table(), + update_reg_users_counter_table(Host), ok. +update_reg_users_counter_table(Server) -> + Set = get_vh_registered_users(Server), + Size = length(Set), + LServer = jlib:nameprep(Server), + set_vh_registered_users_counter(LServer, Size). + plain_password_required() -> false. @@ -126,6 +137,7 @@ try_register(User, Server, Password) -> [] -> mnesia:write(#passwd{us = US, password = Password}), + inc_vh_registered_users_counter(LServer), ok; [_E] -> exists @@ -193,8 +205,17 @@ get_vh_registered_users(Server, _) -> get_vh_registered_users(Server). get_vh_registered_users_number(Server) -> - Set = get_vh_registered_users(Server), - length(Set). + LServer = jlib:nameprep(Server), + Query = mnesia:dirty_select( + reg_users_counter, + [{#reg_users_counter{vhost = LServer, count = '$1'}, + [], + ['$1']}]), + case Query of + [Count] -> + Count; + _ -> 0 + end. get_vh_registered_users_number(Server, [{prefix, Prefix}]) when is_list(Prefix) -> Set = [{U, S} || {U, S} <- get_vh_registered_users(Server), lists:prefix(Prefix, U)], @@ -203,6 +224,40 @@ get_vh_registered_users_number(Server, [{prefix, Prefix}]) when is_list(Prefix) get_vh_registered_users_number(Server, _) -> get_vh_registered_users_number(Server). +inc_vh_registered_users_counter(LServer) -> + F = fun() -> + case mnesia:wread({reg_users_counter, LServer}) of + [C] -> + Count = C#reg_users_counter.count + 1, + C2 = C#reg_users_counter{count = Count}, + mnesia:write(C2); + _ -> + mnesia:write(#reg_users_counter{vhost = LServer, + count = 1}) + end + end, + mnesia:sync_dirty(F). + +dec_vh_registered_users_counter(LServer) -> + F = fun() -> + case mnesia:wread({reg_users_counter, LServer}) of + [C] -> + Count = C#reg_users_counter.count - 1, + C2 = C#reg_users_counter{count = Count}, + mnesia:write(C2); + _ -> + error + end + end, + mnesia:sync_dirty(F). + +set_vh_registered_users_counter(LServer, Count) -> + F = fun() -> + mnesia:write(#reg_users_counter{vhost = LServer, + count = Count}) + end, + mnesia:sync_dirty(F). + get_password(User, Server) -> LUser = jlib:nodeprep(User), LServer = jlib:nameprep(Server), @@ -247,7 +302,8 @@ remove_user(User, Server) -> LServer = jlib:nameprep(Server), US = {LUser, LServer}, F = fun() -> - mnesia:delete({passwd, US}) + mnesia:delete({passwd, US}), + dec_vh_registered_users_counter(LServer) end, mnesia:transaction(F), ok. @@ -262,6 +318,7 @@ remove_user(User, Server, Password) -> case mnesia:read({passwd, US}) of [#passwd{password = Password}] -> mnesia:delete({passwd, US}), + dec_vh_registered_users_counter(LServer), ok; [_] -> not_allowed; src/ejabberd_auth_internal.erl @@ -32,6 +32,7 @@ %% External exports -export([start/2, + stop/1, start_link/2, send_text/2, send_element/2, @@ -151,6 +152,9 @@ socket_type() -> get_presence(FsmRef) -> gen_fsm:sync_send_all_state_event(FsmRef, {get_presence}, 1000). +stop(FsmRef) -> + gen_fsm:send_event(FsmRef, closed). + %%%---------------------------------------------------------------------- %%% Callback functions from gen_fsm %%%---------------------------------------------------------------------- @@ -322,13 +326,15 @@ wait_for_stream({xmlstreamstart, _Name, Attrs}, StateData) -> _ -> case StateData#state.resource of "" -> + RosterVersioningFeature = ejabberd_hooks:run_fold(roster_get_versioning_feature, Server, [], [Server]), + StreamFeatures = [{xmlelement, "bind", + [{"xmlns", ?NS_BIND}], []}, + {xmlelement, "session", + [{"xmlns", ?NS_SESSION}], []} | RosterVersioningFeature], send_element( StateData, {xmlelement, "stream:features", [], - [{xmlelement, "bind", - [{"xmlns", ?NS_BIND}], []}, - {xmlelement, "session", - [{"xmlns", ?NS_SESSION}], []}]}), + StreamFeatures}), fsm_next_state(wait_for_bind, StateData#state{ server = Server, @@ -1441,7 +1447,13 @@ process_presence_probe(From, To, StateData) -> andalso ?SETS:is_element(LFrom, StateData#state.pres_a), if Cond1 -> - Packet = StateData#state.pres_last, + Timestamp = StateData#state.pres_timestamp, + Packet = xml:append_subtags( + StateData#state.pres_last, + %% To is the one sending the presence (the target of the probe) + [jlib:timestamp_to_xml(Timestamp, utc, To, ""), + %% TODO: Delete the next line once XEP-0091 is Obsolete + jlib:timestamp_to_xml(Timestamp)]), case ejabberd_hooks:run_fold( privacy_check_packet, StateData#state.server, allow, @@ -1495,6 +1507,7 @@ presence_update(From, Packet, StateData) -> presence_broadcast(StateData, From, StateData#state.pres_a, Packet), presence_broadcast(StateData, From, StateData#state.pres_i, Packet), StateData#state{pres_last = undefined, + pres_timestamp = undefined, pres_a = ?SETS:new(), pres_i = ?SETS:new(), pres_invis = false}; @@ -1511,6 +1524,7 @@ presence_update(From, Packet, StateData) -> StateData#state.pres_i, Packet), S1 = StateData#state{pres_last = undefined, + pres_timestamp = undefined, pres_a = ?SETS:new(), pres_i = ?SETS:new(), pres_invis = true}, @@ -1539,6 +1553,7 @@ presence_update(From, Packet, StateData) -> get_priority_from_presence(OldPresence) end, NewPriority = get_priority_from_presence(Packet), + Timestamp = calendar:now_to_universal_time(now()), update_priority(NewPriority, Packet, StateData), FromUnavail = (StateData#state.pres_last == undefined) or StateData#state.pres_invis, @@ -1557,7 +1572,8 @@ presence_update(From, Packet, StateData) -> end, presence_broadcast_first( From, StateData#state{pres_last = Packet, - pres_invis = false + pres_invis = false, + pres_timestamp = Timestamp }, Packet); true -> presence_broadcast_to_trusted(StateData, @@ -1571,7 +1587,8 @@ presence_update(From, Packet, StateData) -> ok end, StateData#state{pres_last = Packet, - pres_invis = false + pres_invis = false, + pres_timestamp = Timestamp } end, NewState src/ejabberd_c2s.erl @@ -239,7 +239,10 @@ process(_Handlers, #request{method='POST', q=Q, lang=Lang, path=[_, Id]}) -> ejabberd_web:error(not_allowed); captcha_not_found -> ejabberd_web:error(not_found) - end. + end; + +process(_Handlers, _Request) -> + ejabberd_web:error(not_found). %%==================================================================== src/ejabberd_captcha.erl @@ -238,7 +238,7 @@ register_commands(Commands) -> true -> ok; false -> - ?WARNING_MSG("This command is already defined:~n~p", [Command]) + ?DEBUG("This command is already defined:~n~p", [Command]) end end, Commands). @@ -290,12 +290,12 @@ get_command_definition(Name) -> execute_command(Name, Arguments) -> execute_command([], noauth, Name, Arguments). -%% @spec (AccessCommands, AuthList, Name::atom(), Arguments) -> ResultTerm | {error, Error} +%% @spec (AccessCommands, Auth, Name::atom(), Arguments) -> ResultTerm | {error, Error} %% where %% AccessCommands = [{Access, CommandNames, Arguments}] -%% Auth = {user, string()}, {server, string()}, {password, string()} | noauth +%% Auth = {User::string(), Server::string(), Password::string()} | noauth %% Method = atom() -%% Arguments = [...] +%% Arguments = [any()] %% Error = command_unknown | account_unprivileged | invalid_account_data | no_auth_provided execute_command(AccessCommands, Auth, Name, Arguments) -> case ets:lookup(ejabberd_commands, Name) of @@ -346,14 +346,15 @@ get_tags_commands() -> %% Access verification %% ----------------------------- -%% At least one AccessCommand must be satisfied %% @spec (AccessCommands, Auth, Method, Command, Arguments) -> ok %% where %% AccessCommands = [ {Access, CommandNames, Arguments} ] -%% Auth = {User::string(), Server::string(), Password::string()} +%% Auth = {User::string(), Server::string(), Password::string()} | noauth %% Method = atom() -%% Arguments = [...] -%% It may throw {error, Error} where +%% Arguments = [any()] +%% @doc Check access is allowed to that command. +%% At least one AccessCommand must be satisfied. +%% It may throw {error, Error} where: %% Error = account_unprivileged | invalid_account_data | no_auth_provided check_access_commands([], _Auth, _Method, _Command, _Arguments) -> ok; src/ejabberd_commands.erl @@ -331,9 +331,9 @@ process_term(Term, State) -> Listeners2 = lists:map( fun({PortIP, Module, Opts}) -> - {Port, IPT, _, _, OptsClean} = + {Port, IPT, _, _, Proto, OptsClean} = ejabberd_listener:parse_listener_portip(PortIP, Opts), - {{Port, IPT}, Module, OptsClean} + {{Port, IPT, Proto}, Module, OptsClean} end, Listeners), add_option(listen, Listeners2, State); @@ -343,6 +343,8 @@ process_term(Term, State) -> add_option(outgoing_s2s_port, Port, State); {outgoing_s2s_options, Methods, Timeout} -> add_option(outgoing_s2s_options, {Methods, Timeout}, State); + {s2s_dns_options, PropList} -> + add_option(s2s_dns_options, PropList, State); {s2s_use_starttls, Port} -> add_option(s2s_use_starttls, Port, State); {s2s_certfile, CertFile} -> src/ejabberd_config.erl @@ -275,7 +275,7 @@ try_call_command(Args, Auth, AccessCommands) -> {io_lib:format("Problem '~p ~p' occurred executing the command.~nStacktrace: ~p", [A, Why, Stack]), ?STATUS_ERROR} end. -%% @spec (Args::[string()], Auth) -> string() | integer() | {string(), integer()} | {error, ErrorType} +%% @spec (Args::[string()], Auth, AccessCommands) -> string() | integer() | {string(), integer()} | {error, ErrorType} call_command([CmdString | Args], Auth, AccessCommands) -> {ok, CmdStringU, _} = regexp:gsub(CmdString, "-", "_"), Command = list_to_atom(CmdStringU), src/ejabberd_ctl.erl @@ -96,8 +96,8 @@ start_dependent(Port, Module, Opts) -> {error, Error} end. -init(PortIP, Module, Opts1) -> - {Port, IPT, IPS, IPV, OptsClean} = parse_listener_portip(PortIP, Opts1), +init(PortIP, Module, RawOpts) -> + {Port, IPT, IPS, IPV, Proto, OptsClean} = parse_listener_portip(PortIP, RawOpts), %% The first inet|inet6 and the last {ip, _} work, %% so overriding those in Opts Opts = [IPV | OptsClean] ++ [{ip, IPT}], @@ -106,6 +106,26 @@ init(PortIP, Module, Opts1) -> (inet) -> true; (_) -> false end, Opts), + if Proto == udp -> + init_udp(PortIP, Module, Opts, SockOpts, Port, IPS); + true -> + init_tcp(PortIP, Module, Opts, SockOpts, Port, IPS) + end. + +init_udp(PortIP, Module, Opts, SockOpts, Port, IPS) -> + case gen_udp:open(Port, [binary, + {active, false}, + {reuseaddr, true} | + SockOpts]) of + {ok, Socket} -> + %% Inform my parent that this port was opened succesfully + proc_lib:init_ack({ok, self()}), + udp_recv(Socket, Module, Opts); + {error, Reason} -> + socket_error(Reason, PortIP, Module, SockOpts, Port, IPS) + end. + +init_tcp(PortIP, Module, Opts, SockOpts, Port, IPS) -> Res = gen_tcp:listen(Port, [binary, {packet, 0}, {active, false}, @@ -116,19 +136,12 @@ init(PortIP, Module, Opts1) -> SockOpts]), case Res of {ok, ListenSocket} -> - %% Inform my parent that this port was opened succesfully - proc_lib:init_ack({ok, self()}), - %% And now start accepting connection attempts + %% Inform my parent that this port was opened succesfully + proc_lib:init_ack({ok, self()}), + %% And now start accepting connection attempts accept(ListenSocket, Module, Opts); {error, Reason} -> - ReasonT = case Reason of - eaddrnotavail -> "IP address not available: " ++ IPS; - eaddrinuse -> "IP address and port number already used: "++IPS++" "++integer_to_list(Port); - _ -> atom_to_list(Reason) - end, - ?ERROR_MSG("Failed to open socket:~n ~p~nReason: ~s", - [{Port, Module, SockOpts}, ReasonT]), - throw({Reason, PortIP}) + socket_error(Reason, PortIP, Module, SockOpts, Port, IPS) end. %% @spec (PortIP, Opts) -> {Port, IPT, IPS, IPV, OptsClean} @@ -153,24 +166,34 @@ parse_listener_portip(PortIP, Opts) -> true -> {inet6, Opts2 -- [inet6]}; false -> {inet, Opts2} end, - {Port, IPT, IPS} = case PortIP of - P when is_integer(P) -> - T = get_ip_tuple(IPOpt, IPVOpt), - S = inet_parse:ntoa(T), - {P, T, S}; - {P, T} when is_integer(P) and is_tuple(T) -> - S = inet_parse:ntoa(T), - {P, T, S}; - {P, S} when is_integer(P) and is_list(S) -> - [S | _] = string:tokens(S, "/"), - {ok, T} = inet_parse:address(S), - {P, T, S} - end, + {Port, IPT, IPS, Proto} = + case add_proto(PortIP, Opts) of + {P, Prot} -> + T = get_ip_tuple(IPOpt, IPVOpt), + S = inet_parse:ntoa(T), + {P, T, S, Prot}; + {P, T, Prot} when is_integer(P) and is_tuple(T) -> + S = inet_parse:ntoa(T), + {P, T, S, Prot}; + {P, S, Prot} when is_integer(P) and is_list(S) -> + [S | _] = string:tokens(S, "/"), + {ok, T} = inet_parse:address(S), + {P, T, S, Prot} + end, IPV = case size(IPT) of 4 -> inet; 8 -> inet6 end, - {Port, IPT, IPS, IPV, OptsClean}. + {Port, IPT, IPS, IPV, Proto, OptsClean}. + +add_proto(Port, Opts) when is_integer(Port) -> + {Port, get_proto(Opts)}; +add_proto({Port, Proto}, _Opts) when is_atom(Proto) -> + {Port, normalize_proto(Proto)}; +add_proto({Port, Addr}, Opts) -> + {Port, Addr, get_proto(Opts)}; +add_proto({Port, Addr, Proto}, _Opts) -> + {Port, Addr, normalize_proto(Proto)}. strip_ip_option(Opts) -> {IPL, OptsNoIP} = lists:partition( @@ -215,6 +238,24 @@ accept(ListenSocket, Module, Opts) -> accept(ListenSocket, Module, Opts) end. +udp_recv(Socket, Module, Opts) -> + case gen_udp:recv(Socket, 0) of + {ok, {Addr, Port, Packet}} -> + case catch Module:udp_recv(Socket, Addr, Port, Packet, Opts) of + {'EXIT', Reason} -> + ?ERROR_MSG("failed to process UDP packet:~n" + "** Source: {~p, ~p}~n" + "** Reason: ~p~n** Packet: ~p", + [Addr, Port, Reason, Packet]); + _ -> + ok + end, + udp_recv(Socket, Module, Opts); + {error, Reason} -> + ?ERROR_MSG("unexpected UDP error: ~s", [format_error(Reason)]), + throw({error, Reason}) + end. + %% @spec (Port, Module, Opts) -> {ok, Pid} | {error, Error} start_listener(Port, Module, Opts) -> case start_listener2(Port, Module, Opts) of @@ -280,7 +321,9 @@ stop_listener(PortIP, _Module) -> %% Opts = [IPV | {ip, IPT} | atom() | tuple()] %% @doc Add a listener and store in config if success add_listener(PortIP, Module, Opts) -> - case start_listener(PortIP, Module, Opts) of + {Port, IPT, _, _, Proto, _} = parse_listener_portip(PortIP, Opts), + PortIP1 = {Port, IPT, Proto}, + case start_listener(PortIP1, Module, Opts) of {ok, _Pid} -> Ports = case ejabberd_config:get_local_option(listen) of undefined -> @@ -288,33 +331,39 @@ add_listener(PortIP, Module, Opts) -> Ls -> Ls end, - Ports1 = lists:keydelete(PortIP, 1, Ports), - Ports2 = [{PortIP, Module, Opts} | Ports1], + Ports1 = lists:keydelete(PortIP1, 1, Ports), + Ports2 = [{PortIP1, Module, Opts} | Ports1], ejabberd_config:add_local_option(listen, Ports2), - ok; + ok; {error, {already_started, _Pid}} -> {error, {already_started, PortIP}}; {error, Error} -> {error, Error} end. - -%% @spec (PortIP, Module) -> ok + +delete_listener(PortIP, Module) -> + delete_listener(PortIP, Module, []). + +%% @spec (PortIP, Module, Opts) -> ok %% where %% PortIP = {Port, IPT | IPS} %% Port = integer() %% IPT = tuple() %% IPS = string() %% Module = atom() -delete_listener(PortIP, Module) -> +%% Opts = [term()] +delete_listener(PortIP, Module, Opts) -> + {Port, IPT, _, _, Proto, _} = parse_listener_portip(PortIP, Opts), + PortIP1 = {Port, IPT, Proto}, Ports = case ejabberd_config:get_local_option(listen) of undefined -> []; Ls -> Ls end, - Ports1 = lists:keydelete(PortIP, 1, Ports), + Ports1 = lists:keydelete(PortIP1, 1, Ports), ejabberd_config:add_local_option(listen, Ports1), - stop_listener(PortIP, Module). + stop_listener(PortIP1, Module). is_frontend({frontend, _Module}) -> true; is_frontend(_) -> false. @@ -368,3 +417,41 @@ certfile_readable(Opts) -> false -> {false, Path} end end. + +get_proto(Opts) -> + case proplists:get_value(proto, Opts) of + undefined -> + tcp; + Proto -> + normalize_proto(Proto) + end. + +normalize_proto(tcp) -> tcp; +normalize_proto(udp) -> udp; +normalize_proto(UnknownProto) -> + ?WARNING_MSG("There is a problem in the configuration: " + "~p is an unknown IP protocol. Using tcp as fallback", + [UnknownProto]), + tcp. + +socket_error(Reason, PortIP, Module, SockOpts, Port, IPS) -> + ReasonT = case Reason of + eaddrnotavail -> + "IP address not available: " ++ IPS; + eaddrinuse -> + "IP address and port number already used: " + ++IPS++" "++integer_to_list(Port); + _ -> + format_error(Reason) + end, + ?ERROR_MSG("Failed to open socket:~n ~p~nReason: ~s", + [{Port, Module, SockOpts}, ReasonT]), + throw({Reason, PortIP}). + +format_error(Reason) -> + case inet:format_error(Reason) of + "unknown POSIX error" -> + atom_to_list(Reason); + ReasonStr -> + ReasonStr + end. src/ejabberd_listener.erl @@ -33,6 +33,8 @@ -export([start_link/0]). -export([route/3, + route_iq/4, + process_iq_reply/3, register_iq_handler/4, register_iq_handler/5, register_iq_response_handler/4, @@ -51,10 +53,13 @@ -record(state, {}). --record(iq_response, {id, module, function}). +-record(iq_response, {id, module, function, timer}). -define(IQTABLE, local_iqtable). +%% This value is used in SIP and Megaco for a transaction lifetime. +-define(IQ_TIMEOUT, 32000). + %%==================================================================== %% API %%==================================================================== @@ -89,36 +94,24 @@ process_iq(From, To, Packet) -> ejabberd_router:route(To, From, Err) end; reply -> - process_iq_reply(From, To, Packet); + IQReply = jlib:iq_query_or_response_info(Packet), + process_iq_reply(From, To, IQReply); _ -> Err = jlib:make_error_reply(Packet, ?ERR_BAD_REQUEST), ejabberd_router:route(To, From, Err), ok end. -process_iq_reply(From, To, Packet) -> - IQ = jlib:iq_query_or_response_info(Packet), - #iq{id = ID} = IQ, - case catch mnesia:dirty_read(iq_response, ID) of - [] -> +process_iq_reply(From, To, #iq{id = ID} = IQ) -> + case get_iq_callback(ID) of + {ok, undefined, Function} -> + Function(IQ), + ok; + {ok, Module, Function} -> + Module:Function(From, To, IQ), ok; _ -> - F = fun() -> - case mnesia:read({iq_response, ID}) of - [] -> - nothing; - [#iq_response{module = Module, - function = Function}] -> - mnesia:delete({iq_response, ID}), - {Module, Function} - end - end, - case mnesia:transaction(F) of - {atomic, {Module, Function}} -> - Module:Function(From, To, IQ); - _ -> - ok - end + nothing end. route(From, To, Packet) -> @@ -130,8 +123,23 @@ route(From, To, Packet) -> ok end. -register_iq_response_handler(Host, ID, Module, Fun) -> - ejabberd_local ! {register_iq_response_handler, Host, ID, Module, Fun}. +route_iq(From, To, #iq{type = Type} = IQ, F) when is_function(F) -> + Packet = if Type == set; Type == get -> + ID = randoms:get_string(), + Host = From#jid.lserver, + register_iq_response_handler(Host, ID, undefined, F), + jlib:iq_to_xml(IQ#iq{id = ID}); + true -> + jlib:iq_to_xml(IQ) + end, + ejabberd_router:route(From, To, Packet). + +register_iq_response_handler(_Host, ID, Module, Function) -> + TRef = erlang:start_timer(?IQ_TIMEOUT, ejabberd_local, ID), + mnesia:dirty_write(#iq_response{id = ID, + module = Module, + function = Function, + timer = TRef}). register_iq_handler(Host, XMLNS, Module, Fun) -> ejabberd_local ! {register_iq_handler, Host, XMLNS, Module, Fun}. @@ -139,8 +147,9 @@ register_iq_handler(Host, XMLNS, Module, Fun) -> register_iq_handler(Host, XMLNS, Module, Fun, Opts) -> ejabberd_local ! {register_iq_handler, Host, XMLNS, Module, Fun, Opts}. -unregister_iq_response_handler(Host, ID) -> - ejabberd_local ! {unregister_iq_response_handler, Host, ID}. +unregister_iq_response_handler(_Host, ID) -> + catch get_iq_callback(ID), + ok. unregister_iq_handler(Host, XMLNS) -> ejabberd_local ! {unregister_iq_handler, Host, XMLNS}. @@ -172,6 +181,7 @@ init([]) -> ?MODULE, bounce_resource_packet, 100) end, ?MYHOSTS), catch ets:new(?IQTABLE, [named_table, public]), + update_table(), mnesia:create_table(iq_response, [{ram_copies, [node()]}, {attributes, record_info(fields, iq_response)}]), @@ -215,12 +225,6 @@ handle_info({route, From, To, Packet}, State) -> ok end, {noreply, State}; -handle_info({register_iq_response_handler, _Host, ID, Module, Function}, State) -> - mnesia:dirty_write(#iq_response{id = ID, module = Module, function = Function}), - {noreply, State}; -handle_info({unregister_iq_response_handler, _Host, ID}, State) -> - mnesia:dirty_delete({iq_response, ID}), - {noreply, State}; handle_info({register_iq_handler, Host, XMLNS, Module, Function}, State) -> ets:insert(?IQTABLE, {{XMLNS, Host}, Module, Function}), catch mod_disco:register_feature(Host, XMLNS), @@ -252,6 +256,9 @@ handle_info(refresh_iq_handlers, State) -> end end, ets:tab2list(?IQTABLE)), {noreply, State}; +handle_info({timeout, _TRef, ID}, State) -> + process_iq_timeout(ID), + {noreply, State}; handle_info(_Info, State) -> {noreply, State}. @@ -305,3 +312,52 @@ do_route(From, To, Packet) -> end end. +update_table() -> + case catch mnesia:table_info(iq_response, attributes) of + [id, module, function] -> + mnesia:delete_table(iq_response); + [id, module, function, timer] -> + ok; + {'EXIT', _} -> + ok + end. + +get_iq_callback(ID) -> + case mnesia:dirty_read(iq_response, ID) of + [#iq_response{module = Module, timer = TRef, + function = Function}] -> + cancel_timer(TRef), + mnesia:dirty_delete(iq_response, ID), + {ok, Module, Function}; + _ -> + error + end. + +process_iq_timeout(ID) -> + spawn(fun process_iq_timeout/0) ! ID. + +process_iq_timeout() -> + receive + ID -> + case get_iq_callback(ID) of + {ok, undefined, Function} -> + Function(timeout); + _ -> + ok + end + after 5000 -> + ok + end. + +cancel_timer(TRef) -> + case erlang:cancel_timer(TRef) of + false -> + receive + {timeout, TRef, _} -> + ok + after 0 -> + ok + end; + _ -> + ok + end. src/ejabberd_local.erl @@ -31,7 +31,7 @@ -module(ejabberd_loglevel). -author('mickael.remond@process-one.net'). --export([set/1]). +-export([set/1, get/0]). -include("ejabberd.hrl"). @@ -46,6 +46,14 @@ ,{5, debug, "Debug"} ]). +get() -> + Level = ejabberd_logger:get(), + case lists:keysearch(Level, 1, ?LOG_LEVELS) of + {value, Result} -> Result; + _ -> erlang:error({no_such_loglevel, Level}) + end. + + set(LogLevel) when is_atom(LogLevel) -> set(level_to_integer(LogLevel)); set(Loglevel) when is_integer(Loglevel) -> @@ -67,7 +75,7 @@ level_to_integer(Level) -> %% -------------------------------------------------------------- %% Code of the ejabberd logger, dynamically compiled and loaded %% This allows to dynamically change log level while keeping a -%% very efficient code. +%% very efficient code. ejabberd_logger_src(Loglevel) -> L = integer_to_list(Loglevel), "-module(ejabberd_logger). @@ -77,7 +85,10 @@ ejabberd_logger_src(Loglevel) -> info_msg/4, warning_msg/4, error_msg/4, - critical_msg/4]). + critical_msg/4, + get/0]). + + get() -> "++ L ++". %% Helper functions debug_msg(Module, Line, Format, Args) when " ++ L ++ " >= 5 -> src/ejabberd_loglevel.erl @@ -532,6 +532,14 @@ handle_sync_event(get_state_infos, _From, StateName, StateData) -> catch _:_ -> {unknown,unknown} end, + Domains = case StateData#state.authenticated of + true -> + [StateData#state.auth_domain]; + false -> + Connections = StateData#state.connections, + [D || {{D, _}, established} <- + dict:to_list(Connections)] + end, Infos = [ {direction, in}, {statename, StateName}, @@ -543,7 +551,8 @@ handle_sync_event(get_state_infos, _From, StateName, StateData) -> {tls_options, StateData#state.tls_options}, {authenticated, StateData#state.authenticated}, {shaper, StateData#state.shaper}, - {sockmod, SockMod} + {sockmod, SockMod}, + {domains, Domains} ], Reply = {state_infos, Infos}, {reply,Reply,StateName,StateData}; src/ejabberd_s2s_in.erl @@ -995,11 +995,7 @@ is_verify_res(_) -> -include_lib("kernel/include/inet.hrl"). get_addr_port(Server) -> - Res = case inet_res:getbyname("_xmpp-server._tcp." ++ Server, srv) of - {error, _Reason1} -> - inet_res:getbyname("_jabber._tcp." ++ Server, srv); - {ok, _HEnt} = R -> R - end, + Res = srv_lookup(Server), case Res of {error, Reason} -> ?DEBUG("srv lookup of '~s' failed: ~p~n", [Server, Reason]), @@ -1036,6 +1032,34 @@ get_addr_port(Server) -> end end. +srv_lookup(Server) -> + Options = case ejabberd_config:get_local_option(s2s_dns_options) of + L when is_list(L) -> L; + _ -> [] + end, + TimeoutMs = timer:seconds(proplists:get_value(timeout, Options, 10)), + Retries = proplists:get_value(retries, Options, 2), + srv_lookup(Server, TimeoutMs, Retries). + +%% XXX - this behaviour is suboptimal in the case that the domain +%% has a "_xmpp-server._tcp." but not a "_jabber._tcp." record and +%% we don't get a DNS reply for the "_xmpp-server._tcp." lookup. In this +%% case we'll give up when we get the "_jabber._tcp." nxdomain reply. +srv_lookup(_Server, _Timeout, Retries) when Retries < 1 -> + {error, timeout}; +srv_lookup(Server, Timeout, Retries) -> + case inet_res:getbyname("_xmpp-server._tcp." ++ Server, srv, Timeout) of + {error, _Reason} -> + case inet_res:getbyname("_jabber._tcp." ++ Server, srv, Timeout) of + {error, timeout} -> + ?ERROR_MSG("Couldn't resolve SRV records for ~p via nameservers ~p.", + [Server, inet_db:res_option(nameserver)]), + srv_lookup(Server, Timeout, Retries - 1); + R -> R + end; + {ok, _HEnt} = R -> R + end. + test_get_addr_port(Server) -> lists:foldl( fun(_, Acc) -> src/ejabberd_s2s_out.erl @@ -43,6 +43,7 @@ dirty_get_sessions_list/0, dirty_get_my_sessions_list/0, get_vh_session_list/1, + get_vh_session_number/1, register_iq_handler/4, register_iq_handler/5, unregister_iq_handler/2, @@ -64,6 +65,7 @@ -include("mod_privacy.hrl"). -record(session, {sid, usr, us, priority, info}). +-record(session_counter, {vhost, count}). -record(state, {}). %% default value for the maximum number of user connections @@ -90,6 +92,7 @@ route(From, To, Packet) -> open_session(SID, User, Server, Resource, Info) -> set_session(SID, User, Server, Resource, undefined, Info), + inc_session_counter(jlib:nameprep(Server)), check_for_sessions_to_replace(User, Server, Resource), JID = jlib:make_jid(User, Server, Resource), ejabberd_hooks:run(sm_register_connection_hook, JID#jid.lserver, @@ -101,7 +104,8 @@ close_session(SID, User, Server, Resource) -> [#session{info=I}] -> I end, F = fun() -> - mnesia:delete({session, SID}) + mnesia:delete({session, SID}), + dec_session_counter(jlib:nameprep(Server)) end, mnesia:sync_dirty(F), JID = jlib:make_jid(User, Server, Resource), @@ -214,6 +218,19 @@ get_vh_session_list(Server) -> [{'==', {element, 2, '$1'}, LServer}], ['$1']}]). +get_vh_session_number(Server) -> + LServer = jlib:nameprep(Server), + Query = mnesia:dirty_select( + session_counter, + [{#session_counter{vhost = LServer, count = '$1'}, + [], + ['$1']}]), + case Query of + [Count] -> + Count; + _ -> 0 + end. + register_iq_handler(Host, XMLNS, Module, Fun) -> ejabberd_sm ! {register_iq_handler, Host, XMLNS, Module, Fun}. @@ -240,6 +257,9 @@ init([]) -> mnesia:create_table(session, [{ram_copies, [node()]}, {attributes, record_info(fields, session)}]), + mnesia:create_table(session_counter, + [{ram_copies, [node()]}, + {attributes, record_info(fields, session_counter)}]), mnesia:add_table_index(session, usr), mnesia:add_table_index(session, us), mnesia:add_table_copy(session, node(), ram_copies), @@ -361,6 +381,8 @@ clean_table_from_bad_node(Node) -> [{'==', {node, '$1'}, Node}], ['$_']}]), lists:foreach(fun(E) -> + {_, LServer} = E#session.us, + dec_session_counter(LServer), mnesia:delete({session, E#session.sid}) end, Es) end, @@ -641,6 +663,33 @@ get_max_user_sessions(LUser, Host) -> _ -> ?MAX_USER_SESSIONS end. +inc_session_counter(LServer) -> + F = fun() -> + case mnesia:wread({session_counter, LServer}) of + [C] -> + Count = C#session_counter.count + 1, + C2 = C#session_counter{count = Count}, + mnesia:write(C2); + _ -> + mnesia:write(#session_counter{vhost = LServer, + count = 1}) + end + end, + mnesia:sync_dirty(F). + +dec_session_counter(LServer) -> + F = fun() -> + case mnesia:wread({session_counter, LServer}) of + [C] -> + Count = C#session_counter.count - 1, + C2 = C#session_counter{count = Count}, + mnesia:write(C2); + _ -> + error + end + end, + mnesia:sync_dirty(F). + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% src/ejabberd_sm.erl @@ -169,6 +169,14 @@ init([]) -> infinity, supervisor, [ejabberd_tmp_sup]}, + STUNSupervisor = + {ejabberd_stun_sup, + {ejabberd_tmp_sup, start_link, + [ejabberd_stun_sup, ejabberd_stun]}, + permanent, + infinity, + supervisor, + [ejabberd_tmp_sup]}, {ok, {{one_for_one, 10, 1}, [Hooks, NodeGroups, @@ -186,6 +194,7 @@ init([]) -> HTTPSupervisor, HTTPPollSupervisor, IQSupervisor, + STUNSupervisor, FrontendSocketSupervisor, Listener]}}. src/ejabberd_sup.erl @@ -162,8 +162,9 @@ debug () read foo echo "" $EXEC_CMD "$ERL \ - $NAME ${NODE}debug \ + $NAME debug-${ERLANG_NODE} \ -remsh $ERLANG_NODE \ + -hidden \ $ERLANG_OPTS $ARGS \"$@\"" } @@ -216,8 +217,9 @@ ctl () { COMMAND=$@ $EXEC_CMD "$ERL \ - $NAME ejabberdctl \ + $NAME ctl-${ERLANG_NODE} \ -noinput \ + -hidden \ -pa $EJABBERD_EBIN_PATH \ -s ejabberd_ctl -extra $ERLANG_NODE $COMMAND" result=$? src/ejabberdctl.template @@ -131,7 +131,14 @@ export_offline(Server, Output) -> NewPacket = {xmlelement, Name, Attrs2, Els ++ [jlib:timestamp_to_xml( - calendar:now_to_universal_time(TimeStamp))]}, + calendar:now_to_universal_time(TimeStamp), + utc, + jlib:make_jid("", Server, ""), + "Offline Storage"), + %% TODO: Delete the next three lines once XEP-0091 is Obsolete + jlib:timestamp_to_xml( + calendar:now_to_universal_time( + TimeStamp))]}, XML = ejabberd_odbc:escape( lists:flatten( src/ejd2odbc.erl @@ -55,8 +55,10 @@ is_iq_request_type/1, iq_to_xml/1, parse_xdata_submit/1, - timestamp_to_iso/1, - timestamp_to_xml/1, + timestamp_to_iso/1, % TODO: Remove once XEP-0091 is Obsolete + timestamp_to_iso/2, + timestamp_to_xml/4, + timestamp_to_xml/1, % TODO: Remove once XEP-0091 is Obsolete now_to_utc_string/1, now_to_local_string/1, datetime_string_to_timestamp/1, @@ -553,14 +555,45 @@ rsm_encode_count(Count, Arr)-> i2l(I) when is_integer(I) -> integer_to_list(I); i2l(L) when is_list(L) -> L. +%% Timezone = utc | {Hours, Minutes} +%% Hours = integer() +%% Minutes = integer() +timestamp_to_iso({{Year, Month, Day}, {Hour, Minute, Second}}, Timezone) -> + Timestamp_string = + lists:flatten( + io_lib:format("~4..0w-~2..0w-~2..0wT~2..0w:~2..0w:~2..0w", + [Year, Month, Day, Hour, Minute, Second])), + Timezone_string = + case Timezone of + utc -> "Z"; + {TZh, TZm} -> + Sign = case TZh >= 0 of + true -> "+"; + false -> "-" + end, + io_lib:format("~s~2..0w:~2..0w", [Sign, abs(TZh),TZm]) + end, + {Timestamp_string, Timezone_string}. + timestamp_to_iso({{Year, Month, Day}, {Hour, Minute, Second}}) -> lists:flatten( io_lib:format("~4..0w~2..0w~2..0wT~2..0w:~2..0w:~2..0w", [Year, Month, Day, Hour, Minute, Second])). +timestamp_to_xml(DateTime, Timezone, FromJID, Desc) -> + {T_string, Tz_string} = timestamp_to_iso(DateTime, Timezone), + Text = [{xmlcdata, Desc}], + From = jlib:jid_to_string(FromJID), + {xmlelement, "delay", + [{"xmlns", ?NS_DELAY}, + {"from", From}, + {"stamp", T_string ++ Tz_string}], + Text}. + +%% TODO: Remove this function once XEP-0091 is Obsolete timestamp_to_xml({{Year, Month, Day}, {Hour, Minute, Second}}) -> {xmlelement, "x", - [{"xmlns", ?NS_DELAY}, + [{"xmlns", ?NS_DELAY91}, {"stamp", lists:flatten( io_lib:format("~4..0w~2..0w~2..0wT~2..0w:~2..0w:~2..0w", [Year, Month, Day, Hour, Minute, Second]))}], src/jlib.erl @@ -27,16 +27,20 @@ -define(NS_REGISTER, "jabber:iq:register"). -define(NS_SEARCH, "jabber:iq:search"). -define(NS_ROSTER, "jabber:iq:roster"). +-define(NS_ROSTER_VER, "urn:xmpp:features:rosterver"). -define(NS_PRIVACY, "jabber:iq:privacy"). -define(NS_PRIVATE, "jabber:iq:private"). -define(NS_VERSION, "jabber:iq:version"). --define(NS_TIME, "jabber:iq:time"). +-define(NS_TIME90, "jabber:iq:time"). % TODO: Remove once XEP-0090 is Obsolete +-define(NS_TIME, "urn:xmpp:time"). -define(NS_LAST, "jabber:iq:last"). -define(NS_XDATA, "jabber:x:data"). -define(NS_IQDATA, "jabber:iq:data"). --define(NS_DELAY, "jabber:x:delay"). +-define(NS_DELAY91, "jabber:x:delay"). % TODO: Remove once XEP-0091 is Obsolete +-define(NS_DELAY, "urn:xmpp:delay"). -define(NS_EXPIRE, "jabber:x:expire"). -define(NS_EVENT, "jabber:x:event"). +-define(NS_CHATSTATES, "http://jabber.org/protocol/chatstates"). -define(NS_XCONFERENCE, "jabber:x:conference"). -define(NS_STATS, "http://jabber.org/protocol/stats"). -define(NS_MUC, "http://jabber.org/protocol/muc"). @@ -51,9 +55,11 @@ -define(NS_PUBSUB_NODE_CONFIG, "http://jabber.org/protocol/pubsub#node_config"). -define(NS_PUBSUB_SUB_OPTIONS, "http://jabber.org/protocol/pubsub#subscribe_options"). -define(NS_PUBSUB_SUB_AUTH, "http://jabber.org/protocol/pubsub#subscribe_authorization"). +-define(NS_PUBSUB_GET_PENDING, "http://jabber.org/protocol/pubsub#get-pending"). -define(NS_COMMANDS, "http://jabber.org/protocol/commands"). -define(NS_BYTESTREAMS, "http://jabber.org/protocol/bytestreams"). -define(NS_ADMIN, "http://jabber.org/protocol/admin"). +-define(NS_SERVERINFO, "http://jabber.org/network/serverinfo"). -define(NS_RSM, "http://jabber.org/protocol/rsm"). -define(NS_EJABBERD_CONFIG, "ejabberd:config"). @@ -71,6 +77,7 @@ -define(NS_FEATURE_IQAUTH, "http://jabber.org/features/iq-auth"). -define(NS_FEATURE_IQREGISTER, "http://jabber.org/features/iq-register"). -define(NS_FEATURE_COMPRESS, "http://jabber.org/features/compress"). +-define(NS_FEATURE_MSGOFFLINE, "msgoffline"). -define(NS_COMPRESS, "http://jabber.org/protocol/compress"). src/jlib.hrl @@ -240,7 +240,8 @@ remove_connection(_SID, JID, _Info) -> clear_caps(JID). jid_to_binary(JID) -> - list_to_binary(jlib:jid_to_string(JID)). + {U, S, R} = jlib:jid_tolower(JID), + list_to_binary(jlib:jid_to_string({U, S, R})). caps_to_binary(#caps{node = Node, version = Version, exts = Exts}) -> BExts = [list_to_binary(Ext) || Ext <- Exts], src/mod_caps.erl @@ -1,7 +1,7 @@ %%%---------------------------------------------------------------------- %%% File : mod_disco.erl %%% Author : Alexey Shchepin <alexey@process-one.net> -%%% Purpose : Service Discovery (JEP-0030) support +%%% Purpose : Service Discovery (XEP-0030) support %%% Created : 1 Jan 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% @@ -41,6 +41,7 @@ get_sm_identity/5, get_sm_features/5, get_sm_items/5, + get_info/5, register_feature/2, unregister_feature/2, register_extra_domain/2, @@ -79,6 +80,7 @@ start(Host, Opts) -> ejabberd_hooks:add(disco_sm_items, Host, ?MODULE, get_sm_items, 100), ejabberd_hooks:add(disco_sm_features, Host, ?MODULE, get_sm_features, 100), ejabberd_hooks:add(disco_sm_identity, Host, ?MODULE, get_sm_identity, 100), + ejabberd_hooks:add(disco_info, Host, ?MODULE, get_info, 100), ok. stop(Host) -> @@ -88,6 +90,7 @@ stop(Host) -> ejabberd_hooks:delete(disco_local_identity, Host, ?MODULE, get_local_identity, 100), ejabberd_hooks:delete(disco_local_features, Host, ?MODULE, get_local_features, 100), ejabberd_hooks:delete(disco_local_items, Host, ?MODULE, get_local_services, 100), + ejabberd_hooks:delete(disco_info, Host, ?MODULE, get_info, 100), gen_iq_handler:remove_iq_handler(ejabberd_local, Host, ?NS_DISCO_ITEMS), gen_iq_handler:remove_iq_handler(ejabberd_local, Host, ?NS_DISCO_INFO), gen_iq_handler:remove_iq_handler(ejabberd_sm, Host, ?NS_DISCO_ITEMS), @@ -153,6 +156,8 @@ process_local_iq_info(From, To, #iq{type = Type, lang = Lang, Host, [], [From, To, Node, Lang]), + Info = ejabberd_hooks:run_fold(disco_info, Host, [], + [Host, ?MODULE, Node, Lang]), case ejabberd_hooks:run_fold(disco_local_features, Host, empty, @@ -166,6 +171,7 @@ process_local_iq_info(From, To, #iq{type = Type, lang = Lang, sub_el = [{xmlelement, "query", [{"xmlns", ?NS_DISCO_INFO} | ANode], Identity ++ + Info ++ lists:map(fun feature_to_xml/1, Features) }]}; {error, Error} -> @@ -362,3 +368,60 @@ get_user_resources(User, Server) -> [{"jid", User ++ "@" ++ Server ++ "/" ++ R}, {"name", User}], []} end, lists:sort(Rs)). + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%% Support for: XEP-0157 Contact Addresses for XMPP Services + +get_info(_A, Host, Module, Node, _Lang) when Node == [] -> + Serverinfo_fields = get_fields_xml(Host, Module), + [{xmlelement, "x", + [{"xmlns", ?NS_XDATA}, {"type", "result"}], + [{xmlelement, "field", + [{"var", "FORM_TYPE"}, {"type", "hidden"}], + [{xmlelement, "value", + [], + [{xmlcdata, ?NS_SERVERINFO}] + }] + }] + ++ Serverinfo_fields + }]; + +get_info(_, _, _, _Node, _) -> + []. + +get_fields_xml(Host, Module) -> + Fields = gen_mod:get_module_opt(Host, ?MODULE, server_info, []), + + %% filter, and get only the ones allowed for this module + Fields_good = lists:filter( + fun({Modules, _, _}) -> + case Modules of + all -> true; + Modules -> lists:member(Module, Modules) + end + end, + Fields), + + fields_to_xml(Fields_good). + +fields_to_xml(Fields) -> + [ field_to_xml(Field) || Field <- Fields]. + +field_to_xml({_, Var, Values}) -> + Values_xml = values_to_xml(Values), + {xmlelement, "field", + [{"var", Var}], + Values_xml + }. + +values_to_xml(Values) -> + lists:map( + fun(Value) -> + {xmlelement, "value", + [], + [{xmlcdata, Value}] + } + end, + Values + ). src/mod_disco.erl @@ -35,7 +35,7 @@ start/2, stop/1, closed_connection/3, - get_user_and_encoding/3]). + get_connection_params/3]). %% gen_server callbacks -export([init/1, handle_call/3, handle_cast/2, handle_info/2, @@ -46,6 +46,7 @@ -include("adhoc.hrl"). -define(DEFAULT_IRC_ENCODING, "iso8859-1"). +-define(DEFAULT_IRC_PORT, 6667). -define(POSSIBLE_ENCODINGS, ["koi8-r", "iso8859-1", "iso8859-2", "utf-8", "utf-8+latin-1"]). -record(irc_connection, {jid_server_host, pid}). @@ -214,6 +215,9 @@ do_route1(Host, ServerHost, From, To, Packet) -> #iq{type = get, xmlns = ?NS_DISCO_INFO = XMLNS, sub_el = SubEl, lang = Lang} = IQ -> Node = xml:get_tag_attr_s("node", SubEl), + Info = ejabberd_hooks:run_fold( + disco_info, ServerHost, [], + [ServerHost, ?MODULE, "", ""]), case iq_disco(Node, Lang) of [] -> Res = IQ#iq{type = result, @@ -227,7 +231,7 @@ do_route1(Host, ServerHost, From, To, Packet) -> Res = IQ#iq{type = result, sub_el = [{xmlelement, "query", [{"xmlns", XMLNS}], - DiscoInfo}]}, + DiscoInfo ++ Info}]}, ejabberd_router:route(To, From, jlib:iq_to_xml(Res)) @@ -325,7 +329,7 @@ do_route1(Host, ServerHost, From, To, Packet) -> case ets:lookup(irc_connection, {From, Server, Host}) of [] -> ?DEBUG("open new connection~n", []), - {Username, Encoding} = get_user_and_encoding( + {Username, Encoding, Port, Password} = get_connection_params( Host, From, Server), ConnectionUsername = case Packet of @@ -344,7 +348,7 @@ do_route1(Host, ServerHost, From, To, Packet) -> end, {ok, Pid} = mod_irc_connection:start( From, Host, ServerHost, Server, - ConnectionUsername, Encoding), + ConnectionUsername, Encoding, Port, Password), ets:insert( irc_connection, #irc_connection{jid_server_host = {From, Server, Host}, @@ -433,7 +437,7 @@ command_items(Host, Lang) -> commands() -> [{"join", "Join channel", fun adhoc_join/3}, - {"register", "Configure username and encoding", fun adhoc_register/3}]. + {"register", "Configure username, encoding, port and password", fun adhoc_register/3}]. process_register(Host, From, To, #iq{} = IQ) -> case catch process_irc_register(Host, From, To, IQ) of @@ -539,12 +543,12 @@ get_form(Host, From, [], Lang) -> {User, []}; [#irc_custom{data = Data}] -> {xml:get_attr_s(username, Data), - xml:get_attr_s(encodings, Data)} + xml:get_attr_s(connections_params, Data)} end, case Customs of {error, _Error} -> Customs; - {Username, Encodings} -> + {Username, ConnectionsParams} -> {result, [{xmlelement, "instructions", [], [{xmlcdata, @@ -562,7 +566,7 @@ get_form(Host, From, [], Lang) -> [{xmlcdata, translate:translate( Lang, - "Enter username and encodings you wish to use for " + "Enter username, encodings, ports and passwords you wish to use for " "connecting to IRC servers")}]}, {xmlelement, "field", [{"type", "text-single"}, {"label", @@ -577,30 +581,32 @@ get_form(Host, From, [], Lang) -> io_lib:format( translate:translate( Lang, - "If you want to specify different encodings " - "for IRC servers, fill this list with values " - "in format '{\"irc server\", \"encoding\"}'. " - "By default this service use \"~s\" encoding."), - [?DEFAULT_IRC_ENCODING]))}]}]}, + "If you want to specify different ports, " + "passwords, encodings for IRC servers, fill " + "this list with values in format " + "'{\"irc server\", \"encoding\", port, \"password\"}'. " + "By default this service use \"~s\" encoding, port ~p, " + "empty password."), + [?DEFAULT_IRC_ENCODING, ?DEFAULT_IRC_PORT]))}]}]}, {xmlelement, "field", [{"type", "fixed"}], [{xmlelement, "value", [], [{xmlcdata, translate:translate( Lang, - "Example: [{\"irc.lucky.net\", \"koi8-r\"}, " - "{\"vendetta.fef.net\", \"iso8859-1\"}]." + "Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, " + "{\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}]." )}]}]}, {xmlelement, "field", [{"type", "text-multi"}, {"label", - translate:translate(Lang, "Encodings")}, - {"var", "encodings"}], + translate:translate(Lang, "Connections parameters")}, + {"var", "connections_params"}], lists:map( fun(S) -> {xmlelement, "value", [], [{xmlcdata, S}]} end, string:tokens( lists:flatten( - io_lib:format("~p.", [Encodings])), + io_lib:format("~p.", [ConnectionsParams])), "\n")) } ]}]} @@ -616,7 +622,7 @@ set_form(Host, From, [], _Lang, XData) -> {LUser, LServer, _} = jlib:jid_tolower(From), US = {LUser, LServer}, case {lists:keysearch("username", 1, XData), - lists:keysearch("encodings", 1, XData)} of + lists:keysearch("connections_params", 1, XData)} of {{value, {_, [Username]}}, {value, {_, Strings}}} -> EncString = lists:foldl(fun(S, Res) -> Res ++ S ++ "\n" @@ -624,7 +630,7 @@ set_form(Host, From, [], _Lang, XData) -> case erl_scan:string(EncString) of {ok, Tokens, _} -> case erl_parse:parse_term(Tokens) of - {ok, Encodings} -> + {ok, ConnectionsParams} -> case mnesia:transaction( fun() -> mnesia:write( @@ -633,8 +639,8 @@ set_form(Host, From, [], _Lang, XData) -> data = [{username, Username}, - {encodings, - Encodings}]}) + {connections_params, + ConnectionsParams}]}) end) of {atomic, _} -> {result, []}; @@ -656,22 +662,38 @@ set_form(_Host, _, _, _Lang, _XData) -> {error, ?ERR_SERVICE_UNAVAILABLE}. -get_user_and_encoding(Host, From, IRCServer) -> +get_connection_params(Host, From, IRCServer) -> #jid{user = User, server = _Server, luser = LUser, lserver = LServer} = From, US = {LUser, LServer}, case catch mnesia:dirty_read({irc_custom, {US, Host}}) of {'EXIT', _Reason} -> - {User, ?DEFAULT_IRC_ENCODING}; + {User, ?DEFAULT_IRC_ENCODING, ?DEFAULT_IRC_PORT, ""}; [] -> - {User, ?DEFAULT_IRC_ENCODING}; + {User, ?DEFAULT_IRC_ENCODING, ?DEFAULT_IRC_PORT, ""}; [#irc_custom{data = Data}] -> - {xml:get_attr_s(username, Data), - case xml:get_attr_s(IRCServer, xml:get_attr_s(encodings, Data)) of - "" -> ?DEFAULT_IRC_ENCODING; - E -> E - end} - end. + Username = xml:get_attr_s(username, Data), + {NewUsername, NewEncoding, NewPort, NewPassword} = + case lists:keysearch(IRCServer, 1, xml:get_attr_s(connections_params, Data)) of + {value, {_, Encoding, Port, Password}} -> + {Username, Encoding, Port, Password}; + {value, {_, Encoding, Port}} -> + {Username, Encoding, Port, ""}; + {value, {_, Encoding}} -> + {Username, Encoding, ?DEFAULT_IRC_PORT, ""}; + _ -> + {Username, ?DEFAULT_IRC_ENCODING, ?DEFAULT_IRC_PORT, ""} + end, + {NewUsername, + NewEncoding, + if + NewPort >= 0 andalso NewPort =< 65535 -> + NewPort; + true -> + ?DEFAULT_IRC_PORT + end, + NewPassword} + end. adhoc_join(_From, _To, #adhoc_request{action = "cancel"} = Request) -> adhoc:produce_response(Request, @@ -763,13 +785,13 @@ adhoc_register(From, To, #adhoc_request{lang = Lang, case catch mnesia:dirty_read({irc_custom, {US, Host}}) of {'EXIT', _Reason} -> Username = User, - Encodings = []; + ConnectionsParams = []; [] -> Username = User, - Encodings = []; + ConnectionsParams = []; [#irc_custom{data = Data}] -> Username = xml:get_attr_s(username, Data), - Encodings = xml:get_attr_s(encodings, Data) + ConnectionsParams = xml:get_attr_s(connections_params, Data) end, Error = false; true -> @@ -777,7 +799,7 @@ adhoc_register(From, To, #adhoc_request{lang = Lang, invalid -> Error = {error, ?ERR_BAD_REQUEST}, Username = false, - Encodings = false; + ConnectionsParams = false; Fields -> Username = case lists:keysearch("username", 1, Fields) of {value, {"username", U}} -> @@ -785,7 +807,7 @@ adhoc_register(From, To, #adhoc_request{lang = Lang, _ -> User end, - Encodings = parse_encodings(Fields), + ConnectionsParams = parse_connections_params(Fields), Error = false end end, @@ -801,8 +823,8 @@ adhoc_register(From, To, #adhoc_request{lang = Lang, data = [{username, Username}, - {encodings, - Encodings}]}) + {connections_params, + ConnectionsParams}]}) end) of {atomic, _} -> adhoc:produce_response(Request, #adhoc_response{status = completed}); @@ -810,14 +832,14 @@ adhoc_register(From, To, #adhoc_request{lang = Lang, {error, ?ERR_INTERNAL_SERVER_ERROR} end; true -> - Form = generate_adhoc_register_form(Lang, Username, Encodings), + Form = generate_adhoc_register_form(Lang, Username, ConnectionsParams), adhoc:produce_response(Request, #adhoc_response{status = executing, elements = [Form], actions = ["next", "complete"]}) end. -generate_adhoc_register_form(Lang, Username, Encodings) -> +generate_adhoc_register_form(Lang, Username, ConnectionsParams) -> {xmlelement, "x", [{"xmlns", ?NS_XDATA}, {"type", "form"}], @@ -835,25 +857,61 @@ generate_adhoc_register_form(Lang, Username, Encodings) -> {"label", translate:translate(Lang, "IRC username")}], [{xmlelement, "required", [], []}, {xmlelement, "value", [], [{xmlcdata, Username}]}]}] ++ - generate_encoding_fields(Lang, Encodings, 1, [])}. + generate_connection_params_fields(Lang, ConnectionsParams, 1, [])}. -generate_encoding_fields(Lang, [], Number, Acc) -> - Field = generate_encoding_field(Lang, "", "", Number), +generate_connection_params_fields(Lang, [], Number, Acc) -> + Field = generate_connection_params_field(Lang, "", "", -1, "", Number), lists:reverse(Field ++ Acc); -generate_encoding_fields(Lang, [{Server, Encoding} | Encodings], Number, Acc) -> - Field = generate_encoding_field(Lang, Server, Encoding, Number), - generate_encoding_fields(Lang, Encodings, Number + 1, Field ++ Acc). + +generate_connection_params_fields(Lang, [ConnectionParams | ConnectionsParams], Number, Acc) -> + case ConnectionParams of + {Server, Encoding, Port, Password} -> + Field = generate_connection_params_field(Lang, Server, Encoding, Port, Password, Number), + generate_connection_params_fields(Lang, ConnectionsParams, Number + 1, Field ++ Acc); + {Server, Encoding, Port} -> + Field = generate_connection_params_field(Lang, Server, Encoding, Port, [], Number), + generate_connection_params_fields(Lang, ConnectionsParams, Number + 1, Field ++ Acc); + {Server, Encoding} -> + Field = generate_connection_params_field(Lang, Server, Encoding, [], [], Number), + generate_connection_params_fields(Lang, ConnectionsParams, Number + 1, Field ++ Acc); + _ -> + [] + end. -generate_encoding_field(Lang, Server, Encoding, Number) -> +generate_connection_params_field(Lang, Server, Encoding, Port, Password, Number) -> EncodingUsed = case Encoding of [] -> ?DEFAULT_IRC_ENCODING; _ -> Encoding end, + PortUsedInt = if + Port >= 0 andalso Port =< 65535 -> + Port; + true -> + ?DEFAULT_IRC_PORT + end, + PortUsed = integer_to_list(PortUsedInt), + PasswordUsed = case Password of + [] -> + ""; + _ -> + Password + end, + NumberString = integer_to_list(Number), %% Fields are in reverse order, as they will be reversed again later. [{xmlelement, "field", - [{"var", "encoding" ++ io_lib:format("~b", [Number])}, + [{"var", "password" ++ NumberString}, + {"type", "text-single"}, + {"label", io_lib:format(translate:translate(Lang, "Password ~b"), [Number])}], + [{xmlelement, "value", [], [{xmlcdata, PasswordUsed}]}]}, + {xmlelement, "field", + [{"var", "port" ++ NumberString}, + {"type", "text-single"}, + {"label", io_lib:format(translate:translate(Lang, "Port ~b"), [Number])}], + [{xmlelement, "value", [], [{xmlcdata, PortUsed}]}]}, + {xmlelement, "field", + [{"var", "encoding" ++ NumberString}, {"type", "list-single"}, {"label", io_lib:format(translate:translate(Lang, "Encoding for server ~b"), [Number])}], [{xmlelement, "value", [], [{xmlcdata, EncodingUsed}]} | @@ -862,13 +920,13 @@ generate_encoding_field(Lang, Server, Encoding, Number) -> [{xmlelement, "value", [], [{xmlcdata, E}]}]} end, ?POSSIBLE_ENCODINGS)]}, {xmlelement, "field", - [{"var", "server" ++ io_lib:format("~b", [Number])}, + [{"var", "server" ++ NumberString}, {"type", "text-single"}, {"label", io_lib:format(translate:translate(Lang, "Server ~b"), [Number])}], [{xmlelement, "value", [], [{xmlcdata, Server}]}]}]. -parse_encodings(Fields) -> - %% Find all fields staring with serverN and encodingN, for any values +parse_connections_params(Fields) -> + %% Find all fields staring with serverN, encodingN, portN and passwordN for any values %% of N, and generate lists of {"N", Value}. Servers = lists:sort( [{lists:nthtail(6, Var), lists:flatten(Value)} || {Var, Value} <- Fields, @@ -876,25 +934,46 @@ parse_encodings(Fields) -> Encodings = lists:sort( [{lists:nthtail(8, Var), lists:flatten(Value)} || {Var, Value} <- Fields, lists:prefix("encoding", Var)]), + + Ports = lists:sort( + [{lists:nthtail(4, Var), lists:flatten(Value)} || {Var, Value} <- Fields, + lists:prefix("port", Var)]), + + Passwords = lists:sort( + [{lists:nthtail(8, Var), lists:flatten(Value)} || {Var, Value} <- Fields, + lists:prefix("password", Var)]), %% Now sort the lists, and find the corresponding pairs. - parse_encodings(Servers, Encodings). - -parse_encodings([{ServerN, Server} | Servers], [{EncodingN, Encoding} | Encodings]) -> - %% Try to match pairs of servers and encodings, no matter what fields - %% the client might have left out. - if ServerN == EncodingN -> - [{Server, Encoding} | parse_encodings(Servers, Encodings)]; - ServerN < EncodingN -> - parse_encodings(Servers, [{EncodingN, Encoding} | Encodings]); - ServerN > EncodingN -> - parse_encodings([{ServerN, Server} | Servers], Encodings) - end; -parse_encodings([], _) -> + parse_connections_params(Servers, Encodings, Ports, Passwords). + +retrieve_connections_params(ConnectionParams, ServerN) -> + case ConnectionParams of + [{ConnectionParamN, ConnectionParam} | ConnectionParamsTail] -> + if + ServerN == ConnectionParamN -> + {ConnectionParam, ConnectionParamsTail}; + ServerN < ConnectionParamN -> + {[], [{ConnectionParamN, ConnectionParam} | ConnectionParamsTail]}; + ServerN > ConnectionParamN -> + {[], ConnectionParamsTail} + end; + _ -> + {[], []} + end. + +parse_connections_params([], _, _, _) -> []; -parse_encodings(_, []) -> - []. +parse_connections_params(_, [], [], []) -> + []; +parse_connections_params([{ServerN, Server} | Servers], Encodings, Ports, Passwords) -> + %% Try to match matches of servers, ports, passwords and encodings, no matter what fields + %% the client might have left out. + {NewEncoding, NewEncodings} = retrieve_connections_params(Encodings, ServerN), + {NewPort, NewPorts} = retrieve_connections_params(Ports, ServerN), + {NewPassword, NewPasswords} = retrieve_connections_params(Passwords, ServerN), + [{Server, NewEncoding, NewPort, NewPassword} | parse_connections_params(Servers, NewEncodings, NewPorts, NewPasswords)]. + update_table(Host) -> Fields = record_info(fields, irc_custom), case mnesia:table_info(irc_custom, attributes) of src/mod_irc/mod_irc.erl @@ -30,7 +30,7 @@ -behaviour(gen_fsm). %% External exports --export([start_link/5, start/6, route_chan/4, route_nick/3]). +-export([start_link/7, start/8, route_chan/4, route_nick/3]). %% gen_fsm callbacks -export([init/1, @@ -48,8 +48,8 @@ -define(SETS, gb_sets). --record(state, {socket, encoding, queue, - user, host, server, nick, +-record(state, {socket, encoding, port, password, + queue, user, host, server, nick, channels = dict:new(), nickchannel, inbuf = "", outbuf = ""}). @@ -65,13 +65,13 @@ %%%---------------------------------------------------------------------- %%% API %%%---------------------------------------------------------------------- -start(From, Host, ServerHost, Server, Username, Encoding) -> +start(From, Host, ServerHost, Server, Username, Encoding, Port, Password) -> Supervisor = gen_mod:get_module_proc(ServerHost, ejabberd_mod_irc_sup), supervisor:start_child( - Supervisor, [From, Host, Server, Username, Encoding]). + Supervisor, [From, Host, Server, Username, Encoding, Port, Password]). -start_link(From, Host, Server, Username, Encoding) -> - gen_fsm:start_link(?MODULE, [From, Host, Server, Username, Encoding], +start_link(From, Host, Server, Username, Encoding, Port, Password) -> + gen_fsm:start_link(?MODULE, [From, Host, Server, Username, Encoding, Port, Password], ?FSMOPTS). %%%---------------------------------------------------------------------- @@ -85,10 +85,12 @@ start_link(From, Host, Server, Username, Encoding) -> %% ignore | %% {stop, StopReason} %%---------------------------------------------------------------------- -init([From, Host, Server, Username, Encoding]) -> +init([From, Host, Server, Username, Encoding, Port, Password]) -> gen_fsm:send_event(self(), init), {ok, open_socket, #state{queue = queue:new(), encoding = Encoding, + port = Port, + password = Password, user = From, nick = Username, host = Host, @@ -102,11 +104,17 @@ init([From, Host, Server, Username, Encoding]) -> %%---------------------------------------------------------------------- open_socket(init, StateData) -> Addr = StateData#state.server, - Port = 6667, + Port = StateData#state.port, ?DEBUG("connecting to ~s:~p~n", [Addr, Port]), case gen_tcp:connect(Addr, Port, [binary, {packet, 0}]) of {ok, Socket} -> NewStateData = StateData#state{socket = Socket}, + if + StateData#state.password /= "" -> + send_text(NewStateData, + io_lib:format("PASS ~s\r\n", [StateData#state.password])); + true -> true + end, send_text(NewStateData, io_lib:format("NICK ~s\r\n", [StateData#state.nick])), send_text(NewStateData, src/mod_irc/mod_irc_connection.erl @@ -421,10 +421,14 @@ do_route1(Host, ServerHost, Access, HistorySize, RoomShaper, case jlib:iq_query_info(Packet) of #iq{type = get, xmlns = ?NS_DISCO_INFO = XMLNS, sub_el = _SubEl, lang = Lang} = IQ -> + Info = ejabberd_hooks:run_fold( + disco_info, ServerHost, [], + [ServerHost, ?MODULE, "", ""]), Res = IQ#iq{type = result, sub_el = [{xmlelement, "query", [{"xmlns", XMLNS}], - iq_disco_info(Lang)}]}, + iq_disco_info(Lang) + ++Info}]}, ejabberd_router:route(To, From, jlib:iq_to_xml(Res)); @@ -844,11 +848,11 @@ process_iq_register_set(Host, From, SubEl, Lang) -> {error, ?ERR_BAD_REQUEST}; _ -> case lists:keysearch("nick", 1, XData) of - false -> + {value, {_, [Nick]}} when Nick /= "" -> + iq_set_register_info(Host, From, Nick, Lang); + _ -> ErrText = "You must fill in field \"Nickname\" in the form", - {error, ?ERRT_NOT_ACCEPTABLE(Lang, ErrText)}; - {value, {_, [Nick]}} -> - iq_set_register_info(Host, From, Nick, Lang) + {error, ?ERRT_NOT_ACCEPTABLE(Lang, ErrText)} end end; _ -> src/mod_muc/mod_muc.erl @@ -43,13 +43,17 @@ -include("ejabberd.hrl"). -include("jlib.hrl"). +-include("mod_muc_room.hrl"). + +%% Copied from mod_muc/mod_muc.erl +-record(muc_online_room, {name_host, pid}). -define(T(Text), translate:translate(Lang, Text)). -define(PROCNAME, ejabberd_mod_muc_log). -record(room, {jid, title, subject, subject_author, config}). --record(state, {host, +-record(logstate, {host, out_dir, dir_type, dir_name, @@ -130,7 +134,7 @@ init([Host, Opts]) -> end; L -> L end, - {ok, #state{host = Host, + {ok, #logstate{host = Host, out_dir = OutDir, dir_type = DirType, dir_name = DirName, @@ -152,7 +156,7 @@ init([Host, Opts]) -> %% Description: Handling call messages %%-------------------------------------------------------------------- handle_call({check_access_log, ServerHost, FromJID}, _From, State) -> - Reply = acl:match_rule(ServerHost, State#state.access, FromJID), + Reply = acl:match_rule(ServerHost, State#logstate.access, FromJID), {reply, Reply, State}; handle_call(stop, _From, State) -> {stop, normal, ok, State}. @@ -215,9 +219,12 @@ add_to_log2(text, {Nick, Packet}, Room, Opts, State) -> add_message_to_log(Nick, Message, Room, Opts, State) end; -add_to_log2(roomconfig_change, _, Room, Opts, State) -> +add_to_log2(roomconfig_change, _Occupants, Room, Opts, State) -> add_message_to_log("", roomconfig_change, Room, Opts, State); +add_to_log2(roomconfig_change_enabledlogging, Occupants, Room, Opts, State) -> + add_message_to_log("", {roomconfig_change, Occupants}, Room, Opts, State); + add_to_log2(nickchange, {OldNick, NewNick}, Room, Opts, State) -> add_message_to_log(NewNick, {nickchange, OldNick}, Room, Opts, State); @@ -302,7 +309,7 @@ write_last_lines(F, Images_dir, _FileFormat) -> fw(F, "</div></body></html>"). add_message_to_log(Nick1, Message, RoomJID, Opts, State) -> - #state{out_dir = OutDir, + #logstate{out_dir = OutDir, dir_type = DirType, dir_name = DirName, file_format = FileFormat, @@ -362,6 +369,13 @@ add_message_to_log(Nick1, Message, RoomJID, Opts, State) -> put_room_config(F, RoomConfig, Lang, FileFormat), io_lib:format("~s ", [?T("Chatroom configuration modified")]); + {roomconfig_change, Occupants} -> + RoomConfig = roomconfig_to_string(Room#room.config, Lang, FileFormat), + put_room_config(F, RoomConfig, Lang, FileFormat), + RoomOccupants = roomoccupants_to_string(Occupants, FileFormat), + put_room_occupants(F, RoomOccupants, Lang, FileFormat), + io_lib:format("~s ", + [?T("Chatroom configuration modified")]); join -> io_lib:format("~s ~s ", [Nick, ?T("joins the room")]); @@ -399,11 +413,14 @@ add_message_to_log(Nick1, Message, RoomJID, Opts, State) -> io_lib:format("~s~s~s ", [Nick, ?T(" has set the subject to: "), htmlize(T,NoFollow,FileFormat)]); {body, T} -> - case regexp:first_match(T, "^/me\s") of - {match, _, _} -> + case {regexp:first_match(T, "^/me\s"), Nick} of + {_, ""} -> + io_lib:format("~s ", + [htmlize(T,NoFollow,FileFormat)]); + {{match, _, _}, _} -> io_lib:format("~s ~s ", [Nick, string:substr(htmlize(T,FileFormat), 5)]); - nomatch -> + {nomatch, _} -> io_lib:format("~s ~s ", [Nick2, htmlize(T,NoFollow,FileFormat)]) end @@ -662,6 +679,9 @@ put_header(F, Room, Date, CSSFile, Lang, Hour_offset, Date_prev, Date_next, Top_ end, RoomConfig = roomconfig_to_string(Room#room.config, Lang, FileFormat), put_room_config(F, RoomConfig, Lang, FileFormat), + Occupants = get_room_occupants(Room#room.jid), + RoomOccupants = roomoccupants_to_string(Occupants, FileFormat), + put_room_occupants(F, RoomOccupants, Lang, FileFormat), Time_offset_str = case Hour_offset<0 of true -> io_lib:format("~p", [Hour_offset]); false -> io_lib:format("+~p", [Hour_offset]) @@ -674,6 +694,7 @@ put_header_css(F, false) -> fw(F, ".ts {color: #AAAAAA; text-decoration: none;}"), fw(F, ".mrcm {color: #009900; font-style: italic; font-weight: bold;}"), fw(F, ".msc {color: #009900; font-style: italic; font-weight: bold;}"), + fw(F, ".msm {color: #000099; font-style: italic; font-weight: bold;}"), fw(F, ".mj {color: #009900; font-style: italic;}"), fw(F, ".ml {color: #009900; font-style: italic;}"), fw(F, ".mk {color: #009900; font-style: italic;}"), @@ -720,6 +741,15 @@ put_room_config(F, RoomConfig, Lang, _FileFormat) -> fw(F, "<div class=\"rcos\" id=\"a~p\" style=\"display: none;\" > ~s</div>", [Now2, RoomConfig]), fw(F, "</div>"). +put_room_occupants(_F, _RoomOccupants, _Lang, plaintext) -> + ok; +put_room_occupants(F, RoomOccupants, Lang, _FileFormat) -> + {_, Now2, _} = now(), + fw(F, "<div class=\"rc\">"), + fw(F, "<div class=\"rct\" onclick=\"sh('o~p');return false;\">~s</div>", [Now2, ?T("Room Occupants")]), + fw(F, "<div class=\"rcos\" id=\"o~p\" style=\"display: none;\" > ~s</div>", [Now2, RoomOccupants]), + fw(F, "</div>"). + %% htmlize %% The default behaviour is to ignore the nofollow spam prevention on links %% (NoFollow=false) @@ -755,7 +785,9 @@ htmlize2(S1, NoFollow) -> S5 = element(2, regexp:gsub(S4, "((http|https|ftp)://|(mailto|xmpp):)[^] )\'\"}]+", link_regexp(NoFollow))), %% Remove 'right-to-left override' unicode character 0x202e - element(2, regexp:gsub(S5, [226,128,174], "[RLO]")). + S6 = element(2, regexp:gsub(S5, " ", "\\ \\ ")), + S7 = element(2, regexp:gsub(S6, "\\t", "\\ \\ \\ \\ ")), + element(2, regexp:gsub(S7, [226,128,174], "[RLO]")). %% Regexp link %% Add the nofollow rel attribute when required @@ -844,6 +876,60 @@ get_roomconfig_text(allow_user_invites) -> "Allow users to send invites"; get_roomconfig_text(logging) -> "Enable logging"; get_roomconfig_text(_) -> undefined. +%% Users = [{JID, Nick, Role}] +roomoccupants_to_string(Users, _FileFormat) -> + Res = [role_users_to_string(RoleS, Users1) + || {RoleS, Users1} <- group_by_role(Users), Users1 /= []], + lists:flatten(["<div class=\"rcot\">", Res, "</div>"]). + +%% Users = [{JID, Nick, Role}] +group_by_role(Users) -> + {Ms, Ps, Vs, Ns} = + lists:foldl( + fun({JID, Nick, moderator}, {Mod, Par, Vis, Non}) -> + {[{JID, Nick}]++Mod, Par, Vis, Non}; + ({JID, Nick, participant}, {Mod, Par, Vis, Non}) -> + {Mod, [{JID, Nick}]++Par, Vis, Non}; + ({JID, Nick, visitor}, {Mod, Par, Vis, Non}) -> + {Mod, Par, [{JID, Nick}]++Vis, Non}; + ({JID, Nick, none}, {Mod, Par, Vis, Non}) -> + {Mod, Par, Vis, [{JID, Nick}]++Non} + end, + {[], [], [], []}, + Users), + case Ms of [] -> []; _ -> [{"Moderator", Ms}] end + ++ case Ms of [] -> []; _ -> [{"Participant", Ps}] end + ++ case Ms of [] -> []; _ -> [{"Visitor", Vs}] end + ++ case Ms of [] -> []; _ -> [{"None", Ns}] end. + +%% Role = atom() +%% Users = [{JID, Nick}] +role_users_to_string(RoleS, Users) -> + SortedUsers = lists:keysort(2, Users), + UsersString = [[Nick, " "] || {_JID, Nick} <- SortedUsers], + [RoleS, ": ", UsersString]. + +get_room_occupants(RoomJIDString) -> + RoomJID = jlib:string_to_jid(RoomJIDString), + RoomName = RoomJID#jid.luser, + MucService = RoomJID#jid.lserver, + StateData = get_room_state(RoomName, MucService), + [{U#user.jid, U#user.nick, U#user.role} + || {_, U} <- ?DICT:to_list(StateData#state.users)]. + +get_room_state(RoomName, MucService) -> + case mnesia:dirty_read(muc_online_room, {RoomName, MucService}) of + [R] -> + RoomPid = R#muc_online_room.pid, + get_room_state(RoomPid); + [] -> + room_not_found + end. + +get_room_state(RoomPid) -> + {ok, R} = gen_fsm:sync_send_all_state_event(RoomPid, get_state), + R. + get_proc_name(Host) -> gen_mod:get_module_proc(Host, ?PROCNAME). calc_hour_offset(TimeHere) -> src/mod_muc/mod_muc_log.erl @@ -557,6 +557,7 @@ handle_event({service_message, Msg}, _StateName, StateData) -> end, ?DICT:to_list(StateData#state.users)), NSD = add_message_to_history("", + StateData#state.jid, MessagePkt, StateData), {next_state, normal_state, NSD}; @@ -1921,7 +1922,6 @@ extract_history([{xmlelement, _Name, Attrs, _SubEls} = El | Els], Type) -> extract_history([_ | Els], Type) -> extract_history(Els, Type). - send_update_presence(JID, StateData) -> send_update_presence(JID, "", StateData). send_update_presence(JID, Reason, Headers) when is_record(Headers, headers)-> @@ -2251,7 +2251,6 @@ send_kickban_presence1(UJID, Reason, Code, Headers) -> jlib:jid_replace_resource(Headers#headers.jid, Nick), Info#user.jid, Packet) - end, ?DICT:to_list(Headers#headers.users)). destroy_room(DEl, #headers{}=Headers) -> @@ -2497,8 +2496,13 @@ send_error_only_occupants(Packet, Lang, RoomJID, From) -> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Logging -add_to_log(Type, Data, Headers) when is_record(Headers, headers) -> - add_to_log(Type, Data, headers_to_state(Headers)); + +add_to_log(Type, Data, StateData) + when Type == roomconfig_change_disabledlogging -> + %% When logging is disabled, the config change message must be logged: + add_to_log( + StateData#state.server_host, roomconfig_change, Data, + StateData#state.jid, make_opts(StateData)); add_to_log(Type, Data, StateData) -> case handler_call(should_log, [], StateData) of {result, true, _} -> src/mod_muc/mod_muc_room.erl @@ -35,6 +35,7 @@ store_packet/3, resend_offline_messages/2, pop_offline_messages/3, + get_sm_features/5, remove_expired_messages/0, remove_old_messages/1, remove_user/2, @@ -69,6 +70,10 @@ start(Host, Opts) -> ?MODULE, remove_user, 50), ejabberd_hooks:add(anonymous_purge_hook, Host, ?MODULE, remove_user, 50), + ejabberd_hooks:add(disco_sm_features, Host, + ?MODULE, get_sm_features, 50), + ejabberd_hooks:add(disco_local_features, Host, + ?MODULE, get_sm_features, 50), ejabberd_hooks:add(webadmin_page_host, Host, ?MODULE, webadmin_page, 50), ejabberd_hooks:add(webadmin_user, Host, @@ -144,6 +149,8 @@ stop(Host) -> ?MODULE, remove_user, 50), ejabberd_hooks:delete(anonymous_purge_hook, Host, ?MODULE, remove_user, 50), + ejabberd_hooks:delete(disco_sm_features, Host, ?MODULE, get_sm_features, 50), + ejabberd_hooks:delete(disco_local_features, Host, ?MODULE, get_sm_features, 50), ejabberd_hooks:delete(webadmin_page_host, Host, ?MODULE, webadmin_page, 50), ejabberd_hooks:delete(webadmin_user, Host, @@ -154,12 +161,27 @@ stop(Host) -> exit(whereis(Proc), stop), {wait, Proc}. +get_sm_features(Acc, _From, _To, "", _Lang) -> + Feats = case Acc of + {result, I} -> I; + _ -> [] + end, + {result, Feats ++ [?NS_FEATURE_MSGOFFLINE]}; + +get_sm_features(_Acc, _From, _To, ?NS_FEATURE_MSGOFFLINE, _Lang) -> + %% override all lesser features... + {result, []}; + +get_sm_features(Acc, _From, _To, _Node, _Lang) -> + Acc. + + store_packet(From, To, Packet) -> Type = xml:get_tag_attr_s("type", Packet), if (Type /= "error") and (Type /= "groupchat") and (Type /= "headline") -> - case check_event(From, To, Packet) of + case check_event_chatstates(From, To, Packet) of true -> #jid{luser = LUser, lserver = LServer} = To, TimeStamp = now(), @@ -180,12 +202,22 @@ store_packet(From, To, Packet) -> ok end. -check_event(From, To, Packet) -> +%% Check if the packet has any content about XEP-0022 or XEP-0085 +check_event_chatstates(From, To, Packet) -> {xmlelement, Name, Attrs, Els} = Packet, - case find_x_event(Els) of - false -> + case find_x_event_chatstates(Els, {false, false, false}) of + %% There wasn't any x:event or chatstates subelements + {false, false, _} -> + true; + %% There a chatstates subelement and other stuff, but no x:event + {false, CEl, true} when CEl /= false -> true; - El -> + %% There was only a subelement: a chatstates + {false, CEl, false} when CEl /= false -> + %% Don't allow offline storage + false; + %% There was an x:event element, and maybe also other stuff + {El, _, _} when El /= false -> case xml:get_subtag(El, "id") of false -> case xml:get_subtag(El, "offline") of @@ -213,16 +245,19 @@ check_event(From, To, Packet) -> end end. -find_x_event([]) -> - false; -find_x_event([{xmlcdata, _} | Els]) -> - find_x_event(Els); -find_x_event([El | Els]) -> +%% Check if the packet has subelements about XEP-0022, XEP-0085 or other +find_x_event_chatstates([], Res) -> + Res; +find_x_event_chatstates([{xmlcdata, _} | Els], Res) -> + find_x_event_chatstates(Els, Res); +find_x_event_chatstates([El | Els], {A, B, C}) -> case xml:get_tag_attr_s("xmlns", El) of ?NS_EVENT -> - El; + find_x_event_chatstates(Els, {El, B, C}); + ?NS_CHATSTATES -> + find_x_event_chatstates(Els, {A, El, C}); _ -> - find_x_event(Els) + find_x_event_chatstates(Els, {A, B, true}) end. find_x_expire(_, []) -> @@ -272,6 +307,13 @@ resend_offline_messages(User, Server) -> Els ++ [jlib:timestamp_to_xml( calendar:now_to_universal_time( + R#offline_msg.timestamp), + utc, + jlib:make_jid("", Server, ""), + "Offline Storage"), + %% TODO: Delete the next three lines once XEP-0091 is Obsolete + jlib:timestamp_to_xml( + calendar:now_to_universal_time( R#offline_msg.timestamp))]}} end, lists:keysort(#offline_msg.timestamp, Rs)); @@ -300,7 +342,14 @@ pop_offline_messages(Ls, User, Server) -> {xmlelement, Name, Attrs, Els ++ [jlib:timestamp_to_xml( - calendar:now_to_universal_time( + calendar:now_to_universal_time( + R#offline_msg.timestamp), + utc, + jlib:make_jid("", Server, ""), + "Offline Storage"), + %% TODO: Delete the next three lines once XEP-0091 is Obsolete + jlib:timestamp_to_xml( + calendar:now_to_universal_time( R#offline_msg.timestamp))]}} end, lists:filter( @@ -317,6 +366,7 @@ pop_offline_messages(Ls, User, Server) -> Ls end. + remove_expired_messages() -> TimeStamp = now(), F = fun() -> src/mod_offline.erl @@ -36,6 +36,7 @@ stop/1, store_packet/3, pop_offline_messages/3, + get_sm_features/5, remove_user/2, webadmin_page/3, webadmin_user/4, @@ -63,6 +64,10 @@ start(Host, Opts) -> ?MODULE, remove_user, 50), ejabberd_hooks:add(anonymous_purge_hook, Host, ?MODULE, remove_user, 50), + ejabberd_hooks:add(disco_sm_features, Host, + ?MODULE, get_sm_features, 50), + ejabberd_hooks:add(disco_local_features, Host, + ?MODULE, get_sm_features, 50), ejabberd_hooks:add(webadmin_page_host, Host, ?MODULE, webadmin_page, 50), ejabberd_hooks:add(webadmin_user, Host, @@ -107,6 +112,13 @@ loop(Host, AccessMaxOfflineMsgs) -> Els ++ [jlib:timestamp_to_xml( calendar:now_to_universal_time( + M#offline_msg.timestamp), + utc, + jlib:make_jid("", Host, ""), + "Offline Storage"), + %% TODO: Delete the next three lines once XEP-0091 is Obsolete + jlib:timestamp_to_xml( + calendar:now_to_universal_time( M#offline_msg.timestamp))]}, XML = ejabberd_odbc:escape( @@ -155,6 +167,8 @@ stop(Host) -> ?MODULE, remove_user, 50), ejabberd_hooks:delete(anonymous_purge_hook, Host, ?MODULE, remove_user, 50), + ejabberd_hooks:delete(disco_sm_features, Host, ?MODULE, get_sm_features, 50), + ejabberd_hooks:delete(disco_local_features, Host, ?MODULE, get_sm_features, 50), ejabberd_hooks:delete(webadmin_page_host, Host, ?MODULE, webadmin_page, 50), ejabberd_hooks:delete(webadmin_user, Host, @@ -165,12 +179,27 @@ stop(Host) -> exit(whereis(Proc), stop), ok. +get_sm_features(Acc, _From, _To, "", _Lang) -> + Feats = case Acc of + {result, I} -> I; + _ -> [] + end, + {result, Feats ++ [?NS_FEATURE_MSGOFFLINE]}; + +get_sm_features(_Acc, _From, _To, ?NS_FEATURE_MSGOFFLINE, _Lang) -> + %% override all lesser features... + {result, []}; + +get_sm_features(Acc, _From, _To, _Node, _Lang) -> + Acc. + + store_packet(From, To, Packet) -> Type = xml:get_tag_attr_s("type", Packet), if (Type /= "error") and (Type /= "groupchat") and (Type /= "headline") -> - case check_event(From, To, Packet) of + case check_event_chatstates(From, To, Packet) of true -> #jid{luser = LUser} = To, TimeStamp = now(), @@ -191,12 +220,22 @@ store_packet(From, To, Packet) -> ok end. -check_event(From, To, Packet) -> +%% Check if the packet has any content about XEP-0022 or XEP-0085 +check_event_chatstates(From, To, Packet) -> {xmlelement, Name, Attrs, Els} = Packet, - case find_x_event(Els) of - false -> + case find_x_event_chatstates(Els, {false, false, false}) of + %% There wasn't any x:event or chatstates subelements + {false, false, _} -> + true; + %% There a chatstates subelement and other stuff, but no x:event + {false, CEl, true} when CEl /= false -> true; - El -> + %% There was only a subelement: a chatstates + {false, CEl, false} when CEl /= false -> + %% Don't allow offline storage + false; + %% There was an x:event element, and maybe also other stuff + {El, _, _} when El /= false -> case xml:get_subtag(El, "id") of false -> case xml:get_subtag(El, "offline") of @@ -218,22 +257,25 @@ check_event(From, To, Packet) -> {xmlelement, "offline", [], []}]}] }), true - end; + end; _ -> false end end. -find_x_event([]) -> - false; -find_x_event([{xmlcdata, _} | Els]) -> - find_x_event(Els); -find_x_event([El | Els]) -> +%% Check if the packet has subelements about XEP-0022, XEP-0085 or other +find_x_event_chatstates([], Res) -> + Res; +find_x_event_chatstates([{xmlcdata, _} | Els], Res) -> + find_x_event_chatstates(Els, Res); +find_x_event_chatstates([El | Els], {A, B, C}) -> case xml:get_tag_attr_s("xmlns", El) of ?NS_EVENT -> - El; + find_x_event_chatstates(Els, {El, B, C}); + ?NS_CHATSTATES -> + find_x_event_chatstates(Els, {A, El, C}); _ -> - find_x_event(Els) + find_x_event_chatstates(Els, {A, B, true}) end. find_x_expire(_, []) -> src/mod_offline_odbc.erl @@ -120,9 +120,13 @@ delete_listener(Host) -> %%%------------------------ %% disco#info request -process_iq(_, #iq{type = get, xmlns = ?NS_DISCO_INFO, lang = Lang} = IQ, #state{name=Name}) -> +process_iq(_, #iq{type = get, xmlns = ?NS_DISCO_INFO, lang = Lang} = IQ, + #state{name=Name, serverhost=ServerHost}) -> + Info = ejabberd_hooks:run_fold( + disco_info, ServerHost, [], [ServerHost, ?MODULE, "", ""]), IQ#iq{type = result, sub_el = - [{xmlelement, "query", [{"xmlns", ?NS_DISCO_INFO}], iq_disco_info(Lang, Name)}]}; + [{xmlelement, "query", [{"xmlns", ?NS_DISCO_INFO}], + iq_disco_info(Lang, Name) ++ Info}]}; %% disco#items request process_iq(_, #iq{type = get, xmlns = ?NS_DISCO_ITEMS} = IQ, _) -> src/mod_proxy65/mod_proxy65_service.erl @@ -25,7 +25,7 @@ ERLBEHAVBEAMS = $(addprefix $(OUTDIR)/,$(ERLBEHAVS:.erl=.beam)) BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam)) -all: $(ERLBEHAVBEAMS) $(BEAMS) +all: mod_pubsub_odbc.erl $(ERLBEHAVBEAMS) $(BEAMS) $(BEAMS): $(ERLBEHAVBEAMS) @@ -38,6 +38,9 @@ clean: distclean: clean rm -f Makefile +mod_pubsub_odbc.erl: + patch -o mod_pubsub_odbc.erl mod_pubsub.erl pubsub_odbc.patch + TAGS: etags *.erl src/mod_pubsub/Makefile.in @@ -4,7 +4,7 @@ include ..\Makefile.inc EFLAGS = -I .. -pz .. OUTDIR = .. -BEAMS = ..\gen_pubsub_node.beam ..\gen_pubsub_nodetree.beam ..\mod_pubsub.beam ..\nodetree_tree.beam ..\nodetree_virtual.beam ..\node_buddy.beam ..\node_club.beam ..\node_hometree.beam ..\node_dispatch.beam ..\node_pep.beam ..\node_private.beam ..\node_public.beam +BEAMS = ..\gen_pubsub_node.beam ..\gen_pubsub_nodetree.beam ..\mod_pubsub.beam ..\mod_pubsub_odbc.beam ..\node_buddy.beam ..\node_club.beam ..\node_dag.beam ..\node_dispatch.beam ..\node_flat.beam ..\node_flat_odbc.beam ..\node_hometree.beam ..\node_hometree_odbc.beam ..\node_mb.beam ..\node_pep.beam ..\node_pep_odbc.beam ..\node_private.beam ..\node_public.beam ..\nodetree_dag.beam ..\nodetree_tree.beam ..\nodetree_tree_odbc.beam ..\nodetree_virtual.beam ..\pubsub_db_odbc.beam ..\pubsub_index.beam ..\pubsub_subscription.beam ..\pubsub_subscription_odbc.beam ALL : $(BEAMS) @@ -20,11 +20,8 @@ $(OUTDIR)\gen_pubsub_nodetree.beam : gen_pubsub_nodetree.erl $(OUTDIR)\mod_pubsub.beam : mod_pubsub.erl erlc -W $(EFLAGS) -o $(OUTDIR) mod_pubsub.erl -$(OUTDIR)\nodetree_tree.beam : nodetree_tree.erl - erlc -W $(EFLAGS) -o $(OUTDIR) nodetree_tree.erl - -$(OUTDIR)\nodetree_virtual.beam : nodetree_virtual.erl - erlc -W $(EFLAGS) -o $(OUTDIR) nodetree_virtual.erl +$(OUTDIR)\mod_pubsub_odbc.beam : mod_pubsub_odbc.erl + erlc -W $(EFLAGS) -o $(OUTDIR) mod_pubsub_odbc.erl $(OUTDIR)\node_buddy.beam : node_buddy.erl erlc -W $(EFLAGS) -o $(OUTDIR) node_buddy.erl @@ -32,17 +29,59 @@ $(OUTDIR)\node_buddy.beam : node_buddy.erl $(OUTDIR)\node_club.beam : node_club.erl erlc -W $(EFLAGS) -o $(OUTDIR) node_club.erl -$(OUTDIR)\node_hometree.beam : node_hometree.erl - erlc -W $(EFLAGS) -o $(OUTDIR) node_hometree.erl +$(OUTDIR)\node_dag.beam : node_dag.erl + erlc -W $(EFLAGS) -o $(OUTDIR) node_dag.erl $(OUTDIR)\node_dispatch.beam : node_dispatch.erl erlc -W $(EFLAGS) -o $(OUTDIR) node_dispatch.erl +$(OUTDIR)\node_flat.beam : node_flat.erl + erlc -W $(EFLAGS) -o $(OUTDIR) node_flat.erl + +$(OUTDIR)\node_flat_odbc.beam : node_flat_odbc.erl + erlc -W $(EFLAGS) -o $(OUTDIR) node_flat_odbc.erl + +$(OUTDIR)\node_hometree.beam : node_hometree.erl + erlc -W $(EFLAGS) -o $(OUTDIR) node_hometree.erl + +$(OUTDIR)\node_hometree_odbc.beam : node_hometree_odbc.erl + erlc -W $(EFLAGS) -o $(OUTDIR) node_hometree_odbc.erl + +$(OUTDIR)\node_mb.beam : node_mb.erl + erlc -W $(EFLAGS) -o $(OUTDIR) node_mb.erl + $(OUTDIR)\node_pep.beam : node_pep.erl erlc -W $(EFLAGS) -o $(OUTDIR) node_pep.erl +$(OUTDIR)\node_pep_odbc.beam : node_pep_odbc.erl + erlc -W $(EFLAGS) -o $(OUTDIR) node_pep_odbc.erl + $(OUTDIR)\node_private.beam : node_private.erl erlc -W $(EFLAGS) -o $(OUTDIR) node_private.erl $(OUTDIR)\node_public.beam : node_public.erl erlc -W $(EFLAGS) -o $(OUTDIR) node_public.erl + +$(OUTDIR)\nodetree_dag.beam : nodetree_dag.erl + erlc -W $(EFLAGS) -o $(OUTDIR) nodetree_dag.erl + +$(OUTDIR)\nodetree_tree.beam : nodetree_tree.erl + erlc -W $(EFLAGS) -o $(OUTDIR) nodetree_tree.erl + +$(OUTDIR)\nodetree_tree_odbc.beam : nodetree_tree_odbc.erl + erlc -W $(EFLAGS) -o $(OUTDIR) nodetree_tree_odbc.erl + +$(OUTDIR)\nodetree_virtual.beam : nodetree_virtual.erl + erlc -W $(EFLAGS) -o $(OUTDIR) nodetree_virtual.erl + +$(OUTDIR)\pubsub_db_odbc.beam : pubsub_db_odbc.erl + erlc -W $(EFLAGS) -o $(OUTDIR) pubsub_db_odbc.erl + +$(OUTDIR)\pubsub_index.beam : pubsub_index.erl + erlc -W $(EFLAGS) -o $(OUTDIR) pubsub_index.erl + +$(OUTDIR)\pubsub_subscription.beam : pubsub_subscription.erl + erlc -W $(EFLAGS) -o $(OUTDIR) pubsub_subscription.erl + +$(OUTDIR)\pubsub_subscription_odbc.beam : pubsub_subscription_odbc.erl + erlc -W $(EFLAGS) -o $(OUTDIR) pubsub_subscription_odbc.erl src/mod_pubsub/Makefile.win32 @@ -58,7 +58,8 @@ behaviour_info(callbacks) -> {get_node_subscriptions, 1}, {get_entity_subscriptions, 2}, {get_subscriptions, 2}, - {set_subscriptions, 3}, + {set_subscriptions, 4}, + {get_pending_nodes, 2}, {get_states, 1}, {get_state, 2}, {set_state, 1}, src/mod_pubsub/gen_pubsub_node.erl @@ -35,7 +35,7 @@ %%% Functions concerning configuration should be rewritten. %%% %%% Support for subscription-options and multi-subscribe features was -%%% added by Brian Cully <bjc@kublai.com>. Subscriptions and options are +%%% added by Brian Cully (bjc AT kublai.com). Subscriptions and options are %%% stored in the pubsub_subscription table, with a link to them provided %%% by the subscriptions field of pubsub_state. For information on %%% subscription-options and mulit-subscribe see XEP-0060 sections 6.1.6, @@ -53,6 +53,7 @@ -behaviour(gen_mod). -include("ejabberd.hrl"). +-include("adhoc.hrl"). -include("jlib.hrl"). -include("pubsub.hrl"). @@ -166,9 +167,9 @@ stop(Host) -> %%-------------------------------------------------------------------- %% Function: init(Args) -> {ok, State} | -%% {ok, State, Timeout} | -%% ignore | -%% {stop, Reason} +%% {ok, State, Timeout} | +%% ignore | +%% {stop, Reason} %% Description: Initiates the server %%-------------------------------------------------------------------- init([ServerHost, Opts]) -> @@ -264,8 +265,8 @@ terminate_plugins(Host, ServerHost, Plugins, TreePlugin) -> ok. init_nodes(Host, ServerHost) -> - create_node(Host, ServerHost, ["home"], service_jid(Host), ?STDNODE), - create_node(Host, ServerHost, ["home", ServerHost], service_jid(Host), ?STDNODE), + create_node(Host, ServerHost, ["home"], service_jid(Host), "hometree"), + create_node(Host, ServerHost, ["home", ServerHost], service_jid(Host), "hometree"), ok. update_node_database(Host, ServerHost) -> @@ -275,7 +276,7 @@ update_node_database(Host, ServerHost) -> [host_node, host_parent, info] -> ?INFO_MSG("upgrade node pubsub tables",[]), F = fun() -> - lists:foldl( + {Result, LastIdx} = lists:foldl( fun({pubsub_node, NodeId, ParentId, {nodeinfo, Items, Options, Entities}}, {RecList, NodeIdx}) -> ItemsList = lists:foldl( @@ -319,7 +320,9 @@ update_node_database(Host, ServerHost) -> RecList], NodeIdx + 1} end, {[], 1}, mnesia:match_object( - {pubsub_node, {Host, '_'}, '_', '_'})) + {pubsub_node, {Host, '_'}, '_', '_'})), + mnesia:write(#pubsub_index{index = node, last = LastIdx, free = []}), + Result end, {atomic, NewRecords} = mnesia:transaction(F), {atomic, ok} = mnesia:delete_table(pubsub_node), @@ -350,7 +353,7 @@ update_node_database(Host, ServerHost) -> end, mnesia:transform_table(pubsub_node, F, [nodeid, id, parents, type, owners, options]), FNew = fun() -> - lists:foldl(fun(#pubsub_node{nodeid = NodeId} = PubsubNode, NodeIdx) -> + LastIdx = lists:foldl(fun(#pubsub_node{nodeid = NodeId} = PubsubNode, NodeIdx) -> mnesia:write(PubsubNode#pubsub_node{id = NodeIdx}), lists:foreach(fun(#pubsub_state{stateid = StateId} = State) -> {JID, _} = StateId, @@ -370,7 +373,8 @@ update_node_database(Host, ServerHost) -> end, 1, mnesia:match_object( {pubsub_node, {Host, '_'}, '_', '_', '_', '_', '_'}) ++ mnesia:match_object( - {pubsub_node, {{'_', ServerHost, '_'}, '_'}, '_', '_', '_', '_', '_'})) + {pubsub_node, {{'_', ServerHost, '_'}, '_'}, '_', '_', '_', '_', '_'})), + mnesia:write(#pubsub_index{index = node, last = LastIdx, free = []}) end, case mnesia:transaction(FNew) of {atomic, Result} -> @@ -458,7 +462,7 @@ send_loop(State) -> lists:foreach(fun(PType) -> {result, Subscriptions} = node_action(Host, PType, get_entity_subscriptions, [Host, JID]), lists:foreach( - fun({Node, subscribed, SubJID}) -> + fun({Node, subscribed, _, SubJID}) -> if (SubJID == LJID) or (SubJID == BJID) -> #pubsub_node{options = Options, type = Type, id = NodeId} = Node, case get_option(Options, send_last_published_item) of @@ -726,11 +730,11 @@ remove_user(User, Server) -> %%-------------------------------------------------------------------- %% Function: %% handle_call(Request, From, State) -> {reply, Reply, State} | -%% {reply, Reply, State, Timeout} | -%% {noreply, State} | -%% {noreply, State, Timeout} | -%% {stop, Reason, Reply, State} | -%% {stop, Reason, State} +%% {reply, Reply, State, Timeout} | +%% {noreply, State} | +%% {noreply, State, Timeout} | +%% {stop, Reason, Reply, State} | +%% {stop, Reason, State} %% Description: Handling call messages %%-------------------------------------------------------------------- %% @private @@ -747,8 +751,8 @@ handle_call(stop, _From, State) -> %%-------------------------------------------------------------------- %% Function: handle_cast(Msg, State) -> {noreply, State} | -%% {noreply, State, Timeout} | -%% {stop, Reason, State} +%% {noreply, State, Timeout} | +%% {stop, Reason, State} %% Description: Handling cast messages %%-------------------------------------------------------------------- %% @private @@ -767,7 +771,7 @@ handle_cast({remove_user, LUser, LServer}, State) -> lists:foreach(fun(PType) -> {result, Subscriptions} = node_action(Host, PType, get_entity_subscriptions, [Host, Owner]), lists:foreach(fun - ({#pubsub_node{nodeid = {H, N}}, subscribed, JID}) -> + ({#pubsub_node{nodeid = {H, N}}, subscribed, _, JID}) -> unsubscribe_node(H, N, Owner, JID, all); (_) -> ok @@ -788,7 +792,7 @@ handle_cast({unsubscribe, Subscriber, Owner}, State) -> lists:foreach(fun(PType) -> {result, Subscriptions} = node_action(Host, PType, get_entity_subscriptions, [Host, Subscriber]), lists:foreach(fun - ({Node, subscribed, JID}) -> + ({Node, subscribed, _, JID}) -> #pubsub_node{options = Options, owners = Owners, type = Type, id = NodeId} = Node, case get_option(Options, access_model) of presence -> @@ -812,8 +816,8 @@ handle_cast(_Msg, State) -> %%-------------------------------------------------------------------- %% Function: handle_info(Info, State) -> {noreply, State} | -%% {noreply, State, Timeout} | -%% {stop, Reason, State} +%% {noreply, State, Timeout} | +%% {stop, Reason, State} %% Description: Handling all non call/cast messages %%-------------------------------------------------------------------- %% @private @@ -889,12 +893,15 @@ do_route(ServerHost, Access, Plugins, Host, From, To, Packet) -> sub_el = SubEl, lang = Lang} = IQ -> {xmlelement, _, QAttrs, _} = SubEl, Node = xml:get_attr_s("node", QAttrs), + Info = ejabberd_hooks:run_fold( + disco_info, ServerHost, [], + [ServerHost, ?MODULE, "", ""]), Res = case iq_disco_info(Host, Node, From, Lang) of {result, IQRes} -> jlib:iq_to_xml( IQ#iq{type = result, sub_el = [{xmlelement, "query", - QAttrs, IQRes}]}); + QAttrs, IQRes++Info}]}); {error, Error} -> jlib:make_error_reply(Packet, Error) end, @@ -943,6 +950,15 @@ do_route(ServerHost, Access, Plugins, Host, From, To, Packet) -> sub_el = [{xmlelement, "vCard", [{"xmlns", XMLNS}], iq_get_vcard(Lang)}]}, ejabberd_router:route(To, From, jlib:iq_to_xml(Res)); + #iq{type = set, xmlns = ?NS_COMMANDS} = IQ -> + Res = case iq_command(Host, ServerHost, From, IQ, Access, Plugins) of + {error, Error} -> + jlib:make_error_reply(Packet, Error); + {result, IQRes} -> + jlib:iq_to_xml(IQ#iq{type = result, + sub_el = IQRes}) + end, + ejabberd_router:route(To, From, Res); #iq{} -> Err = jlib:make_error_reply( Packet, @@ -1280,6 +1296,140 @@ iq_pubsub_owner(Host, ServerHost, From, IQType, SubEl, Lang) -> {error, ?ERR_BAD_REQUEST} end. +iq_command(Host, ServerHost, From, IQ, Access, Plugins) -> + case adhoc:parse_request(IQ) of + Req when is_record(Req, adhoc_request) -> + case adhoc_request(Host, ServerHost, From, Req, Access, Plugins) of + Resp when is_record(Resp, adhoc_response) -> + {result, [adhoc:produce_response(Req, Resp)]}; + Error -> + Error + end; + Err -> + Err + end. + +%% @doc Processes an Ad Hoc Command. +adhoc_request(Host, _ServerHost, Owner, + #adhoc_request{node = ?NS_PUBSUB_GET_PENDING, + lang = Lang, + action = "execute", + xdata = false}, + _Access, Plugins) -> + send_pending_node_form(Host, Owner, Lang, Plugins); +adhoc_request(Host, _ServerHost, Owner, + #adhoc_request{node = ?NS_PUBSUB_GET_PENDING, + action = "execute", + xdata = XData}, + _Access, _Plugins) -> + ParseOptions = case XData of + {xmlelement, "x", _Attrs, _SubEls} = XEl -> + case jlib:parse_xdata_submit(XEl) of + invalid -> + {error, ?ERR_BAD_REQUEST}; + XData2 -> + case set_xoption(XData2, []) of + NewOpts when is_list(NewOpts) -> + {result, NewOpts}; + Err -> + Err + end + end; + _ -> + ?INFO_MSG("Bad XForm: ~p", [XData]), + {error, ?ERR_BAD_REQUEST} + end, + case ParseOptions of + {result, XForm} -> + case lists:keysearch(node, 1, XForm) of + {value, {_, Node}} -> + send_pending_auth_events(Host, Node, Owner); + false -> + {error, ?ERR_EXTENDED(?ERR_BAD_REQUEST, "bad-payload")} + end; + Error -> + Error + end; +adhoc_request(_Host, _ServerHost, _Owner, Other, _Access, _Plugins) -> + ?DEBUG("Couldn't process ad hoc command:~n~p", [Other]), + {error, ?ERR_ITEM_NOT_FOUND}. + +%% @spec (Host, Owner, Lang, Plugins) -> iqRes() +%% @doc Sends the process pending subscriptions XForm for Host to +%% Owner. +send_pending_node_form(Host, Owner, _Lang, Plugins) -> + Filter = + fun (Plugin) -> + lists:member("get-pending", features(Plugin)) + end, + case lists:filter(Filter, Plugins) of + [] -> + {error, ?ERR_FEATURE_NOT_IMPLEMENTED}; + Ps -> + XOpts = lists:map(fun (Node) -> + {xmlelement, "option", [], + [{xmlelement, "value", [], + [{xmlcdata, node_to_string(Node)}]}]} + end, get_pending_nodes(Host, Owner, Ps)), + XForm = {xmlelement, "x", [{"xmlns", ?NS_XDATA}, {"type", "form"}], + [{xmlelement, "field", + [{"type", "list-single"}, {"var", "pubsub#node"}], + lists:usort(XOpts)}]}, + #adhoc_response{status = executing, + defaultaction = "execute", + elements = [XForm]} + end. + +get_pending_nodes(Host, Owner, Plugins) -> + Tr = + fun (Type) -> + case node_call(Type, get_pending_nodes, [Host, Owner]) of + {result, Nodes} -> Nodes; + _ -> [] + end + end, + case transaction(fun () -> {result, lists:flatmap(Tr, Plugins)} end, + sync_dirty) of + {result, Res} -> Res; + Err -> Err + end. + +%% @spec (Host, Node, Owner) -> iqRes() +%% @doc Send a subscription approval form to Owner for all pending +%% subscriptions on Host and Node. +send_pending_auth_events(Host, Node, Owner) -> + ?DEBUG("Sending pending auth events for ~s on ~s:~s", + [jlib:jid_to_string(Owner), Host, node_to_string(Node)]), + Action = + fun (#pubsub_node{id = NodeID, type = Type} = N) -> + case lists:member("get-pending", features(Type)) of + true -> + case node_call(Type, get_affiliation, [NodeID, Owner]) of + {result, owner} -> + broadcast_pending_auth_events(N), + {result, ok}; + _ -> + {error, ?ERR_FORBIDDEN} + end; + false -> + {error, ?ERR_FEATURE_NOT_IMPLEMENTED} + end + end, + case transaction(Host, Node, Action, sync_dirty) of + {result, _} -> + #adhoc_response{}; + Err -> + Err + end. + +broadcast_pending_auth_events(#pubsub_node{type = Type, id = NodeID} = Node) -> + {result, Subscriptions} = node_call(Type, get_node_subscriptions, [NodeID]), + lists:foreach(fun ({J, pending, _SubID}) -> + send_authorization_request(Node, jlib:make_jid(J)); + ({J, pending}) -> + send_authorization_request(Node, jlib:make_jid(J)) + end, Subscriptions). + %%% authorization handling send_authorization_request(#pubsub_node{owners = Owners, nodeid = {Host, Node}}, Subscriber) -> @@ -1417,18 +1567,11 @@ update_auth(Host, Node, Type, NodeId, Subscriber, case Subscription of [{pending, SubID}] -> %% TODO does not work if several pending NewSubscription = case Allow of - true -> - node_call(Type, set_subscriptions, - [NodeId, Subscriber, - replace_subscription({subscribed, SubID}, - Subscriptions)]), - {subscribed, SubID}; - false -> - node_call(Type, unsubscribe_node, - [NodeId, Subscriber, Subscriber, - SubID]), - none + true -> subscribed; + false -> none end, + node_call(Type, set_subscriptions, + [NodeId, Subscriber, NewSubscription, SubID]), send_authorization_approval(Host, Subscriber, Node, NewSubscription), {result, ok}; @@ -1436,17 +1579,6 @@ update_auth(Host, Node, Type, NodeId, Subscriber, {error, ?ERR_UNEXPECTED_REQUEST} end. -replace_subscription(NewSub, Subs) -> - lists:foldl(fun(S, A) -> replace_subscription_helper(NewSub, S, A) end, - [], Subs). - -replace_subscription_helper({none, SubID}, {_, SubID}, Acc) -> - Acc; -replace_subscription_helper({NewSub, SubID}, {_, SubID}, Acc) -> - [{NewSub, SubID} | Acc]; -replace_subscription_helper(_, OldSub, Acc) -> - [OldSub | Acc]. - -define(XFIELD(Type, Label, Var, Val), {xmlelement, "field", [{"type", Type}, {"label", translate:translate(Lang, Label)}, @@ -1667,7 +1799,7 @@ delete_node(Host, Node, Owner) -> Error end. -%% @spec (Host, Node, From, JID) -> +%% @spec (Host, Node, From, JID, Configuration) -> %% {error, Reason::stanzaError()} | %% {result, []} %% Host = host() @@ -1834,7 +1966,7 @@ publish_item(Host, ServerHost, Node, Publisher, ItemId, Payload) -> Features = features(Type), PublishFeature = lists:member("publish", Features), PublishModel = get_option(Options, publish_model), - MaxItems = max_items(Options), + MaxItems = max_items(Host, Options), DeliverPayloads = get_option(Options, deliver_payloads), PersistItems = get_option(Options, persist_items), PayloadCount = payload_xmlelements(Payload), @@ -2117,7 +2249,7 @@ get_item(Host, Node, ItemId) -> Error -> Error end. -%% @spec (Host, Node, NodeId, Type LJID, Number) -> any() +%% @spec (Host, Node, NodeId, Type, LJID, Number) -> any() %% Host = pubsubHost() %% Node = pubsubNode() %% NodeId = pubsubNodeId() @@ -2428,19 +2560,19 @@ get_subscriptions(Host, Node, JID, Plugins) when is_list(Plugins) -> end; ({_, none, _}) -> []; - ({#pubsub_node{nodeid = {_, SubsNode}}, subscribed, SubID, SubJID}) -> + ({#pubsub_node{nodeid = {_, SubsNode}}, Subscription, SubID, SubJID}) -> case Node of [] -> [{xmlelement, "subscription", [{"jid", jlib:jid_to_string(SubJID)}, {"subid", SubID}, - {"subscription", subscription_to_string(subscribed)}|nodeAttr(SubsNode)], + {"subscription", subscription_to_string(Subscription)}|nodeAttr(SubsNode)], []}]; SubsNode -> [{xmlelement, "subscription", [{"jid", jlib:jid_to_string(SubJID)}, {"subid", SubID}, - {"subscription", subscription_to_string(subscribed)}], + {"subscription", subscription_to_string(Subscription)}], []}]; _ -> [] @@ -2484,11 +2616,10 @@ get_subscriptions(Host, Node, JID) -> end end, case transaction(Host, Node, Action, sync_dirty) of - {result, {_, []}} -> - {error, ?ERR_ITEM_NOT_FOUND}; {result, {_, Subscriptions}} -> Entities = lists:flatmap( fun({_, none}) -> []; + ({_, pending, _}) -> []; ({AJID, Subscription}) -> [{xmlelement, "subscription", [{"jid", jlib:jid_to_string(AJID)}, @@ -2523,12 +2654,13 @@ set_subscriptions(Host, Node, From, EntitiesEls) -> xml:get_attr_s("jid", Attrs)), Subscription = string_to_subscription( xml:get_attr_s("subscription", Attrs)), + SubId = xml:get_attr_s("subid", Attrs), if (JID == error) or (Subscription == false) -> error; true -> - [{jlib:jid_tolower(JID), Subscription} | Acc] + [{jlib:jid_tolower(JID), Subscription, SubId} | Acc] end end end @@ -2540,8 +2672,8 @@ set_subscriptions(Host, Node, From, EntitiesEls) -> Action = fun(#pubsub_node{owners = Owners, type = Type, id = NodeId}) -> case lists:member(Owner, Owners) of true -> - lists:foreach(fun({JID, Subscription}) -> - node_call(Type, set_subscriptions, [NodeId, JID, Subscription]) + lists:foreach(fun({JID, Subscription, SubId}) -> + node_call(Type, set_subscriptions, [NodeId, JID, Subscription, SubId]) end, Entities), {result, []}; _ -> @@ -2554,7 +2686,6 @@ set_subscriptions(Host, Node, From, EntitiesEls) -> end end. - %% @spec (OwnerUser, OwnerServer, {SubscriberUser, SubscriberServer, SubscriberResource}, AllowedGroups) %% -> {PresenceSubscription, RosterGroup} get_roster_info(OwnerUser, OwnerServer, {SubscriberUser, SubscriberServer, _}, AllowedGroups) -> @@ -2632,7 +2763,7 @@ service_jid(Host) -> _ -> {jid, "", Host, "", "", Host, ""} end. -%% @spec (LJID, PresenceDelivery) -> boolean() +%% @spec (LJID, NotifyType, Depth, NodeOptions, SubOptions) -> boolean() %% LJID = jid() %% NotifyType = items | nodes %% Depth = integer() @@ -2652,7 +2783,7 @@ sub_to_deliver(_LJID, NotifyType, Depth, SubOptions) -> sub_option_can_deliver(items, _, {subscription_type, nodes}) -> false; sub_option_can_deliver(nodes, _, {subscription_type, items}) -> false; sub_option_can_deliver(_, _, {subscription_depth, all}) -> true; -sub_option_can_deliver(_, Depth, {subscription_depth, D}) -> Depth < D; +sub_option_can_deliver(_, Depth, {subscription_depth, D}) -> Depth =< D; sub_option_can_deliver(_, _, {deliver, false}) -> false; sub_option_can_deliver(_, _, {expire, When}) -> now() < When; sub_option_can_deliver(_, _, _) -> true. @@ -2668,7 +2799,7 @@ presence_can_deliver({User, Server, _}, true) -> [] -> false; Ss -> lists:foldl(fun({session, _, _, _, undefined, _}, Acc) -> Acc; - ({session, _, _, _, _Priority, _}, _Acc) -> true + ({session, _, _, _, _Priority, _}, _Acc) -> true end, false, Ss) end. @@ -2793,14 +2924,13 @@ broadcast_config_notification(Host, Node, NodeId, Type, NodeOptions, Lang) -> SubsByDepth when is_list(SubsByDepth) -> Content = case get_option(NodeOptions, deliver_payloads) of true -> - [{xmlelement, "x", [{"xmlns", ?NS_XDATA}, {"type", "form"}], + [{xmlelement, "x", [{"xmlns", ?NS_XDATA}, {"type", "result"}], get_configure_xfields(Type, NodeOptions, Lang, [])}]; false -> [] end, Stanza = event_stanza( - [{xmlelement, "items", nodeAttr(Node), - [{xmlelement, "item", itemAttr("configuration"), Content}]}]), + [{xmlelement, "configuration", nodeAttr(Node), Content}]), broadcast_stanza(Host, Node, NodeId, Type, NodeOptions, SubsByDepth, nodes, Stanza), {result, true}; @@ -2812,16 +2942,9 @@ broadcast_config_notification(Host, Node, NodeId, Type, NodeOptions, Lang) -> end. get_collection_subscriptions(Host, Node) -> - case mnesia:transaction(fun tree_call/3, - [Host, get_parentnodes_tree, - [Host, Node, service_jid(Host)]]) of - {atomic, NodesByDepth} when is_list(NodesByDepth) -> - lists:map(fun ({Depth, Nodes}) -> - {Depth, [{N, get_node_subs(N)} || N <- Nodes]} - end, NodesByDepth); - Other -> - Other - end. + lists:map(fun ({Depth, Nodes}) -> + {Depth, [{N, get_node_subs(N)} || N <- Nodes]} + end, tree_action(Host, get_parentnodes_tree, [Host, Node, service_jid(Host)])). get_node_subs(#pubsub_node{type = Type, nodeid = {Host, Node}, @@ -2833,6 +2956,16 @@ get_node_subs(#pubsub_node{type = Type, Other end. +get_options_for_subs(_Host, Node, NodeID, Subs) -> + lists:foldl(fun({JID, subscribed, SubID}, Acc) -> + case pubsub_subscription:get_subscription(JID, NodeID, SubID) of + {result, #pubsub_subscription{options = Options}} -> [{JID, Node, Options} | Acc]; + _ -> Acc + end; + (_, Acc) -> + Acc + end, [], Subs). + % TODO: merge broadcast code that way %broadcast(Host, Node, NodeId, Type, NodeOptions, Feature, Force, ElName, SubEls) -> % case (get_option(NodeOptions, Feature) or Force) of @@ -3005,7 +3138,7 @@ get_default(Host, Node, _From, Lang) -> {result, [{xmlelement, "pubsub", [{"xmlns", ?NS_PUBSUB_OWNER}], [{xmlelement, "default", [], [{xmlelement, "x", [{"xmlns", ?NS_XDATA}, {"type", "form"}], - get_configure_xfields(Type, Options, Lang, []) + get_configure_xfields(Type, Options, Lang, []) }]}]}]}. %% Get node option @@ -3030,7 +3163,8 @@ node_options(Type) -> Result end. -%% @spec (Options) -> MaxItems +%% @spec (Host, Options) -> MaxItems +%% Host = host() %% Options = [Option] %% Option = {Key::atom(), Value::term()} %% MaxItems = integer() | unlimited @@ -3040,7 +3174,7 @@ node_options(Type) -> %% @todo In practice, the current data structure means that we cannot manage %% millions of items on a given node. This should be addressed in a new %% version. -max_items(Options) -> +max_items(Host, Options) -> case get_option(Options, persist_items) of true -> case get_option(Options, max_items) of @@ -3050,8 +3184,13 @@ max_items(Options) -> end; false -> case get_option(Options, send_last_published_item) of - never -> 0; - _ -> 1 + never -> + 0; + _ -> + case is_last_item_cache_enabled(Host) of + true -> 0; + false -> 1 + end end end. @@ -3083,7 +3222,7 @@ max_items(Options) -> -define(NLIST_CONFIG_FIELD(Label, Var), ?STRINGMXFIELD(Label, "pubsub#" ++ atom_to_list(Var), - [node_to_string(N) || N <- get_option(Options, Var)])). + [node_to_string(N) || N <- get_option(Options, Var, [])])). get_configure_xfields(_Type, Options, Lang, Groups) -> [?XFIELD("hidden", "", "FORM_TYPE", ?NS_PUBSUB_NODE_CONFIG), @@ -3167,14 +3306,6 @@ set_configure(Host, Node, From, Els, Lang) -> {error, ?ERR_BAD_REQUEST} end. -get_options_for_subs(_Host, Node, NodeID, Subs) -> - lists:foldl(fun({JID, subscribed, SubID}, Acc) -> - {result, #pubsub_subscription{options = Options}} = pubsub_subscription:get_subscription(JID, NodeID, SubID), - [{JID, Node, Options} | Acc]; - (_, Acc) -> - Acc - end, [], Subs). - add_opt(Key, Value, Opts) -> Opts1 = lists:keydelete(Key, 1, Opts), [{Key, Value} | Opts1]. @@ -3257,35 +3388,42 @@ set_xoption([{"pubsub#body_xslt", Value} | Opts], NewOpts) -> set_xoption([{"pubsub#collection", Value} | Opts], NewOpts) -> NewValue = [string_to_node(V) || V <- Value], ?SET_LIST_XOPT(collection, NewValue); +set_xoption([{"pubsub#node", [Value]} | Opts], NewOpts) -> + NewValue = string_to_node(Value), + ?SET_LIST_XOPT(node, NewValue); set_xoption([_ | Opts], NewOpts) -> % skip unknown field set_xoption(Opts, NewOpts). %%%% last item cache handling +is_last_item_cache_enabled({_, ServerHost, _}) -> + is_last_item_cache_enabled(ServerHost); +is_last_item_cache_enabled(Host) -> + case ets:lookup(gen_mod:get_module_proc(Host, config), last_item_cache) of + [{last_item_cache, true}] -> true; + _ -> false + end. + set_cached_item({_, ServerHost, _}, NodeId, ItemId, Payload) -> set_cached_item(ServerHost, NodeId, ItemId, Payload); set_cached_item(Host, NodeId, ItemId, Payload) -> - case ets:lookup(gen_mod:get_module_proc(Host, config), last_item_cache) of - [{last_item_cache, true}] -> - ets:insert(gen_mod:get_module_proc(Host, last_items), {NodeId, {ItemId, Payload}}); - _ -> - ok + case is_last_item_cache_enabled(Host) of + true -> ets:insert(gen_mod:get_module_proc(Host, last_items), {NodeId, {ItemId, Payload}}); + _ -> ok end. unset_cached_item({_, ServerHost, _}, NodeId) -> unset_cached_item(ServerHost, NodeId); unset_cached_item(Host, NodeId) -> - case ets:lookup(gen_mod:get_module_proc(Host, config), last_item_cache) of - [{last_item_cache, true}] -> - ets:delete(gen_mod:get_module_proc(Host, last_items), NodeId); - _ -> - ok + case is_last_item_cache_enabled(Host) of + true -> ets:delete(gen_mod:get_module_proc(Host, last_items), NodeId); + _ -> ok end. get_cached_item({_, ServerHost, _}, NodeId) -> get_cached_item(ServerHost, NodeId); get_cached_item(Host, NodeId) -> - case ets:lookup(gen_mod:get_module_proc(Host, config), last_item_cache) of - [{last_item_cache, true}] -> + case is_last_item_cache_enabled(Host) of + true -> case ets:lookup(gen_mod:get_module_proc(Host, last_items), NodeId) of [{NodeId, {ItemId, Payload}}] -> #pubsub_item{itemid = {ItemId, NodeId}, payload = Payload}; @@ -3338,7 +3476,7 @@ features() -> % see plugin "delete-items", % RECOMMENDED % see plugin "delete-nodes", % RECOMMENDED % see plugin "filtered-notifications", % RECOMMENDED - %TODO "get-pending", % OPTIONAL + % see plugin "get-pending", % OPTIONAL % see plugin "instant-nodes", % RECOMMENDED "item-ids", % RECOMMENDED "last-published", % RECOMMENDED src/mod_pubsub/mod_pubsub.erl @@ -57,7 +57,8 @@ get_entity_subscriptions/2, get_node_subscriptions/1, get_subscriptions/2, - set_subscriptions/3, + set_subscriptions/4, + get_pending_nodes/2, get_states/1, get_state/2, set_state/1, @@ -157,8 +158,11 @@ get_node_subscriptions(NodeId) -> get_subscriptions(NodeId, Owner) -> node_hometree:get_subscriptions(NodeId, Owner). -set_subscriptions(NodeId, Owner, Subscriptions) -> - node_hometree:set_subscriptions(NodeId, Owner, Subscriptions). +set_subscriptions(NodeId, Owner, Subscription, SubId) -> + node_hometree:set_subscriptions(NodeId, Owner, Subscription, SubId). + +get_pending_nodes(Host, Owner) -> + node_hometree:get_pending_nodes(Host, Owner). get_states(NodeId) -> node_hometree:get_states(NodeId). src/mod_pubsub/node.template @@ -58,7 +58,8 @@ get_entity_subscriptions/2, get_node_subscriptions/1, get_subscriptions/2, - set_subscriptions/3, + set_subscriptions/4, + get_pending_nodes/2, get_states/1, get_state/2, set_state/1, @@ -159,8 +160,11 @@ get_node_subscriptions(NodeId) -> get_subscriptions(NodeId, Owner) -> node_hometree:get_subscriptions(NodeId, Owner). -set_subscriptions(NodeId, Owner, Subscriptions) -> - node_hometree:set_subscriptions(NodeId, Owner, Subscriptions). +set_subscriptions(NodeId, Owner, Subscription, SubId) -> + node_hometree:set_subscriptions(NodeId, Owner, Subscription, SubId). + +get_pending_nodes(Host, Owner) -> + node_hometree:get_pending_nodes(Host, Owner). get_states(NodeId) -> node_hometree:get_states(NodeId). src/mod_pubsub/node_buddy.erl @@ -58,7 +58,8 @@ get_entity_subscriptions/2, get_node_subscriptions/1, get_subscriptions/2, - set_subscriptions/3, + set_subscriptions/4, + get_pending_nodes/2, get_states/1, get_state/2, set_state/1, @@ -158,8 +159,11 @@ get_node_subscriptions(NodeId) -> get_subscriptions(NodeId, Owner) -> node_hometree:get_subscriptions(NodeId, Owner). -set_subscriptions(NodeId, Owner, Subscription) -> - node_hometree:set_subscriptions(NodeId, Owner, Subscription). +set_subscriptions(NodeId, Owner, Subscription, SubId) -> + node_hometree:set_subscriptions(NodeId, Owner, Subscription, SubId). + +get_pending_nodes(Host, Owner) -> + node_hometree:get_pending_nodes(Host, Owner). get_states(NodeId) -> node_hometree:get_states(NodeId). src/mod_pubsub/node_club.erl @@ -42,7 +42,8 @@ get_entity_subscriptions/2, get_node_subscriptions/1, get_subscriptions/2, - set_subscriptions/3, + set_subscriptions/4, + get_pending_nodes/2, get_states/1, get_state/2, set_state/1, @@ -86,8 +87,25 @@ unsubscribe_node(NodeID, Sender, Subscriber, SubID) -> node_hometree:unsubscribe_node(NodeID, Sender, Subscriber, SubID). publish_item(NodeID, Publisher, Model, MaxItems, ItemID, Payload) -> - node_hometree:publish_item(NodeID, Publisher, Model, MaxItems, - ItemID, Payload). + %% TODO: should look up the NodeTree plugin here. There's no + %% access to the Host of the request at this level, so for now we + %% just use nodetree_dag. + case nodetree_dag:get_node(NodeID) of + #pubsub_node{options = Options} -> + case find_opt(node_type, Options) of + collection -> + {error, ?ERR_EXTENDED(?ERR_NOT_ALLOWED, "publish")}; + _ -> + node_hometree:publish_item(NodeID, Publisher, Model, + MaxItems, ItemID, Payload) + end; + Err -> + Err + end. + +find_opt(_, []) -> false; +find_opt(Option, [{Option, Value} | _]) -> Value; +find_opt(Option, [_ | T]) -> find_opt(Option, T). remove_extra_items(NodeID, MaxItems, ItemIDs) -> node_hometree:remove_extra_items(NodeID, MaxItems, ItemIDs). @@ -119,8 +137,11 @@ get_node_subscriptions(NodeID) -> get_subscriptions(NodeID, Owner) -> node_hometree:get_subscriptions(NodeID, Owner). -set_subscriptions(NodeID, Owner, Subscriptions) -> - node_hometree:set_subscriptions(NodeID, Owner, Subscriptions). +set_subscriptions(NodeID, Owner, Subscription, SubID) -> + node_hometree:set_subscriptions(NodeID, Owner, Subscription, SubID). + +get_pending_nodes(Host, Owner) -> + node_hometree:get_pending_nodes(Host, Owner). get_states(NodeID) -> node_hometree:get_states(NodeID). src/mod_pubsub/node_dag.erl @@ -56,7 +56,8 @@ get_entity_subscriptions/2, get_node_subscriptions/1, get_subscriptions/2, - set_subscriptions/3, + set_subscriptions/4, + get_pending_nodes/2, get_states/1, get_state/2, set_state/1, @@ -162,8 +163,11 @@ get_node_subscriptions(NodeId) -> get_subscriptions(_NodeId, _Owner) -> {result, []}. -set_subscriptions(NodeId, Owner, Subscription) -> - node_hometree:set_subscriptions(NodeId, Owner, Subscription). +set_subscriptions(NodeId, Owner, Subscription, SubId) -> + node_hometree:set_subscriptions(NodeId, Owner, Subscription, SubId). + +get_pending_nodes(Host, Owner) -> + node_hometree:get_pending_nodes(Host, Owner). get_states(NodeId) -> node_hometree:get_states(NodeId). src/mod_pubsub/node_dispatch.erl @@ -49,7 +49,8 @@ get_entity_subscriptions/2, get_node_subscriptions/1, get_subscriptions/2, - set_subscriptions/3, + set_subscriptions/4, + get_pending_nodes/2, get_states/1, get_state/2, set_state/1, @@ -145,8 +146,11 @@ get_node_subscriptions(NodeId) -> get_subscriptions(NodeId, Owner) -> node_hometree:get_subscriptions(NodeId, Owner). -set_subscriptions(NodeId, Owner, Subscription) -> - node_hometree:set_subscriptions(NodeId, Owner, Subscription). +set_subscriptions(NodeId, Owner, Subscription, SubId) -> + node_hometree:set_subscriptions(NodeId, Owner, Subscription, SubId). + +get_pending_nodes(Host, Owner) -> + node_hometree:get_pending_nodes(Host, Owner). get_states(NodeId) -> node_hometree:get_states(NodeId). src/mod_pubsub/node_flat.erl @@ -65,7 +65,8 @@ get_entity_subscriptions/2, get_node_subscriptions/1, get_subscriptions/2, - set_subscriptions/3, + set_subscriptions/4, + get_pending_nodes/2, get_states/1, get_state/2, set_state/1, @@ -93,6 +94,7 @@ %% plugin. It can be used for example by the developer to create the specific %% module database schema if it does not exists yet. init(Host, ServerHost, Opts) -> + pubsub_subscription:init(), erlsdb:start(), Bucket = gen_mod:get_opt(s3_tree_bucket, Opts, ServerHost), s3:start(), @@ -163,6 +165,7 @@ features() -> "access-authorize", "delete-nodes", "delete-items", + "get-pending", "instant-nodes", "manage-subscriptions", "modify-affiliations", @@ -250,7 +253,7 @@ delete_node(Removed) -> end, Removed), {result, {default, broadcast, Reply}}. -%% @spec (NodeId, Sender, Subscriber, AccessModel, SendLast, PresenceSubscription, RosterGroup) -> +%% @spec (NodeId, Sender, Subscriber, AccessModel, SendLast, PresenceSubscription, RosterGroup, Options) -> %% {error, Reason} | {result, Result} %% @doc Accepts or rejects subcription requests on a PubSub node. %% The mechanism works as follow: @@ -318,8 +321,9 @@ subscribe_node(NodeId, Sender, Subscriber, AccessModel, (AccessModel == whitelist) and (not Whitelisted) -> %% Node has whitelist access model and entity lacks required affiliation {error, ?ERR_EXTENDED(?ERR_NOT_ALLOWED, "closed-node")}; - PendingSubscription -> - {error, ?ERR_EXTENDED(?ERR_NOT_AUTHORIZED, "pending-subscription")}; + (AccessModel == authorize) -> % TODO: to be done + %% Node has authorize access model + {error, ?ERR_FORBIDDEN}; %%MustPay -> %% % Payment is required for a subscription %% {error, ?ERR_PAYMENT_REQUIRED}; @@ -327,33 +331,32 @@ subscribe_node(NodeId, Sender, Subscriber, AccessModel, %% % Requesting entity is anonymous %% {error, ?ERR_FORBIDDEN}; true -> - case pubsub_subscription:subscribe_node(Subscriber, - NodeId, Options) of - {result, SubID} -> + case pubsub_subscription:add_subscription(Subscriber, NodeId, Options) of + SubId when is_list(SubId) -> NewSub = case AccessModel of authorize -> pending; - _ -> subscribed + _ -> subscribed end, - set_state(SubState#pubsub_state{subscriptions = [{NewSub, SubID} | Subscriptions]}), + set_state(SubState#pubsub_state{subscriptions = [{NewSub, SubId} | Subscriptions]}), case {NewSub, SendLast} of {subscribed, never} -> - {result, {default, subscribed, SubID}}; + {result, {default, subscribed, SubId}}; {subscribed, _} -> - {result, {default, subscribed, SubID, send_last}}; + {result, {default, subscribed, SubId, send_last}}; {_, _} -> - {result, {default, pending, SubID}} + {result, {default, pending, SubId}} end; _ -> {error, ?ERR_INTERNAL_SERVER_ERROR} end end. -%% @spec (NodeId, Sender, Subscriber, SubID) -> +%% @spec (NodeId, Sender, Subscriber, SubId) -> %% {error, Reason} | {result, []} %% NodeId = mod_pubsub:pubsubNodeId() %% Sender = mod_pubsub:jid() %% Subscriber = mod_pubsub:jid() -%% SubID = mod_pubsub:subid() +%% SubId = mod_pubsub:subid() %% Reason = mod_pubsub:stanzaError() %% @doc Unsubscribe the <tt>Subscriber</tt> from the <tt>Node</tt>. unsubscribe_node(NodeId, Sender, Subscriber, SubId) -> @@ -365,8 +368,8 @@ unsubscribe_node(NodeId, Sender, Subscriber, SubId) -> GenKey -> GenState; _ -> get_state(NodeId, SubKey) end, - Subscriptions = lists:filter(fun({_Sub, _SubID}) -> true; - (_SubID) -> false + Subscriptions = lists:filter(fun({_Sub, _SubId}) -> true; + (_SubId) -> false end, SubState#pubsub_state.subscriptions), SubIdExists = case SubId of [] -> false; @@ -377,11 +380,11 @@ unsubscribe_node(NodeId, Sender, Subscriber, SubId) -> %% Requesting entity is prohibited from unsubscribing entity not Authorized -> {error, ?ERR_FORBIDDEN}; - %% Entity did not specify SubID - %%SubID == "", ?? -> + %% Entity did not specify SubId + %%SubId == "", ?? -> %% {error, ?ERR_EXTENDED(?ERR_BAD_REQUEST, "subid-required")}; %% Invalid subscription identifier - %%InvalidSubID -> + %%InvalidSubId -> %% {error, ?ERR_EXTENDED(?ERR_NOT_ACCEPTABLE, "invalid-subid")}; %% Requesting entity is not a subscriber Subscriptions == [] -> @@ -412,11 +415,11 @@ unsubscribe_node(NodeId, Sender, Subscriber, SubId) -> {error, ?ERR_EXTENDED(?ERR_BAD_REQUEST, "subid-required")} end. -delete_subscription(SubKey, NodeID, {Subscription, SubID}, SubState) -> +delete_subscription(SubKey, NodeID, {Subscription, SubId}, SubState) -> Affiliation = SubState#pubsub_state.affiliation, AllSubs = SubState#pubsub_state.subscriptions, - NewSubs = AllSubs -- [{Subscription, SubID}], - pubsub_subscription:unsubscribe_node(SubKey, NodeID, SubID), + NewSubs = AllSubs -- [{Subscription, SubId}], + pubsub_subscription:delete_subscription(SubKey, NodeID, SubId), case {Affiliation, NewSubs} of {none, []} -> % Just a regular subscriber, and this is final item, so @@ -474,13 +477,15 @@ publish_item(NodeId, Publisher, PublishModel, MaxItems, ItemId, Payload) -> _ -> get_state(NodeId, SubKey) end, Affiliation = GenState#pubsub_state.affiliation, - Subscription = SubState#pubsub_state.subscriptions, + Subscribed = case PublishModel of + subscribers -> is_subscribed(SubState#pubsub_state.subscriptions); + _ -> undefined + end, if not ((PublishModel == open) or ((PublishModel == publishers) and ((Affiliation == owner) or (Affiliation == publisher))) - or ((PublishModel == subscribers) - and (Subscription == subscribed))) -> + or (Subscribed == true)) -> %% Entity does not have sufficient privileges to publish to node {error, ?ERR_FORBIDDEN}; true -> @@ -667,10 +672,8 @@ get_entity_subscriptions(Host, Owner) -> #pubsub_state{stateid = {J, N}, subscriptions = Ss} = sdb_to_record(Record), case NodeTree:get_node(N) of #pubsub_node{nodeid = {Host, _}} = Node -> - lists:foldl(fun({subscribed, SubID}, Acc2) -> - [{Node, subscribed, SubID, J} | Acc2]; - ({pending, _SubID}, Acc2) -> - [{Node, pending, J} | Acc2]; + lists:foldl(fun({Sub, SubId}, Acc2) -> + [{Node, Sub, SubId, J} | Acc2]; (S, Acc2) -> [{Node, S, J} | Acc2] end, Acc, Ss); @@ -685,12 +688,15 @@ get_node_subscriptions(NodeId) -> %% TODO: get rid of cases to handle non-list subscriptions case Subscriptions of [_|_] -> - lists:map(fun({subscribed, SubID}) -> {J, subscribed, SubID}; - ({pending, _SubID}) -> {J, pending}; - (S) -> {J, S} - end, Subscriptions); + lists:foldl(fun({S, SubId}, Acc) -> + [{J, S, SubId} | Acc]; + (S, Acc) -> + [{J, S} | Acc] + end, [], Subscriptions); + [] -> + []; _ -> - [{J, none}] + [{J, none}] end end, {result, lists:flatmap(Tr, States)}. @@ -700,23 +706,93 @@ get_subscriptions(NodeId, Owner) -> SubState = get_state(NodeId, SubKey), {result, SubState#pubsub_state.subscriptions}. -set_subscriptions(NodeId, Owner, Subscriptions) -> +set_subscriptions(NodeId, Owner, Subscription, SubId) -> SubKey = jlib:jid_tolower(Owner), SubState = get_state(NodeId, SubKey), + case {SubId, SubState#pubsub_state.subscriptions} of + {_, []} -> + {error, ?ERR_ITEM_NOT_FOUND}; + {"", [{_, SID}]} -> + case Subscription of + none -> unsub_with_subid(NodeId, SID, SubState); + _ -> replace_subscription({Subscription, SID}, SubState) + end; + {"", [_|_]} -> + {error, ?ERR_EXTENDED(?ERR_BAD_REQUEST, "subid-required")}; + _ -> + case Subscription of + none -> unsub_with_subid(NodeId, SubId, SubState); + _ -> replace_subscription({Subscription, SubId}, SubState) + end + end. + +replace_subscription(NewSub, SubState) -> + NewSubs = replace_subscription(NewSub, + SubState#pubsub_state.subscriptions, []), + set_state(SubState#pubsub_state{subscriptions = NewSubs}). - OSIDs = [SID || {_, SID} <- SubState#pubsub_state.subscriptions], - NSIDs = [SID || {_, SID} <- Subscriptions], - RSIDs = OSIDs -- NSIDs, +replace_subscription(_, [], Acc) -> + Acc; +replace_subscription({Sub, SubId}, [{_, SubID} | T], Acc) -> + replace_subscription({Sub, SubId}, T, [{Sub, SubID} | Acc]). - lists:foreach(fun(SubID) -> - pubsub_subscription:unsubscribe_node(SubKey, NodeId, - SubID) - end, RSIDs), - case {Subscriptions, SubState#pubsub_state.affiliation} of +unsub_with_subid(NodeId, SubId, SubState) -> + pubsub_subscription:delete_subscription(SubState#pubsub_state.stateid, + NodeId, SubId), + NewSubs = lists:filter(fun ({_, SID}) -> SubId =/= SID end, + SubState#pubsub_state.subscriptions), + case {NewSubs, SubState#pubsub_state.affiliation} of {[], none} -> - del_state(NodeId, SubKey); + del_state(NodeId, element(1, SubState#pubsub_state.stateid)); _ -> - set_state(SubState#pubsub_state{subscriptions = Subscriptions}) + set_state(SubState#pubsub_state{subscriptions = NewSubs}) + end. + +%% @spec (Host, Owner) -> {result, [Node]} | {error, Reason} +%% Host = host() +%% Owner = jid() +%% Node = pubsubNode() +%% @doc Returns a list of Owner's nodes on Host with pending +%% subscriptions. +get_pending_nodes(Host, Owner) -> + GenKey = jlib:jid_remove_resource(jlib:jid_tolower(Owner)), + States = mnesia:match_object(#pubsub_state{stateid = {GenKey, '_'}, + affiliation = owner, + _ = '_'}), + NodeIDs = [ID || #pubsub_state{stateid = {_, ID}} <- States], + NodeTree = case ets:lookup(gen_mod:get_module_proc(Host, config), nodetree) of + [{nodetree, N}] -> N; + _ -> nodetree_tree + end, + Reply = mnesia:foldl(fun(#pubsub_state{stateid = {_, NID}} = S, Acc) -> + case lists:member(NID, NodeIDs) of + true -> + case get_nodes_helper(NodeTree, S) of + {value, Node} -> [Node | Acc]; + false -> Acc + end; + false -> + Acc + end + end, [], pubsub_state), + {result, Reply}. + +get_nodes_helper(NodeTree, + #pubsub_state{stateid = {_, N}, subscriptions = Subs}) -> + HasPending = fun ({pending, _}) -> true; + (pending) -> true; + (_) -> false + end, + case lists:any(HasPending, Subs) of + true -> + case NodeTree:get_node(N) of + #pubsub_node{nodeid = {_, Node}} -> + {value, Node}; + _ -> + false + end; + false -> + false end. sdb_to_record({_Key, Attrs})-> @@ -753,13 +829,12 @@ str([{_, _ }|Rest], S)->str(Rest, S). %% they can implement this function like this: %% ```get_states(NodeId) -> %% node_default:get_states(NodeId).''' -get_states({Host, Node}) -> - SHost = host_to_string(Host), - SNode = mod_pubsub:node_to_string(Node), - {ok, R} = erlsdb:s_all("select * from pubsub where host='"++ SHost ++ "' and node = '" ++ SNode ++ "'"), - States = lists:map(fun(S)-> - sdb_to_record(S) - end,R), +get_states(NodeId) -> + States = case catch mnesia:match_object( + #pubsub_state{stateid = {'_', NodeId}, _ = '_'}) of + List when is_list(List) -> List; + _ -> [] + end, {result, States}. %% @spec (NodeId, JID) -> [State] | [] @@ -781,6 +856,7 @@ make_key({JID, {Host, Node}})-> SJID = jlib:jid_to_string(JID), {SJID, SHost, SNode, SHost ++ ":" ++ SNode ++ ":" ++ SJID}. + %% @spec (State) -> ok | {error, Reason::stanzaError()} %% State = mod_pubsub:pubsubStates() %% @doc Write a state into database. @@ -804,7 +880,7 @@ set_state(_) -> %% @spec (NodeId, JID) -> ok | {error, Reason::stanzaError()} %% NodeId = mod_pubsub:pubsubNodeId() -%% JID = mod_pubsub:Jid() +%% JID = mod_pubsub:jid() %% @doc Delete a state from database. del_state(NodeId, JID) -> {_SJID, _SHost, _SNode, Key} = make_key({JID, NodeId}), @@ -840,10 +916,10 @@ get_items(NodeId, JID, AccessModel, PresenceSubscription, RosterGroup, _SubId) - Subscriptions = SubState#pubsub_state.subscriptions, Whitelisted = can_fetch_item(Affiliation, Subscriptions), if - %%SubID == "", ?? -> + %%SubId == "", ?? -> %% Entity has multiple subscriptions to the node but does not specify a subscription ID %{error, ?ERR_EXTENDED(?ERR_BAD_REQUEST, "subid-required")}; - %%InvalidSubID -> + %%InvalidSubId -> %% Entity is subscribed but specifies an invalid subscription ID %{error, ?ERR_EXTENDED(?ERR_NOT_ACCEPTABLE, "invalid-subid")}; GenState#pubsub_state.affiliation == outcast -> @@ -858,7 +934,7 @@ get_items(NodeId, JID, AccessModel, PresenceSubscription, RosterGroup, _SubId) - (AccessModel == whitelist) and (not Whitelisted) -> %% Node has whitelist access model and entity lacks required affiliation {error, ?ERR_EXTENDED(?ERR_NOT_ALLOWED, "closed-node")}; - (AccessModel == authorize) and (not Whitelisted) -> + (AccessModel == authorize) -> % TODO: to be done %% Node has authorize access model {error, ?ERR_FORBIDDEN}; %%MustPay -> @@ -893,13 +969,13 @@ get_item(NodeId, ItemId, JID, AccessModel, PresenceSubscription, RosterGroup, _S GenKey = jlib:jid_remove_resource(SubKey), GenState = get_state(NodeId, GenKey), Affiliation = GenState#pubsub_state.affiliation, - Subscription = GenState#pubsub_state.subscriptions, - Whitelisted = can_fetch_item(Affiliation, Subscription), + Subscriptions = GenState#pubsub_state.subscriptions, + Whitelisted = can_fetch_item(Affiliation, Subscriptions), if - %%SubID == "", ?? -> + %%SubId == "", ?? -> %% Entity has multiple subscriptions to the node but does not specify a subscription ID %{error, ?ERR_EXTENDED(?ERR_BAD_REQUEST, "subid-required")}; - %%InvalidSubID -> + %%InvalidSubId -> %% Entity is subscribed but specifies an invalid subscription ID %{error, ?ERR_EXTENDED(?ERR_NOT_ACCEPTABLE, "invalid-subid")}; GenState#pubsub_state.affiliation == outcast -> @@ -963,10 +1039,7 @@ can_fetch_item(owner, _) -> true; can_fetch_item(member, _) -> true; can_fetch_item(publisher, _) -> true; can_fetch_item(outcast, _) -> false; -can_fetch_item(none, Subscriptions) -> - lists:any(fun ({subscribed, _SubID}) -> true; - (_) -> false - end, Subscriptions); +can_fetch_item(none, Subscriptions) -> is_subscribed(Subscriptions); can_fetch_item(_Affiliation, _Subscription) -> false. %% @spec (NodeId) -> Node @@ -1007,6 +1080,11 @@ get_bucket(Host) when is_list(Host)-> get_bucket(Host)-> ?ERROR_MSG("Unsupported host format : ~p", [Host]). +is_subscribed(Subscriptions) -> + lists:any(fun ({subscribed, _SubId}) -> true; + (_) -> false + end, Subscriptions). + %% Returns the first item where Pred() is true in List first_in_list(_Pred, []) -> false; src/mod_pubsub/node_hometree.erl @@ -61,7 +61,8 @@ get_entity_subscriptions/2, get_node_subscriptions/1, get_subscriptions/2, - set_subscriptions/3, + set_subscriptions/4, + get_pending_nodes/2, get_states/1, get_state/2, set_state/1, @@ -166,8 +167,11 @@ get_node_subscriptions(NodeId) -> get_subscriptions(NodeId, Owner) -> node_pep:get_subscriptions(NodeId, Owner). -set_subscriptions(NodeId, Owner, Subscription) -> - node_pep:set_subscriptions(NodeId, Owner, Subscription). +set_subscriptions(NodeId, Owner, Subscription, SubId) -> + node_pep:set_subscriptions(NodeId, Owner, Subscription, SubId). + +get_pending_nodes(Host, Owner) -> + node_hometree:get_pending_nodes(Host, Owner). get_states(NodeId) -> node_pep:get_states(NodeId). src/mod_pubsub/node_mb.erl @@ -54,7 +54,8 @@ get_entity_subscriptions/2, get_node_subscriptions/1, get_subscriptions/2, - set_subscriptions/3, + set_subscriptions/4, + get_pending_nodes/2, get_states/1, get_state/2, set_state/1, @@ -233,8 +234,11 @@ get_node_subscriptions(NodeId) -> get_subscriptions(NodeId, Owner) -> node_hometree:get_subscriptions(NodeId, Owner). -set_subscriptions(NodeId, Owner, Subscription) -> - node_hometree:set_subscriptions(NodeId, Owner, Subscription). +set_subscriptions(NodeId, Owner, Subscription, SubId) -> + node_hometree:set_subscriptions(NodeId, Owner, Subscription, SubId). + +get_pending_nodes(Host, Owner) -> + node_hometree:get_pending_nodes(Host, Owner). get_states(NodeId) -> node_hometree:get_states(NodeId). src/mod_pubsub/node_pep.erl @@ -58,7 +58,8 @@ get_entity_subscriptions/2, get_node_subscriptions/1, get_subscriptions/2, - set_subscriptions/3, + set_subscriptions/4, + get_pending_nodes/2, get_states/1, get_state/2, set_state/1, @@ -162,8 +163,11 @@ get_node_subscriptions(NodeId) -> get_subscriptions(NodeId, Owner) -> node_hometree:get_subscriptions(NodeId, Owner). -set_subscriptions(NodeId, Owner, Subscription) -> - node_hometree:set_subscriptions(NodeId, Owner, Subscription). +set_subscriptions(NodeId, Owner, Subscription, SubId) -> + node_hometree:set_subscriptions(NodeId, Owner, Subscription, SubId). + +get_pending_nodes(Host, Owner) -> + node_hometree:get_pending_nodes(Host, Owner). get_states(NodeId) -> node_hometree:get_states(NodeId). src/mod_pubsub/node_private.erl @@ -58,7 +58,8 @@ get_entity_subscriptions/2, get_node_subscriptions/1, get_subscriptions/2, - set_subscriptions/3, + set_subscriptions/4, + get_pending_nodes/2, get_states/1, get_state/2, set_state/1, @@ -158,8 +159,11 @@ get_node_subscriptions(NodeId) -> get_subscriptions(NodeId, Owner) -> node_hometree:get_subscriptions(NodeId, Owner). -set_subscriptions(NodeId, Owner, Subscription) -> - node_hometree:set_subscriptions(NodeId, Owner, Subscription). +set_subscriptions(NodeId, Owner, Subscription, SubId) -> + node_hometree:set_subscriptions(NodeId, Owner, Subscription, SubId). + +get_pending_nodes(Host, Owner) -> + node_hometree:get_pending_nodes(Host, Owner). get_states(NodeId) -> node_hometree:get_states(NodeId). src/mod_pubsub/node_public.erl @@ -108,6 +108,7 @@ delete_node(Key, NodeID) -> end, get_subnodes(Key, NodeID)), %% Remove and return the requested node. + pubsub_index:free(node, Node#pubsub_node.id), mnesia:delete_object(pubsub_node, Node, write), [Node] end. @@ -165,12 +166,13 @@ get_subnodes(Host, NodeID) -> qlc:e(Q) end. -get_subnodes_tree(Host, NodeID, _From) -> +get_subnodes_tree(Host, NodeID, From) -> Pred = fun (NID, #pubsub_node{parents = Parents}) -> lists:member(NID, Parents) end, - Tr = fun (#pubsub_node{nodeid = {_, N}}) -> N end, - traversal_helper(Pred, Tr, Host, [NodeID]). + Tr = fun (#pubsub_node{nodeid = {_, N}}) -> [N] end, + traversal_helper(Pred, Tr, 1, Host, [NodeID], + [{0, [get_node(Host, NodeID, From)]}]). %%==================================================================== %% Internal functions @@ -231,8 +233,9 @@ validate_parentage(Key, Owners, [ParentID | T]) -> MutualOwners = [O || O <- Owners, PO <- POwners, O == PO], case {MutualOwners, NodeType} of - {[], _} -> {error, ?ERR_NOT_ALLOWED}; - {_, collection} -> validate_parentage(Key, Owners, T) + {[], _} -> {error, ?ERR_FORBIDDEN}; + {_, collection} -> validate_parentage(Key, Owners, T); + {_, _} -> {error, ?ERR_NOT_ALLOWED} end end. src/mod_pubsub/nodetree_dag.erl @@ -107,6 +107,7 @@ set_node(#pubsub_node{nodeid = NodeId}=N)-> set_node(_) -> {error, ?ERR_INTERNAL_SERVER_ERROR}. + make_key({{_U, _S, _R}=JID, []})-> SHost = jlib:jid_to_string(JID), ?PREFIX++SHost ++ ":"; @@ -138,6 +139,7 @@ get_bucket(Host)-> get_node(Host, Node, _From) -> get_node(Host, Node). + %% @spec (Host, Node) -> pubsubNode() | {error, Reason} %% Host = mod_pubsub:host() %% Node = mod_pubsub:pubsubNode() @@ -157,14 +159,15 @@ get_node({Host, Node}) -> get_nodes(Key, _From) -> get_nodes(Key). -%% @spec (Key) -> [pubsubNode()] | {error, Reason} + +%% @spec (Host) -> [pubsubNode()] | {error, Reason} %% Key = mod_pubsub:host() | mod_pubsub:jid() -get_nodes(Key) -> - K=make_key({Key, []}), - ?DEBUG("Key : ~s", [K]), - Nodes = s3:get_objects(get_bucket(Key), [{prefix, K}]), +get_nodes(Host) -> + K=make_key({Host, []}), + Nodes = s3:get_objects(get_bucket(Host), [{prefix, K}]), lists:map(fun({_K, Bin, _H})-> binary_to_term(list_to_binary(Bin)) end, Nodes). + %% @spec (Host, Node, From) -> [{Depth, Record}] | {error, Reason} %% Host = mod_pubsub:host() | mod_pubsub:jid() %% Node = mod_pubsub:pubsubNode() @@ -185,10 +188,8 @@ get_parentnodes(_Host, _Node, _From) -> %% containing just this node. get_parentnodes_tree(Host, Node, From) -> case get_node(Host, Node, From) of - N when is_record(N, pubsub_node) -> - [{0, mnesia:read(pubsub_node, {Host, Node})}]; - Error -> - Error + N when is_record(N, pubsub_node) -> [{0, [N]}]; + Error -> Error end. %% @spec (Host, Node, From) -> [pubsubNode()] | {error, Reason} @@ -228,7 +229,7 @@ get_subnodes_tree(Host, Node)-> %% Owner = mod_pubsub:jid() %% Options = list() create_node(Key, Node, Type, Owner, Options) -> - OwnerKey = jlib:jid_tolower(jlib:jid_remove_resource(Owner)), + BJID = jlib:jid_tolower(jlib:jid_remove_resource(Owner)), case get_node(Key, Node) of {error, ?ERR_ITEM_NOT_FOUND} -> {ParentNode, ParentExists} = @@ -238,8 +239,7 @@ create_node(Key, Node, Type, Owner, Options) -> %% PEP does not uses hierarchy {[], true}; _ -> - Parent = lists:sublist(Node, length(Node) - 1), - case Parent of + case lists:sublist(Node, length(Node) - 1) of [] -> {[], true}; _ -> src/mod_pubsub/nodetree_tree.erl @@ -26,7 +26,7 @@ %%% @doc The module {@module} is the PubSub node tree plugin that %%% allow virtual nodes handling. %%% PubSub node tree plugins are using the {@link gen_nodetree} behaviour. -%%% This plugin development is still a work in progress. Due to optimizations in +%%% This plugin development is still a work in progress. Due to optimizations in %%% mod_pubsub, this plugin can not work anymore without altering functioning. %%% Please, send us comments, feedback and improvements. @@ -85,20 +85,26 @@ options() -> set_node(_NodeRecord) -> ok. -%% @spec (Host, Node) -> pubsubNode() +%% @spec (Host, Node, From) -> pubsubNode() %% Host = mod_pubsub:host() %% Node = mod_pubsub:pubsubNode() +%% From = mod_pubsub:jid() %% @doc Virtual node tree does not handle a node database. Any node is considered %% as existing. Node record contains default values. get_node(Host, Node, _From) -> get_node(Host, Node). get_node(Host, Node) -> - #pubsub_node{nodeid = {Host, Node}, id = {Host, Node}, owners = [{"",Host,""}]}. + get_node({Host, Node}). get_node({Host, _} = NodeId) -> - #pubsub_node{nodeid = NodeId, id = NodeId, owners = [{"",Host,""}]}. + Record = #pubsub_node{nodeid = NodeId, id = NodeId}, + Module = list_to_atom("node_" ++ Record#pubsub_node.type), + Options = Module:options(), + Owners = [{"", Host, ""}], + Record#pubsub_node{owners = Owners, options = Options}. -%% @spec (Host) -> [pubsubNode()] +%% @spec (Host, From) -> [pubsubNode()] %% Host = mod_pubsub:host() | mod_pubsub:jid() +%% From = mod_pubsub:jid() %% @doc Virtual node tree does not handle a node database. Any node is considered %% as existing. Nodes list can not be determined. get_nodes(Host, _From) -> @@ -132,9 +138,10 @@ get_subnodes(Host, Node, _From) -> get_subnodes(_Host, _Node) -> []. -%% @spec (Host, Index) -> [pubsubNode()] +%% @spec (Host, Node, From) -> [pubsubNode()] %% Host = mod_pubsub:host() %% Node = mod_pubsub:pubsubNode() +%% From = mod_pubsub:jid() %% @doc Virtual node tree does not handle parent/child. Child list is empty. get_subnodes_tree(Host, Node, _From) -> get_subnodes_tree(Host, Node). @@ -150,13 +157,8 @@ get_subnodes_tree(_Host, _Node) -> %% @doc No node record is stored on database. Any valid node %% is considered as already created. %% default allowed nodes: /home/host/user/any/node/name -create_node(Host, Node, _Type, Owner, _Options) -> - UserName = Owner#jid.luser, - UserHost = Owner#jid.lserver, - case Node of - ["home", UserHost, UserName | _] -> {error, {virtual, {Host, Node}}}; - _ -> {error, ?ERR_NOT_ALLOWED} - end. +create_node(Host, Node, _Type, _Owner, _Options) -> + {error, {virtual, {Host, Node}}}. %% @spec (Host, Node) -> [mod_pubsub:node()] %% Host = mod_pubsub:host() src/mod_pubsub/nodetree_virtual.erl @@ -83,12 +83,13 @@ %%% @type pubsubNode() = #pubsub_node{ %%% nodeid = {Host::host(), Node::pubsubNode()}, %%% parentid = Node::pubsubNode(), -%%% nodeidx = int(). % can be anything you want +%%% nodeidx = int(), %%% type = nodeType(), -%%% options = [nodeOption()]} +%%% options = [nodeOption()]}. %%% This is the format of the <tt>nodes</tt> table. The type of the table %%% is: <tt>set</tt>,<tt>ram/disc</tt>. %%% The <tt>parentid</tt> and <tt>type</tt> fields are indexed. +%%% nodeidx can be anything you want. -record(pubsub_node, {nodeid, id, parents = [], @@ -98,7 +99,7 @@ }). %%% @type pubsubState() = #pubsub_state{ -%%% stateid = {ljid(), nodeidx()}}, +%%% stateid = {ljid(), nodeidx()}, %%% items = [ItemId::string()], %%% affiliation = affiliation(), %%% subscriptions = [subscription()]}. @@ -111,7 +112,7 @@ }). %%% @type pubsubItem() = #pubsub_item{ -%%% itemid = {ItemId::string(), nodeidx()}}, +%%% itemid = {ItemId::string(), nodeidx()}, %%% creation = {now(), ljid()}, %%% modification = {now(), ljid()}, %%% payload = XMLContent::string()}. src/mod_pubsub/pubsub.hrl @@ -32,6 +32,12 @@ get_options_xform/2, parse_options_xform/1]). +% Internal function also exported for use in transactional bloc from pubsub plugins +-export([add_subscription/3, + delete_subscription/3, + read_subscription/3, + write_subscription/4]). + -include_lib("stdlib/include/qlc.hrl"). -include("pubsub.hrl"). @@ -86,31 +92,31 @@ init() -> ok = create_table(). subscribe_node(JID, NodeID, Options) -> - case mnesia:transaction(fun add_subscription/3, + case catch mnesia:sync_dirty(fun add_subscription/3, [JID, NodeID, Options]) of - {atomic, Result} -> {result, Result}; - {aborted, Error} -> Error + {'EXIT', {aborted, Error}} -> Error; + Result -> {result, Result} end. unsubscribe_node(JID, NodeID, SubID) -> - case mnesia:transaction(fun delete_subscription/3, + case catch mnesia:sync_dirty(fun delete_subscription/3, [JID, NodeID, SubID]) of - {atomic, Result} -> {result, Result}; - {aborted, Error} -> Error + {'EXIT', {aborted, Error}} -> Error; + Result -> {result, Result} end. get_subscription(JID, NodeID, SubID) -> - case mnesia:transaction(fun read_subscription/3, + case catch mnesia:sync_dirty(fun read_subscription/3, [JID, NodeID, SubID]) of - {atomic, Result} -> {result, Result}; - {aborted, Error} -> Error + {'EXIT', {aborted, Error}} -> Error; + Result -> {result, Result} end. set_subscription(JID, NodeID, SubID, Options) -> - case mnesia:transaction(fun write_subscription/4, + case catch mnesia:sync_dirty(fun write_subscription/4, [JID, NodeID, SubID, Options]) of - {atomic, Result} -> {result, Result}; - {aborted, Error} -> Error + {'EXIT', {aborted, Error}} -> Error; + Result -> {result, Result} end. get_options_xform(Lang, Options) -> src/mod_pubsub/pubsub_subscription.erl @@ -24,6 +24,15 @@ %%% %%%---------------------------------------------------------------------- +%%% @doc Roster management (Mnesia storage). +%%% +%%% Includes support for XEP-0237: Roster Versioning. +%%% The roster versioning follows an all-or-nothing strategy: +%%% - If the version supplied by the client is the latest, return an empty response. +%%% - If not, return the entire new roster (with updated version string). +%%% Roster version is a hash digest of the entire roster. +%%% No additional data is stored in DB. + -module(mod_roster). -author('alexey@process-one.net'). @@ -42,7 +51,10 @@ get_jid_info/4, item_to_xml/1, webadmin_page/3, - webadmin_user/4]). + webadmin_user/4, + get_versioning_feature/2, + roster_versioning_enabled/1, + roster_version/2]). -include("ejabberd.hrl"). -include("jlib.hrl"). @@ -55,8 +67,12 @@ start(Host, Opts) -> IQDisc = gen_mod:get_opt(iqdisc, Opts, one_queue), mnesia:create_table(roster,[{disc_copies, [node()]}, {attributes, record_info(fields, roster)}]), + mnesia:create_table(roster_version, [{disc_copies, [node()]}, + {attributes, record_info(fields, roster_version)}]), + update_table(), mnesia:add_table_index(roster, us), + mnesia:add_table_index(roster_version, us), ejabberd_hooks:add(roster_get, Host, ?MODULE, get_user_roster, 50), ejabberd_hooks:add(roster_in_subscription, Host, @@ -73,6 +89,8 @@ start(Host, Opts) -> ?MODULE, remove_user, 50), ejabberd_hooks:add(resend_subscription_requests_hook, Host, ?MODULE, get_in_pending_subscriptions, 50), + ejabberd_hooks:add(roster_get_versioning_feature, Host, + ?MODULE, get_versioning_feature, 50), ejabberd_hooks:add(webadmin_page_host, Host, ?MODULE, webadmin_page, 50), ejabberd_hooks:add(webadmin_user, Host, @@ -97,6 +115,8 @@ stop(Host) -> ?MODULE, remove_user, 50), ejabberd_hooks:delete(resend_subscription_requests_hook, Host, ?MODULE, get_in_pending_subscriptions, 50), + ejabberd_hooks:delete(roster_get_versioning_feature, Host, + ?MODULE, get_versioning_feature, 50), ejabberd_hooks:delete(webadmin_page_host, Host, ?MODULE, webadmin_page, 50), ejabberd_hooks:delete(webadmin_user, Host, @@ -122,23 +142,97 @@ process_local_iq(From, To, #iq{type = Type} = IQ) -> process_iq_get(From, To, IQ) end. +roster_hash(Items) -> + sha:sha(term_to_binary( + lists:sort( + [R#roster{groups = lists:sort(Grs)} || + R = #roster{groups = Grs} <- Items]))). + +roster_versioning_enabled(Host) -> + gen_mod:get_module_opt(Host, ?MODULE, versioning, false). + +roster_version_on_db(Host) -> + gen_mod:get_module_opt(Host, ?MODULE, store_current_id, false). + +%% Returns a list that may contain an xmlelement with the XEP-237 feature if it's enabled. +get_versioning_feature(Acc, Host) -> + case roster_versioning_enabled(Host) of + true -> + Feature = {xmlelement, + "ver", + [{"xmlns", ?NS_ROSTER_VER}], + [{xmlelement, "optional", [], []}]}, + [Feature | Acc]; + false -> [] + end. - +roster_version(LServer ,LUser) -> + US = {LUser, LServer}, + case roster_version_on_db(LServer) of + true -> + case mnesia:dirty_read(roster_version, US) of + [#roster_version{version = V}] -> V; + [] -> not_found + end; + false -> + roster_hash(ejabberd_hooks:run_fold(roster_get, LServer, [], [US])) + end. + +%% Load roster from DB only if neccesary. +%% It is neccesary if +%% - roster versioning is disabled in server OR +%% - roster versioning is not used by the client OR +%% - roster versioning is used by server and client, BUT the server isn't storing versions on db OR +%% - the roster version from client don't match current version. process_iq_get(From, To, #iq{sub_el = SubEl} = IQ) -> LUser = From#jid.luser, LServer = From#jid.lserver, US = {LUser, LServer}, - case catch ejabberd_hooks:run_fold(roster_get, To#jid.lserver, [], [US]) of - Items when is_list(Items) -> - XItems = lists:map(fun item_to_xml/1, Items), - IQ#iq{type = result, - sub_el = [{xmlelement, "query", - [{"xmlns", ?NS_ROSTER}], - XItems}]}; - _ -> - IQ#iq{type = error, sub_el = [SubEl, ?ERR_INTERNAL_SERVER_ERROR]} + try + {ItemsToSend, VersionToSend} = + case {xml:get_tag_attr("ver", SubEl), + roster_versioning_enabled(LServer), + roster_version_on_db(LServer)} of + {{value, RequestedVersion}, true, true} -> + %% Retrieve version from DB. Only load entire roster + %% when neccesary. + case mnesia:dirty_read(roster_version, US) of + [#roster_version{version = RequestedVersion}] -> + {false, false}; + [#roster_version{version = NewVersion}] -> + {lists:map(fun item_to_xml/1, + ejabberd_hooks:run_fold(roster_get, To#jid.lserver, [], [US])), NewVersion}; + [] -> + RosterVersion = sha:sha(term_to_binary(now())), + mnesia:dirty_write(#roster_version{us = US, version = RosterVersion}), + {lists:map(fun item_to_xml/1, + ejabberd_hooks:run_fold(roster_get, To#jid.lserver, [], [US])), RosterVersion} + end; + + {{value, RequestedVersion}, true, false} -> + RosterItems = ejabberd_hooks:run_fold(roster_get, To#jid.lserver, [] , [US]), + case roster_hash(RosterItems) of + RequestedVersion -> + {false, false}; + New -> + {lists:map(fun item_to_xml/1, RosterItems), New} + end; + + _ -> + {lists:map(fun item_to_xml/1, + ejabberd_hooks:run_fold(roster_get, To#jid.lserver, [], [US])), false} + end, + IQ#iq{type = result, sub_el = case {ItemsToSend, VersionToSend} of + {false, false} -> []; + {Items, false} -> [{xmlelement, "query", [{"xmlns", ?NS_ROSTER}], Items}]; + {Items, Version} -> [{xmlelement, "query", [{"xmlns", ?NS_ROSTER}, {"ver", Version}], Items}] + end} + catch + _:_ -> + IQ#iq{type =error, sub_el = [SubEl, ?ERR_INTERNAL_SERVER_ERROR]} end. + get_user_roster(Acc, US) -> case catch mnesia:dirty_index_read(roster, US, #roster.us) of Items when is_list(Items) -> @@ -226,6 +320,10 @@ process_item_set(From, To, {xmlelement, _Name, Attrs, Els}) -> %% subscription information from there: Item3 = ejabberd_hooks:run_fold(roster_process_item, LServer, Item2, [LServer]), + case roster_version_on_db(LServer) of + true -> mnesia:write(#roster_version{us = {LUser, LServer}, version = sha:sha(term_to_binary(now()))}); + false -> ok + end, {Item, Item3} end, case mnesia:transaction(F) of @@ -302,9 +400,14 @@ push_item(User, Server, From, Item) -> [{item, Item#roster.jid, Item#roster.subscription}]}), - lists:foreach(fun(Resource) -> + case roster_versioning_enabled(Server) of + true -> + push_item_version(Server, User, From, Item, roster_version(Server, User)); + false -> + lists:foreach(fun(Resource) -> push_item(User, Server, Resource, From, Item) - end, ejabberd_sm:get_user_resources(User, Server)). + end, ejabberd_sm:get_user_resources(User, Server)) + end. % TODO: don't push to those who didn't load roster push_item(User, Server, Resource, From, Item) -> @@ -318,6 +421,25 @@ push_item(User, Server, Resource, From, Item) -> jlib:make_jid(User, Server, Resource), jlib:iq_to_xml(ResIQ)). +%% @doc Roster push, calculate and include the version attribute. +%% TODO: don't push to those who didn't load roster +push_item_version(Server, User, From, Item, RosterVersion) -> + lists:foreach(fun(Resource) -> + push_item_version(User, Server, Resource, From, Item, RosterVersion) + end, ejabberd_sm:get_user_resources(User, Server)). + +push_item_version(User, Server, Resource, From, Item, RosterVersion) -> + IQPush = #iq{type = 'set', xmlns = ?NS_ROSTER, + id = "push" ++ randoms:get_string(), + sub_el = [{xmlelement, "query", + [{"xmlns", ?NS_ROSTER}, + {"ver", RosterVersion}], + [item_to_xml(Item)]}]}, + ejabberd_router:route( + From, + jlib:make_jid(User, Server, Resource), + jlib:iq_to_xml(IQPush)). + get_subscription_lists(_, User, Server) -> LUser = jlib:nodeprep(User), LServer = jlib:nameprep(Server), @@ -408,6 +530,10 @@ process_subscription(Direction, User, Server, JID1, Type, Reason) -> ask = Pending, askmessage = list_to_binary(AskMessage)}, mnesia:write(NewItem), + case roster_version_on_db(LServer) of + true -> mnesia:write(#roster_version{us = {LUser, LServer}, version = sha:sha(term_to_binary(now()))}); + false -> ok + end, {{push, NewItem}, AutoReply} end end, src/mod_roster.erl @@ -29,3 +29,5 @@ askmessage = [], xs = []}). +-record(roster_version, {us, + version}). src/mod_roster.hrl @@ -24,6 +24,15 @@ %%% %%%---------------------------------------------------------------------- +%%% @doc Roster management (Mnesia storage). +%%% +%%% Includes support for XEP-0237: Roster Versioning. +%%% The roster versioning follows an all-or-nothing strategy: +%%% - If the version supplied by the client is the latest, return an empty response. +%%% - If not, return the entire new roster (with updated version string). +%%% Roster version is a hash digest of the entire roster. +%%% No additional data is stored in DB. + -module(mod_roster_odbc). -author('alexey@process-one.net'). @@ -41,7 +50,9 @@ remove_user/2, get_jid_info/4, webadmin_page/3, - webadmin_user/4]). + webadmin_user/4, + get_versioning_feature/2, + roster_versioning_enabled/1]). -include("ejabberd.hrl"). -include("jlib.hrl"). @@ -68,6 +79,8 @@ start(Host, Opts) -> ?MODULE, remove_user, 50), ejabberd_hooks:add(resend_subscription_requests_hook, Host, ?MODULE, get_in_pending_subscriptions, 50), + ejabberd_hooks:add(roster_get_versioning_feature, Host, + ?MODULE, get_versioning_feature, 50), ejabberd_hooks:add(webadmin_page_host, Host, ?MODULE, webadmin_page, 50), ejabberd_hooks:add(webadmin_user, Host, @@ -92,6 +105,8 @@ stop(Host) -> ?MODULE, remove_user, 50), ejabberd_hooks:delete(resend_subscription_requests_hook, Host, ?MODULE, get_in_pending_subscriptions, 50), + ejabberd_hooks:delete(roster_get_versioning_feature, Host, + ?MODULE, get_versioning_feature, 50), ejabberd_hooks:delete(webadmin_page_host, Host, ?MODULE, webadmin_page, 50), ejabberd_hooks:delete(webadmin_user, Host, @@ -118,22 +133,101 @@ process_local_iq(From, To, #iq{type = Type} = IQ) -> end. +roster_hash(Items) -> + sha:sha(term_to_binary( + lists:sort( + [R#roster{groups = lists:sort(Grs)} || + R = #roster{groups = Grs} <- Items]))). + +roster_versioning_enabled(Host) -> + gen_mod:get_module_opt(Host, ?MODULE, versioning, false). + +roster_version_on_db(Host) -> + gen_mod:get_module_opt(Host, ?MODULE, store_current_id, false). + +%% Returns a list that may contain an xmlelement with the XEP-237 feature if it's enabled. +get_versioning_feature(Acc, Host) -> + case roster_versioning_enabled(Host) of + true -> + Feature = {xmlelement, + "ver", + [{"xmlns", ?NS_ROSTER_VER}], + [{xmlelement, "optional", [], []}]}, + [Feature | Acc]; + false -> [] + end. +roster_version(LServer ,LUser) -> + US = {LUser, LServer}, + case roster_version_on_db(LServer) of + true -> + case odbc_queries:get_roster_version(ejabberd_odbc:escape(LServer), ejabberd_odbc:escape(LUser)) of + {selected, ["version"], [{Version}]} -> Version; + {selected, ["version"], []} -> not_found + end; + false -> + roster_hash(ejabberd_hooks:run_fold(roster_get, LServer, [], [US])) + end. + +%% Load roster from DB only if neccesary. +%% It is neccesary if +%% - roster versioning is disabled in server OR +%% - roster versioning is not used by the client OR +%% - roster versioning is used by server and client, BUT the server isn't storing versions on db OR +%% - the roster version from client don't match current version. process_iq_get(From, To, #iq{sub_el = SubEl} = IQ) -> LUser = From#jid.luser, LServer = From#jid.lserver, US = {LUser, LServer}, - case catch ejabberd_hooks:run_fold(roster_get, To#jid.lserver, [], [US]) of - Items when is_list(Items) -> - XItems = lists:map(fun item_to_xml/1, Items), - IQ#iq{type = result, - sub_el = [{xmlelement, "query", - [{"xmlns", ?NS_ROSTER}], - XItems}]}; - _ -> - IQ#iq{type = error, sub_el = [SubEl, ?ERR_INTERNAL_SERVER_ERROR]} + + try + {ItemsToSend, VersionToSend} = + case {xml:get_tag_attr("ver", SubEl), + roster_versioning_enabled(LServer), + roster_version_on_db(LServer)} of + {{value, RequestedVersion}, true, true} -> + %% Retrieve version from DB. Only load entire roster + %% when neccesary. + case odbc_queries:get_roster_version(ejabberd_odbc:escape(LServer), ejabberd_odbc:escape(LUser)) of + {selected, ["version"], [{RequestedVersion}]} -> + {false, false}; + {selected, ["version"], [{NewVersion}]} -> + {lists:map(fun item_to_xml/1, + ejabberd_hooks:run_fold(roster_get, To#jid.lserver, [], [US])), NewVersion}; + {selected, ["version"], []} -> + RosterVersion = sha:sha(term_to_binary(now())), + {atomic, {updated,1}} = odbc_queries:sql_transaction(LServer, fun() -> + odbc_queries:set_roster_version(ejabberd_odbc:escape(LUser), RosterVersion) + end), + + {lists:map(fun item_to_xml/1, + ejabberd_hooks:run_fold(roster_get, To#jid.lserver, [], [US])), RosterVersion} + end; + + {{value, RequestedVersion}, true, false} -> + RosterItems = ejabberd_hooks:run_fold(roster_get, To#jid.lserver, [] , [US]), + case roster_hash(RosterItems) of + RequestedVersion -> + {false, false}; + New -> + {lists:map(fun item_to_xml/1, RosterItems), New} + end; + + _ -> + {lists:map(fun item_to_xml/1, + ejabberd_hooks:run_fold(roster_get, To#jid.lserver, [], [US])), false} + end, + IQ#iq{type = result, sub_el = case {ItemsToSend, VersionToSend} of + {false, false} -> []; + {Items, false} -> [{xmlelement, "query", [{"xmlns", ?NS_ROSTER}], Items}]; + {Items, Version} -> [{xmlelement, "query", [{"xmlns", ?NS_ROSTER}, {"ver", Version}], Items}] + end} + catch + _:_ -> + IQ#iq{type =error, sub_el = [SubEl, ?ERR_INTERNAL_SERVER_ERROR]} end. + get_user_roster(Acc, {LUser, LServer}) -> Items = get_roster(LUser, LServer), lists:filter(fun(#roster{subscription = none, ask = in}) -> @@ -257,6 +351,7 @@ process_item_set(From, To, {xmlelement, _Name, Attrs, Els}) -> Item2 = process_item_els(Item1, Els), case Item2#roster.subscription of remove -> + io:format("del_roster: ~p ~p ~p \n", [LServer, Username, SJID]), odbc_queries:del_roster(LServer, Username, SJID); _ -> ItemVals = record_to_string(Item2), @@ -267,6 +362,10 @@ process_item_set(From, To, {xmlelement, _Name, Attrs, Els}) -> %% subscription information from there: Item3 = ejabberd_hooks:run_fold(roster_process_item, LServer, Item2, [LServer]), + case roster_version_on_db(LServer) of + true -> odbc_queries:set_roster_version(ejabberd_odbc:escape(LUser), sha:sha(term_to_binary(now()))); + false -> ok + end, {Item, Item3} end, case odbc_queries:sql_transaction(LServer, F) of @@ -337,9 +436,14 @@ push_item(User, Server, From, Item) -> [{item, Item#roster.jid, Item#roster.subscription}]}), - lists:foreach(fun(Resource) -> + case roster_versioning_enabled(Server) of + true -> + push_item_version(Server, User, From, Item, roster_version(Server, User)); + false -> + lists:foreach(fun(Resource) -> push_item(User, Server, Resource, From, Item) - end, ejabberd_sm:get_user_resources(User, Server)). + end, ejabberd_sm:get_user_resources(User, Server)) + end. % TODO: don't push to those who not load roster push_item(User, Server, Resource, From, Item) -> @@ -353,6 +457,25 @@ push_item(User, Server, Resource, From, Item) -> jlib:make_jid(User, Server, Resource), jlib:iq_to_xml(ResIQ)). +%% @doc Roster push, calculate and include the version attribute. +%% TODO: don't push to those who didn't load roster +push_item_version(Server, User, From, Item, RosterVersion) -> + lists:foreach(fun(Resource) -> + push_item_version(User, Server, Resource, From, Item, RosterVersion) + end, ejabberd_sm:get_user_resources(User, Server)). + +push_item_version(User, Server, Resource, From, Item, RosterVersion) -> + IQPush = #iq{type = 'set', xmlns = ?NS_ROSTER, + id = "push" ++ randoms:get_string(), + sub_el = [{xmlelement, "query", + [{"xmlns", ?NS_ROSTER}, + {"ver", RosterVersion}], + [item_to_xml(Item)]}]}, + ejabberd_router:route( + From, + jlib:make_jid(User, Server, Resource), + jlib:iq_to_xml(IQPush)). + get_subscription_lists(_, User, Server) -> LUser = jlib:nodeprep(User), LServer = jlib:nameprep(Server), @@ -468,6 +591,10 @@ process_subscription(Direction, User, Server, JID1, Type, Reason) -> askmessage = AskMessage}, ItemVals = record_to_string(NewItem), odbc_queries:roster_subscribe(LServer, Username, SJID, ItemVals), + case roster_version_on_db(LServer) of + true -> odbc_queries:set_roster_version(ejabberd_odbc:escape(LUser), sha:sha(term_to_binary(now()))); + false -> ok + end, {{push, NewItem}, AutoReply} end end, src/mod_roster_odbc.erl @@ -31,6 +31,7 @@ -export([start/2, stop/1, + process_local_iq90/3, % TODO: Remove once XEP-0090 is Obsolete process_local_iq/3]). -include("ejabberd.hrl"). @@ -39,13 +40,19 @@ start(Host, Opts) -> IQDisc = gen_mod:get_opt(iqdisc, Opts, one_queue), + %% TODO: Remove the next two lines once XEP-0090 is Obsolete + gen_iq_handler:add_iq_handler(ejabberd_local, Host, ?NS_TIME90, + ?MODULE, process_local_iq90, IQDisc), gen_iq_handler:add_iq_handler(ejabberd_local, Host, ?NS_TIME, ?MODULE, process_local_iq, IQDisc). stop(Host) -> + %% TODO: Remove the next line once XEP-0090 is Obsolete + gen_iq_handler:remove_iq_handler(ejabberd_local, Host, ?NS_TIME90), gen_iq_handler:remove_iq_handler(ejabberd_local, Host, ?NS_TIME). -process_local_iq(_From, _To, #iq{type = Type, sub_el = SubEl} = IQ) -> +%% TODO: Remove this function once XEP-0090 is Obsolete +process_local_iq90(_From, _To, #iq{type = Type, sub_el = SubEl} = IQ) -> case Type of set -> IQ#iq{type = error, sub_el = [SubEl, ?ERR_NOT_ALLOWED]}; @@ -53,9 +60,31 @@ process_local_iq(_From, _To, #iq{type = Type, sub_el = SubEl} = IQ) -> UTC = jlib:timestamp_to_iso(calendar:universal_time()), IQ#iq{type = result, sub_el = [{xmlelement, "query", - [{"xmlns", ?NS_TIME}], + [{"xmlns", ?NS_TIME90}], [{xmlelement, "utc", [], [{xmlcdata, UTC}]}]}]} end. +process_local_iq(_From, _To, #iq{type = Type, sub_el = SubEl} = IQ) -> + case Type of + set -> + IQ#iq{type = error, sub_el = [SubEl, ?ERR_NOT_ALLOWED]}; + get -> + Now = now(), + Now_universal = calendar:now_to_universal_time(Now), + Now_local = calendar:now_to_local_time(Now), + {UTC, UTC_diff} = jlib:timestamp_to_iso(Now_universal, utc), + Seconds_diff = calendar:datetime_to_gregorian_seconds(Now_local) + - calendar:datetime_to_gregorian_seconds(Now_universal), + {Hd, Md, _} = calendar:seconds_to_time(Seconds_diff), + {_, TZO_diff} = jlib:timestamp_to_iso({{0, 0, 0}, {0, 0, 0}}, {Hd, Md}), + IQ#iq{type = result, + sub_el = [{xmlelement, "time", + [{"xmlns", ?NS_TIME}], + [{xmlelement, "tzo", [], + [{xmlcdata, TZO_diff}]}, + {xmlelement, "utc", [], + [{xmlcdata, UTC ++ UTC_diff}]}]}]} + end. + src/mod_time.erl @@ -367,6 +367,9 @@ do_route(ServerHost, From, To, Packet) -> Packet, ?ERR_NOT_ALLOWED), ejabberd_router:route(To, From, Err); get -> + Info = ejabberd_hooks:run_fold( + disco_info, ServerHost, [], + [ServerHost, ?MODULE, "", ""]), ResIQ = IQ#iq{type = result, sub_el = [{xmlelement, @@ -384,7 +387,7 @@ do_route(ServerHost, From, To, Packet) -> [{"var", ?NS_SEARCH}], []}, {xmlelement, "feature", [{"var", ?NS_VCARD}], []} - ] + ] ++ Info }]}, ejabberd_router:route(To, From, src/mod_vcard.erl @@ -406,6 +406,7 @@ do_route(State, From, To, Packet) -> route(State, From, To, Packet) -> #jid{user = User, resource = Resource} = To, + ServerHost = State#state.serverhost, if (User /= "") or (Resource /= "") -> Err = jlib:make_error_reply(Packet, ?ERR_SERVICE_UNAVAILABLE), @@ -467,6 +468,9 @@ route(State, From, To, Packet) -> Packet, ?ERR_NOT_ALLOWED), ejabberd_router:route(To, From, Err); get -> + Info = ejabberd_hooks:run_fold( + disco_info, ServerHost, [], + [ServerHost, ?MODULE, "", ""]), ResIQ = IQ#iq{type = result, sub_el = [{xmlelement, @@ -482,7 +486,7 @@ route(State, From, To, Packet) -> [{"var", ?NS_SEARCH}], []}, {xmlelement, "feature", [{"var", ?NS_VCARD}], []} - ] + ] ++ Info }]}, ejabberd_router:route(To, From, @@ -639,8 +643,10 @@ map_vcard_attr(VCardName, Attributes, Pattern, UD) -> end. process_pattern(Str, {User, Domain}, AttrValues) -> - eldap_filter:do_sub(Str, - [{"%s", V, 1} || V <- AttrValues] ++ [{"%u", User},{"%d", Domain}]). + eldap_filter:do_sub( + Str, + [{"%u", User},{"%d", Domain}] ++ + [{"%s", V, 1} || V <- AttrValues]). find_xdata_el({xmlelement, _Name, _Attrs, SubEls}) -> find_xdata_el1(SubEls). src/mod_vcard_ldap.erl @@ -344,6 +344,9 @@ do_route(ServerHost, From, To, Packet) -> Packet, ?ERR_NOT_ALLOWED), ejabberd_router:route(To, From, Err); get -> + Info = ejabberd_hooks:run_fold( + disco_info, ServerHost, [], + [ServerHost, ?MODULE, "", ""]), ResIQ = IQ#iq{type = result, sub_el = [{xmlelement, @@ -359,7 +362,7 @@ do_route(ServerHost, From, To, Packet) -> [{"var", ?NS_SEARCH}], []}, {xmlelement, "feature", [{"var", ?NS_VCARD}], []} - ] + ] ++ Info }]}, ejabberd_router:route(To, From, src/mod_vcard_odbc.erl @@ -73,7 +73,6 @@ {"ejabberd Web Admin","Web d'administració del ejabberd"}. {"Email","Email"}. {"Enable logging","Habilitar el registre de la conversa"}. -{"Encodings","Codificacions"}. {"End User Session","Finalitzar Sesió d'Usuari"}. {"Enter list of {Module, [Options]}","Introdueix llista de {mòdul, [opcions]}"}. {"Enter nickname you want to register","Introdueix el nickname que vols registrar"}. @@ -81,9 +80,7 @@ {"Enter path to jabberd14 spool dir","Introdueix la ruta al directori de jabberd14 spools"}. {"Enter path to jabberd14 spool file","Introdueix ruta al fitxer jabberd14 spool"}. {"Enter path to text file","Introdueix ruta al fitxer de text"}. -{"Enter username and encodings you wish to use for connecting to IRC servers","Introdueix el nom d'usuari i les codificacions de caràcters per a utilitzar als servidors de IRC"}. {"Erlang Jabber Server","Servidor Erlang Jabber"}. -{"Example: [{\"irc.lucky.net\", \"koi8-r\"}, {\"vendetta.fef.net\", \"iso8859-1\"}].","Exemple: [{\"irc.lucky.net\", \"koi8-r\"}, {\"vendetta.fef.net\", \"iso8859-1\"}]."}. {"Family Name","Cognom"}. {"February","Febrer"}. {"Fill in fields to search for any matching Jabber User","Emplena camps per a buscar usuaris Jabber que concorden"}. @@ -106,7 +103,6 @@ {"has been kicked","Has sigut expulsat"}. {" has set the subject to: "," ha posat l'assumpte: "}. {"Host","Host"}. -{"If you want to specify different encodings for IRC servers, fill this list with values in format '{\"irc server\", \"encoding\"}'. By default this service use \"~s\" encoding.","Si vols especificar codificacions de caràcters distints per a cada servidor IRC emplena aquesta llista amb els valors amb el format '{\"servidor irc\", \"codificació\"}'. Aquest servei utilitza per defecte la codificació \"~s\"."}. {"Import Directory","Importar directori"}. {"Import File","Importar fitxer"}. {"Import User from File at ","Importa usuari des de fitxer en "}. @@ -218,7 +214,6 @@ {"Queries to the conference members are not allowed in this room"," En aquesta sala no es permeten solicituts als membres de la sala"}. {"RAM and disc copy","Còpia en RAM i disc"}. {"RAM copy","Còpia en RAM"}. -{"(Raw)","(en format text)"}. {"Raw","en format text"}. {"Really delete message of the day?","Segur que vols eliminar el missatge del dia?"}. {"Recipient is not in the conference room","El receptor no està en la sala de conferència"}. @@ -315,7 +310,6 @@ {"User","Usuari"}. {"Validate","Validar"}. {"vCard User Search","Recerca de vCard d'usuari"}. -{"Virtual Hosts","Hosts Virtuals"}. {"Visitors are not allowed to change their nicknames in this room","Els visitants no tenen permés canviar el seus Nicknames en esta sala"}. {"Visitors are not allowed to send messages to all occupants","Els visitants no poden enviar missatges a tots els ocupants"}. {"Wednesday","Dimecres"}. src/msgs/ca.msg @@ -7,28 +7,28 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Language: Catalan (català)\n" -#: ejabberd_c2s.erl:358 ejabberd_c2s.erl:662 +#: ejabberd_c2s.erl:364 ejabberd_c2s.erl:668 msgid "Use of STARTTLS required" msgstr "És obligatori utilitzar STARTTLS" -#: ejabberd_c2s.erl:442 +#: ejabberd_c2s.erl:448 msgid "No resource provided" msgstr "Recurs no disponible" -#: ejabberd_c2s.erl:1067 +#: ejabberd_c2s.erl:1073 msgid "Replaced by new connection" msgstr "Reemplaçat per una nova connexió" -#: ejabberd_captcha.erl:74 ejabberd_captcha.erl:106 +#: ejabberd_captcha.erl:93 ejabberd_captcha.erl:125 #, fuzzy msgid "Enter the text you see" msgstr "Introdueix ruta al fitxer de text" -#: ejabberd_captcha.erl:78 +#: ejabberd_captcha.erl:97 msgid "Your messages to ~s are being blocked. To unblock them, visit ~s" msgstr "" -#: ejabberd_captcha.erl:212 +#: ejabberd_captcha.erl:235 msgid "The captcha is valid." msgstr "" @@ -110,7 +110,7 @@ msgstr "Elimina el missatge del dis de tots els hosts" msgid "Configuration" msgstr "Configuració" -#: mod_configure.erl:125 mod_configure.erl:544 web/ejabberd_web_admin.erl:1721 +#: mod_configure.erl:125 mod_configure.erl:544 web/ejabberd_web_admin.erl:1862 msgid "Database" msgstr "Base de dades" @@ -122,7 +122,7 @@ msgstr "Iniciar mòduls" msgid "Stop Modules" msgstr "Parar mòduls" -#: mod_configure.erl:131 mod_configure.erl:572 web/ejabberd_web_admin.erl:1722 +#: mod_configure.erl:131 mod_configure.erl:572 web/ejabberd_web_admin.erl:1863 msgid "Backup" msgstr "Guardar còpia de seguretat" @@ -151,7 +151,7 @@ msgid "Shut Down Service" msgstr "Apager el Servei" #: mod_configure.erl:145 mod_configure.erl:486 mod_configure.erl:1165 -#: web/ejabberd_web_admin.erl:1371 +#: web/ejabberd_web_admin.erl:1508 msgid "Add User" msgstr "Afegir usuari" @@ -188,15 +188,13 @@ msgstr "Obtenir Número d'Usuaris Registrats" msgid "Get Number of Online Users" msgstr "Obtenir Número d'Usuaris Connectats" -#: mod_configure.erl:163 mod_configure.erl:477 web/ejabberd_web_admin.erl:631 -#: web/ejabberd_web_admin.erl:649 web/ejabberd_web_admin.erl:706 -#: web/ejabberd_web_admin.erl:746 +#: mod_configure.erl:163 mod_configure.erl:477 web/ejabberd_web_admin.erl:811 +#: web/ejabberd_web_admin.erl:852 msgid "Access Control Lists" msgstr "Llista de Control d'Accés" -#: mod_configure.erl:165 mod_configure.erl:478 web/ejabberd_web_admin.erl:633 -#: web/ejabberd_web_admin.erl:651 web/ejabberd_web_admin.erl:813 -#: web/ejabberd_web_admin.erl:848 +#: mod_configure.erl:165 mod_configure.erl:478 web/ejabberd_web_admin.erl:920 +#: web/ejabberd_web_admin.erl:956 msgid "Access Rules" msgstr "Regles d'Accés" @@ -204,8 +202,8 @@ msgstr "Regles d'Accés" msgid "User Management" msgstr "Gestió d'Usuaris" -#: mod_configure.erl:468 web/ejabberd_web_admin.erl:654 -#: web/ejabberd_web_admin.erl:925 web/ejabberd_web_admin.erl:1308 +#: mod_configure.erl:468 web/ejabberd_web_admin.erl:1038 +#: web/ejabberd_web_admin.erl:1443 msgid "Online Users" msgstr "Usuaris conectats" @@ -217,15 +215,15 @@ msgstr "Tots els usuaris" msgid "Outgoing s2s Connections" msgstr "Connexions s2s d'eixida" -#: mod_configure.erl:471 web/ejabberd_web_admin.erl:1692 +#: mod_configure.erl:471 web/ejabberd_web_admin.erl:1833 msgid "Running Nodes" msgstr "Nodes funcionant" -#: mod_configure.erl:472 web/ejabberd_web_admin.erl:1694 +#: mod_configure.erl:472 web/ejabberd_web_admin.erl:1835 msgid "Stopped Nodes" msgstr "Nodes parats" -#: mod_configure.erl:545 mod_configure.erl:555 web/ejabberd_web_admin.erl:1738 +#: mod_configure.erl:545 mod_configure.erl:555 web/ejabberd_web_admin.erl:1879 msgid "Modules" msgstr "Mòduls" @@ -357,14 +355,14 @@ msgstr "Regles d'accés" #: mod_configure.erl:1168 mod_configure.erl:1190 mod_configure.erl:1202 #: mod_configure.erl:1214 mod_configure.erl:1226 mod_configure.erl:1243 #: mod_configure.erl:1255 mod_configure.erl:1620 mod_configure.erl:1670 -#: mod_configure.erl:1691 mod_roster.erl:822 mod_roster_odbc.erl:922 -#: mod_vcard.erl:462 mod_vcard_ldap.erl:546 mod_vcard_odbc.erl:437 +#: mod_configure.erl:1691 mod_roster.erl:948 mod_roster_odbc.erl:1049 +#: mod_vcard.erl:465 mod_vcard_ldap.erl:550 mod_vcard_odbc.erl:440 msgid "Jabber ID" msgstr "ID Jabber" #: mod_configure.erl:1173 mod_configure.erl:1231 mod_configure.erl:1621 -#: mod_configure.erl:1833 mod_muc/mod_muc_room.erl:2801 -#: web/ejabberd_web_admin.erl:1364 +#: mod_configure.erl:1833 mod_muc/mod_muc_room.erl:2849 +#: web/ejabberd_web_admin.erl:1501 msgid "Password" msgstr "Password" @@ -380,11 +378,11 @@ msgstr "Número d'Usuaris Registrats" msgid "Number of online users" msgstr "Número d'usuaris connectats" -#: mod_configure.erl:1652 web/ejabberd_web_admin.erl:1430 +#: mod_configure.erl:1652 web/ejabberd_web_admin.erl:1567 msgid "Never" msgstr "Mai" -#: mod_configure.erl:1666 web/ejabberd_web_admin.erl:1444 +#: mod_configure.erl:1666 web/ejabberd_web_admin.erl:1581 msgid "Online" msgstr "Connectat" @@ -416,238 +414,306 @@ msgstr "Acció en l'usuari" msgid "Edit Properties" msgstr "Editar propietats" -#: mod_configure.erl:1830 web/ejabberd_web_admin.erl:1556 +#: mod_configure.erl:1830 web/ejabberd_web_admin.erl:1695 msgid "Remove User" msgstr "Eliminar usuari" -#: mod_irc/mod_irc.erl:198 mod_muc/mod_muc.erl:335 +#: mod_irc/mod_irc.erl:201 mod_muc/mod_muc.erl:335 msgid "Access denied by service policy" msgstr "Accés denegat per la política del servei" -#: mod_irc/mod_irc.erl:311 +#: mod_irc/mod_irc.erl:400 msgid "IRC Transport" msgstr "Transport a IRC" -#: mod_irc/mod_irc.erl:323 +#: mod_irc/mod_irc.erl:427 msgid "ejabberd IRC module" msgstr "mòdul ejabberd IRC" -#: mod_irc/mod_irc.erl:441 +#: mod_irc/mod_irc.erl:557 msgid "You need an x:data capable client to configure mod_irc settings" msgstr "" "Necessites un client amb suport x:data per a configurar les opcions de " "mod_irc" -#: mod_irc/mod_irc.erl:448 +#: mod_irc/mod_irc.erl:564 msgid "Registration in mod_irc for " msgstr "Registre en mod_irc per a" -#: mod_irc/mod_irc.erl:453 +#: mod_irc/mod_irc.erl:569 +#, fuzzy msgid "" -"Enter username and encodings you wish to use for connecting to IRC servers" +"Enter username, encodings, ports and passwords you wish to use for " +"connecting to IRC servers" msgstr "" "Introdueix el nom d'usuari i les codificacions de caràcters per a utilitzar " "als servidors de IRC" -#: mod_irc/mod_irc.erl:458 +#: mod_irc/mod_irc.erl:574 msgid "IRC Username" msgstr "Nom d'usuari al IRC" -#: mod_irc/mod_irc.erl:468 +#: mod_irc/mod_irc.erl:584 +#, fuzzy msgid "" -"If you want to specify different encodings for IRC servers, fill this list " -"with values in format '{\"irc server\", \"encoding\"}'. By default this " -"service use \"~s\" encoding." +"If you want to specify different ports, passwords, encodings for IRC " +"servers, fill this list with values in format '{\"irc server\", \"encoding" +"\", port, \"password\"}'. By default this service use \"~s\" encoding, port " +"~p, empty password." msgstr "" "Si vols especificar codificacions de caràcters distints per a cada servidor " "IRC emplena aquesta llista amb els valors amb el format '{\"servidor irc\", " "\"codificació\"}'. Aquest servei utilitza per defecte la codificació \"~s\"." -#: mod_irc/mod_irc.erl:478 +#: mod_irc/mod_irc.erl:596 +#, fuzzy msgid "" -"Example: [{\"irc.lucky.net\", \"koi8-r\"}, {\"vendetta.fef.net\", \"iso8859-1" -"\"}]." +"Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef." +"net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}]." msgstr "" "Exemple: [{\"irc.lucky.net\", \"koi8-r\"}, {\"vendetta.fef.net\", \"iso8859-1" "\"}]." -#: mod_irc/mod_irc.erl:483 -msgid "Encodings" -msgstr "Codificacions" +#: mod_irc/mod_irc.erl:601 +msgid "Connections parameters" +msgstr "" + +#: mod_irc/mod_irc.erl:711 +msgid "Join IRC channel" +msgstr "" + +#: mod_irc/mod_irc.erl:715 +msgid "IRC channel (don't put the first #)" +msgstr "" + +#: mod_irc/mod_irc.erl:720 +#, fuzzy +msgid "IRC server" +msgstr "Nom d'usuari al IRC" + +#: mod_irc/mod_irc.erl:753 mod_irc/mod_irc.erl:757 +msgid "Join the IRC channel here." +msgstr "" + +#: mod_irc/mod_irc.erl:761 +msgid "Join the IRC channel in this Jabber ID: ~s" +msgstr "" + +#: mod_irc/mod_irc.erl:846 +msgid "IRC settings" +msgstr "" + +#: mod_irc/mod_irc.erl:851 +#, fuzzy +msgid "" +"Enter username and encodings you wish to use for connecting to IRC servers. " +"Press 'Next' to get more fields to fill in. Press 'Complete' to save " +"settings." +msgstr "" +"Introdueix el nom d'usuari i les codificacions de caràcters per a utilitzar " +"als servidors de IRC" + +#: mod_irc/mod_irc.erl:857 +#, fuzzy +msgid "IRC username" +msgstr "Nom d'usuari al IRC" + +#: mod_irc/mod_irc.erl:906 +#, fuzzy +msgid "Password ~b" +msgstr "Password" + +#: mod_irc/mod_irc.erl:911 +#, fuzzy +msgid "Port ~b" +msgstr "Port" + +#: mod_irc/mod_irc.erl:916 +msgid "Encoding for server ~b" +msgstr "" + +#: mod_irc/mod_irc.erl:925 +msgid "Server ~b" +msgstr "" -#: mod_muc/mod_muc.erl:433 +#: mod_muc/mod_muc.erl:437 msgid "Only service administrators are allowed to send service messages" msgstr "" "Sols els administradors del servei tenen permís per a enviar missatges de " "servei" -#: mod_muc/mod_muc.erl:478 +#: mod_muc/mod_muc.erl:482 msgid "Room creation is denied by service policy" msgstr "Se t'ha denegat el crear la sala per política del servei" -#: mod_muc/mod_muc.erl:485 +#: mod_muc/mod_muc.erl:489 msgid "Conference room does not exist" msgstr "La sala de conferències no existeix" -#: mod_muc/mod_muc.erl:549 +#: mod_muc/mod_muc.erl:553 msgid "Chatrooms" msgstr "Sales de xat" -#: mod_muc/mod_muc.erl:668 +#: mod_muc/mod_muc.erl:672 msgid "You need an x:data capable client to register nickname" msgstr "" "Necessites un client amb suport x:data per a poder registrar el Nickname" -#: mod_muc/mod_muc.erl:674 +#: mod_muc/mod_muc.erl:678 msgid "Nickname Registration at " msgstr "Registre del Nickname en " -#: mod_muc/mod_muc.erl:678 +#: mod_muc/mod_muc.erl:682 msgid "Enter nickname you want to register" msgstr "Introdueix el nickname que vols registrar" -#: mod_muc/mod_muc.erl:679 mod_roster.erl:823 mod_roster_odbc.erl:923 -#: mod_vcard.erl:357 mod_vcard.erl:467 mod_vcard_odbc.erl:334 -#: mod_vcard_odbc.erl:442 +#: mod_muc/mod_muc.erl:683 mod_roster.erl:949 mod_roster_odbc.erl:1050 +#: mod_vcard.erl:357 mod_vcard.erl:470 mod_vcard_odbc.erl:334 +#: mod_vcard_odbc.erl:445 msgid "Nickname" msgstr "Nickname" -#: mod_muc/mod_muc.erl:718 mod_muc/mod_muc_room.erl:924 -#: mod_muc/mod_muc_room.erl:1511 +#: mod_muc/mod_muc.erl:722 mod_muc/mod_muc_room.erl:926 +#: mod_muc/mod_muc_room.erl:1513 #, fuzzy msgid "That nickname is registered by another person" msgstr "El Nickname ja està registrat per una altra persona" -#: mod_muc/mod_muc.erl:742 +#: mod_muc/mod_muc.erl:748 msgid "You must fill in field \"Nickname\" in the form" msgstr "Deus d'omplir el camp \"Nickname\" al formulari" -#: mod_muc/mod_muc.erl:764 +#: mod_muc/mod_muc.erl:768 msgid "ejabberd MUC module" msgstr "mòdul ejabberd MUC" -#: mod_muc/mod_muc_log.erl:364 +#: mod_muc/mod_muc_log.erl:371 mod_muc/mod_muc_log.erl:378 msgid "Chatroom configuration modified" msgstr "Configuració de la sala de xat modificada" -#: mod_muc/mod_muc_log.erl:367 +#: mod_muc/mod_muc_log.erl:381 msgid "joins the room" msgstr "Entrar a la sala" -#: mod_muc/mod_muc_log.erl:370 mod_muc/mod_muc_log.erl:373 +#: mod_muc/mod_muc_log.erl:384 mod_muc/mod_muc_log.erl:387 msgid "leaves the room" msgstr "Deixar la sala" -#: mod_muc/mod_muc_log.erl:376 mod_muc/mod_muc_log.erl:379 +#: mod_muc/mod_muc_log.erl:390 mod_muc/mod_muc_log.erl:393 msgid "has been banned" msgstr "Has sigut banejat" -#: mod_muc/mod_muc_log.erl:382 mod_muc/mod_muc_log.erl:385 +#: mod_muc/mod_muc_log.erl:396 mod_muc/mod_muc_log.erl:399 msgid "has been kicked" msgstr "Has sigut expulsat" -#: mod_muc/mod_muc_log.erl:388 +#: mod_muc/mod_muc_log.erl:402 msgid "has been kicked because of an affiliation change" msgstr "Has sigut expulsat a causa d'un canvi d'afiliació" -#: mod_muc/mod_muc_log.erl:391 +#: mod_muc/mod_muc_log.erl:405 msgid "has been kicked because the room has been changed to members-only" msgstr "Has sigut expulsat perquè la sala ha canviat a sols membres" -#: mod_muc/mod_muc_log.erl:394 +#: mod_muc/mod_muc_log.erl:408 msgid "has been kicked because of a system shutdown" msgstr "Has sigut expulsat perquè el sistema s'ha apagat" -#: mod_muc/mod_muc_log.erl:397 +#: mod_muc/mod_muc_log.erl:411 msgid "is now known as" msgstr "ara es conegut com" -#: mod_muc/mod_muc_log.erl:400 mod_muc/mod_muc_log.erl:661 -#: mod_muc/mod_muc_room.erl:2032 +#: mod_muc/mod_muc_log.erl:414 mod_muc/mod_muc_log.erl:678 +#: mod_muc/mod_muc_room.erl:2040 msgid " has set the subject to: " msgstr " ha posat l'assumpte: " -#: mod_muc/mod_muc_log.erl:431 +#: mod_muc/mod_muc_log.erl:448 msgid "Monday" msgstr "Dilluns" -#: mod_muc/mod_muc_log.erl:432 +#: mod_muc/mod_muc_log.erl:449 msgid "Tuesday" msgstr "Dimarts" -#: mod_muc/mod_muc_log.erl:433 +#: mod_muc/mod_muc_log.erl:450 msgid "Wednesday" msgstr "Dimecres" -#: mod_muc/mod_muc_log.erl:434 +#: mod_muc/mod_muc_log.erl:451 msgid "Thursday" msgstr "Dijous" -#: mod_muc/mod_muc_log.erl:435 +#: mod_muc/mod_muc_log.erl:452 msgid "Friday" msgstr "Divendres" -#: mod_muc/mod_muc_log.erl:436 +#: mod_muc/mod_muc_log.erl:453 msgid "Saturday" msgstr "Dissabte" -#: mod_muc/mod_muc_log.erl:437 +#: mod_muc/mod_muc_log.erl:454 msgid "Sunday" msgstr "Diumenge" -#: mod_muc/mod_muc_log.erl:441 +#: mod_muc/mod_muc_log.erl:458 msgid "January" msgstr "Gener" -#: mod_muc/mod_muc_log.erl:442 +#: mod_muc/mod_muc_log.erl:459 msgid "February" msgstr "Febrer" -#: mod_muc/mod_muc_log.erl:443 +#: mod_muc/mod_muc_log.erl:460 msgid "March" msgstr "Març" -#: mod_muc/mod_muc_log.erl:444 +#: mod_muc/mod_muc_log.erl:461 msgid "April" msgstr "Abril" -#: mod_muc/mod_muc_log.erl:445 +#: mod_muc/mod_muc_log.erl:462 msgid "May" msgstr "Maig" -#: mod_muc/mod_muc_log.erl:446 +#: mod_muc/mod_muc_log.erl:463 msgid "June" msgstr "Juny" -#: mod_muc/mod_muc_log.erl:447 +#: mod_muc/mod_muc_log.erl:464 msgid "July" msgstr "Juliol" -#: mod_muc/mod_muc_log.erl:448 +#: mod_muc/mod_muc_log.erl:465 msgid "August" msgstr "Agost" -#: mod_muc/mod_muc_log.erl:449 +#: mod_muc/mod_muc_log.erl:466 msgid "September" msgstr "Setembre" -#: mod_muc/mod_muc_log.erl:450 +#: mod_muc/mod_muc_log.erl:467 msgid "October" msgstr "Octubre" -#: mod_muc/mod_muc_log.erl:451 +#: mod_muc/mod_muc_log.erl:468 msgid "November" msgstr "Novembre" -#: mod_muc/mod_muc_log.erl:452 +#: mod_muc/mod_muc_log.erl:469 msgid "December" msgstr "Decembre" -#: mod_muc/mod_muc_log.erl:719 +#: mod_muc/mod_muc_log.erl:740 msgid "Room Configuration" msgstr "Configuració de la sala" -#: mod_muc/mod_muc_log.erl:820 mod_muc/mod_muc_room.erl:2777 +#: mod_muc/mod_muc_log.erl:749 +#, fuzzy +msgid "Room Occupants" +msgstr "Número d'ocupants" + +#: mod_muc/mod_muc_log.erl:852 mod_muc/mod_muc_room.erl:2825 msgid "Room title" msgstr "Títol de la sala" @@ -686,8 +752,8 @@ msgstr "No està permés enviar missatges del tipus \"groupchat\"" msgid "Recipient is not in the conference room" msgstr "El receptor no està en la sala de conferència" -#: mod_muc/mod_muc_room.erl:448 mod_muc/mod_muc_room.erl:823 -#: mod_muc/mod_muc_room.erl:3388 +#: mod_muc/mod_muc_room.erl:448 mod_muc/mod_muc_room.erl:825 +#: mod_muc/mod_muc_room.erl:3447 msgid "Only occupants are allowed to send messages to the conference" msgstr "Sols els ocupants poden enviar missatges a la sala" @@ -703,11 +769,11 @@ msgstr "Sols els ocupants poden enviar solicituts a la sala" msgid "Queries to the conference members are not allowed in this room" msgstr " En aquesta sala no es permeten solicituts als membres de la sala" -#: mod_muc/mod_muc_room.erl:600 +#: mod_muc/mod_muc_room.erl:601 msgid "private, " msgstr "privat" -#: mod_muc/mod_muc_room.erl:799 +#: mod_muc/mod_muc_room.erl:801 #, fuzzy msgid "" "Only moderators and participants are allowed to change the subject in this " @@ -715,338 +781,342 @@ msgid "" msgstr "" "Sols els moderadors i participants poden canviar l'assumpte d'aquesta sala" -#: mod_muc/mod_muc_room.erl:804 +#: mod_muc/mod_muc_room.erl:806 #, fuzzy msgid "Only moderators are allowed to change the subject in this room" msgstr "Sols els moderadors poden canviar l'assumpte d'aquesta sala" -#: mod_muc/mod_muc_room.erl:814 +#: mod_muc/mod_muc_room.erl:816 msgid "Visitors are not allowed to send messages to all occupants" msgstr "Els visitants no poden enviar missatges a tots els ocupants" -#: mod_muc/mod_muc_room.erl:882 +#: mod_muc/mod_muc_room.erl:884 msgid "" "This participant is kicked from the room because he sent an error presence" msgstr "" "Aquest participant ha sigut expulsat de la sala perque ha enviat un error de " "presencia" -#: mod_muc/mod_muc_room.erl:900 +#: mod_muc/mod_muc_room.erl:902 msgid "Visitors are not allowed to change their nicknames in this room" msgstr "Els visitants no tenen permés canviar el seus Nicknames en esta sala" -#: mod_muc/mod_muc_room.erl:913 mod_muc/mod_muc_room.erl:1503 +#: mod_muc/mod_muc_room.erl:915 mod_muc/mod_muc_room.erl:1505 #, fuzzy msgid "That nickname is already in use by another occupant" msgstr "El Nickname està siguent utilitzat per una altra persona" -#: mod_muc/mod_muc_room.erl:1492 +#: mod_muc/mod_muc_room.erl:1494 msgid "You have been banned from this room" msgstr "Has sigut bloquejat en aquesta sala" -#: mod_muc/mod_muc_room.erl:1495 +#: mod_muc/mod_muc_room.erl:1497 #, fuzzy msgid "Membership is required to enter this room" msgstr "Necessites ser membre d'aquesta sala per a poder entrar" -#: mod_muc/mod_muc_room.erl:1531 +#: mod_muc/mod_muc_room.erl:1533 msgid "This room is not anonymous" msgstr "Aquesta sala no és anònima" -#: mod_muc/mod_muc_room.erl:1557 +#: mod_muc/mod_muc_room.erl:1559 #, fuzzy msgid "A password is required to enter this room" msgstr "Es necessita password per a entrar en aquesta sala" -#: mod_muc/mod_muc_room.erl:1579 +#: mod_muc/mod_muc_room.erl:1581 msgid "Unable to generate a captcha" msgstr "" -#: mod_muc/mod_muc_room.erl:1589 +#: mod_muc/mod_muc_room.erl:1591 msgid "Incorrect password" msgstr "Password incorrecte" -#: mod_muc/mod_muc_room.erl:2087 +#: mod_muc/mod_muc_room.erl:2095 msgid "Administrator privileges required" msgstr "Es necessita tenir privilegis d'administrador" -#: mod_muc/mod_muc_room.erl:2102 +#: mod_muc/mod_muc_room.erl:2110 msgid "Moderator privileges required" msgstr "Es necessita tenir privilegis de moderador" -#: mod_muc/mod_muc_room.erl:2257 +#: mod_muc/mod_muc_room.erl:2265 msgid "Jabber ID ~s is invalid" msgstr "El Jabber ID ~s no és vàlid" -#: mod_muc/mod_muc_room.erl:2271 +#: mod_muc/mod_muc_room.erl:2279 msgid "Nickname ~s does not exist in the room" msgstr "El Nickname ~s no existeix a la sala" -#: mod_muc/mod_muc_room.erl:2297 mod_muc/mod_muc_room.erl:2673 +#: mod_muc/mod_muc_room.erl:2305 mod_muc/mod_muc_room.erl:2683 msgid "Invalid affiliation: ~s" msgstr "Afiliació invàlida: ~s" -#: mod_muc/mod_muc_room.erl:2354 +#: mod_muc/mod_muc_room.erl:2362 msgid "Invalid role: ~s" msgstr "Rol invàlid: ~s" -#: mod_muc/mod_muc_room.erl:2650 mod_muc/mod_muc_room.erl:2686 +#: mod_muc/mod_muc_room.erl:2660 mod_muc/mod_muc_room.erl:2696 msgid "Owner privileges required" msgstr "Es requerixen privilegis de propietari de la sala" -#: mod_muc/mod_muc_room.erl:2772 +#: mod_muc/mod_muc_room.erl:2820 #, fuzzy msgid "Configuration of room ~s" msgstr "Configuració per a " -#: mod_muc/mod_muc_room.erl:2780 mod_muc/mod_muc_room.erl:3187 +#: mod_muc/mod_muc_room.erl:2828 mod_muc/mod_muc_room.erl:3246 #, fuzzy msgid "Room description" msgstr "Descripció:" -#: mod_muc/mod_muc_room.erl:2787 +#: mod_muc/mod_muc_room.erl:2835 msgid "Make room persistent" msgstr "Crear una sala persistent" -#: mod_muc/mod_muc_room.erl:2792 +#: mod_muc/mod_muc_room.erl:2840 msgid "Make room public searchable" msgstr "Crear una sala pública" -#: mod_muc/mod_muc_room.erl:2795 +#: mod_muc/mod_muc_room.erl:2843 msgid "Make participants list public" msgstr "Crear una llista de participants pública" -#: mod_muc/mod_muc_room.erl:2798 +#: mod_muc/mod_muc_room.erl:2846 msgid "Make room password protected" msgstr "Crear una sala amb password" -#: mod_muc/mod_muc_room.erl:2809 +#: mod_muc/mod_muc_room.erl:2857 msgid "Maximum Number of Occupants" msgstr "Número màxim d'ocupants" -#: mod_muc/mod_muc_room.erl:2816 +#: mod_muc/mod_muc_room.erl:2864 msgid "No limit" msgstr "Sense Llímit" -#: mod_muc/mod_muc_room.erl:2827 +#: mod_muc/mod_muc_room.erl:2875 msgid "Present real Jabber IDs to" msgstr "Presentar Jabber ID's reals a" -#: mod_muc/mod_muc_room.erl:2835 +#: mod_muc/mod_muc_room.erl:2883 msgid "moderators only" msgstr "sols moderadors" -#: mod_muc/mod_muc_room.erl:2837 +#: mod_muc/mod_muc_room.erl:2885 msgid "anyone" msgstr "qualsevol" -#: mod_muc/mod_muc_room.erl:2839 +#: mod_muc/mod_muc_room.erl:2887 msgid "Make room members-only" msgstr "Crear una sala de \"soles membres\"" -#: mod_muc/mod_muc_room.erl:2842 +#: mod_muc/mod_muc_room.erl:2890 msgid "Make room moderated" msgstr "Crear una sala moderada" -#: mod_muc/mod_muc_room.erl:2845 +#: mod_muc/mod_muc_room.erl:2893 msgid "Default users as participants" msgstr "Els usuaris per defecte són els participants" -#: mod_muc/mod_muc_room.erl:2848 +#: mod_muc/mod_muc_room.erl:2896 #, fuzzy msgid "Allow users to change the subject" msgstr "Permetre que els usuaris canvien el tema" -#: mod_muc/mod_muc_room.erl:2851 +#: mod_muc/mod_muc_room.erl:2899 msgid "Allow users to send private messages" msgstr "Permetre que els usuaris envien missatges privats" -#: mod_muc/mod_muc_room.erl:2854 +#: mod_muc/mod_muc_room.erl:2902 msgid "Allow users to query other users" msgstr "Permetre que els usuaris fagen peticions a altres usuaris" -#: mod_muc/mod_muc_room.erl:2857 +#: mod_muc/mod_muc_room.erl:2905 msgid "Allow users to send invites" msgstr "Permetre que els usuaris envien invitacions" -#: mod_muc/mod_muc_room.erl:2860 +#: mod_muc/mod_muc_room.erl:2908 msgid "Allow visitors to send status text in presence updates" msgstr "" "Permetre als visitants enviar text d'estat en les actualitzacions de " "presència" -#: mod_muc/mod_muc_room.erl:2863 +#: mod_muc/mod_muc_room.erl:2911 msgid "Allow visitors to change nickname" msgstr "Permetre als visitants canviar el Nickname" -#: mod_muc/mod_muc_room.erl:2869 +#: mod_muc/mod_muc_room.erl:2917 #, fuzzy msgid "Make room captcha protected" msgstr "Crear una sala amb password" -#: mod_muc/mod_muc_room.erl:2878 +#: mod_muc/mod_muc_room.erl:2926 msgid "Enable logging" msgstr "Habilitar el registre de la conversa" -#: mod_muc/mod_muc_room.erl:2886 +#: mod_muc/mod_muc_room.erl:2934 msgid "You need an x:data capable client to configure room" msgstr "Necessites un client amb suport x:data per a configurar la sala" -#: mod_muc/mod_muc_room.erl:3189 +#: mod_muc/mod_muc_room.erl:3248 msgid "Number of occupants" msgstr "Número d'ocupants" -#: mod_muc/mod_muc_room.erl:3308 +#: mod_muc/mod_muc_room.erl:3367 msgid "~s invites you to the room ~s" msgstr "~s et convida a la sala ~s" -#: mod_muc/mod_muc_room.erl:3317 +#: mod_muc/mod_muc_room.erl:3376 msgid "the password is" msgstr "el password és" -#: mod_offline.erl:451 mod_offline_odbc.erl:303 +#: mod_offline.erl:509 mod_offline_odbc.erl:352 msgid "" "Your contact offline message queue is full. The message has been discarded." msgstr "La cua de missatges offline és plena. El missatge ha sigut descartat" -#: mod_offline.erl:500 mod_offline_odbc.erl:358 +#: mod_offline.erl:558 mod_offline_odbc.erl:407 msgid "~s's Offline Messages Queue" msgstr "~s's cua de missatges offline" -#: mod_offline.erl:503 mod_offline_odbc.erl:361 mod_roster.erl:866 -#: mod_roster_odbc.erl:966 mod_shared_roster.erl:778 mod_shared_roster.erl:879 -#: web/ejabberd_web_admin.erl:708 web/ejabberd_web_admin.erl:748 -#: web/ejabberd_web_admin.erl:815 web/ejabberd_web_admin.erl:850 -#: web/ejabberd_web_admin.erl:890 web/ejabberd_web_admin.erl:1352 -#: web/ejabberd_web_admin.erl:1548 web/ejabberd_web_admin.erl:1716 -#: web/ejabberd_web_admin.erl:1748 web/ejabberd_web_admin.erl:1810 -#: web/ejabberd_web_admin.erl:1878 web/ejabberd_web_admin.erl:1903 -#: web/ejabberd_web_admin.erl:1991 +#: mod_offline.erl:561 mod_offline_odbc.erl:410 mod_roster.erl:992 +#: mod_roster_odbc.erl:1093 mod_shared_roster.erl:778 +#: mod_shared_roster.erl:879 web/ejabberd_web_admin.erl:813 +#: web/ejabberd_web_admin.erl:854 web/ejabberd_web_admin.erl:922 +#: web/ejabberd_web_admin.erl:958 web/ejabberd_web_admin.erl:999 +#: web/ejabberd_web_admin.erl:1489 web/ejabberd_web_admin.erl:1687 +#: web/ejabberd_web_admin.erl:1857 web/ejabberd_web_admin.erl:1889 +#: web/ejabberd_web_admin.erl:1952 web/ejabberd_web_admin.erl:2056 +#: web/ejabberd_web_admin.erl:2081 web/ejabberd_web_admin.erl:2169 msgid "Submitted" msgstr "Enviat" -#: mod_offline.erl:511 +#: mod_offline.erl:569 msgid "Time" msgstr "Data" -#: mod_offline.erl:512 +#: mod_offline.erl:570 msgid "From" msgstr "De" -#: mod_offline.erl:513 +#: mod_offline.erl:571 msgid "To" msgstr "Per a" -#: mod_offline.erl:514 mod_offline_odbc.erl:369 +#: mod_offline.erl:572 mod_offline_odbc.erl:418 msgid "Packet" msgstr "Paquet" -#: mod_offline.erl:527 mod_offline_odbc.erl:382 mod_shared_roster.erl:785 -#: web/ejabberd_web_admin.erl:756 web/ejabberd_web_admin.erl:858 +#: mod_offline.erl:585 mod_offline_odbc.erl:431 mod_shared_roster.erl:785 +#: web/ejabberd_web_admin.erl:862 web/ejabberd_web_admin.erl:966 msgid "Delete Selected" msgstr "Eliminar els seleccionats" -#: mod_offline.erl:562 mod_offline_odbc.erl:447 +#: mod_offline.erl:620 mod_offline_odbc.erl:496 msgid "Offline Messages:" msgstr "Missatges fora de línia:" -#: mod_offline.erl:562 mod_offline_odbc.erl:447 +#: mod_offline.erl:620 mod_offline_odbc.erl:496 #, fuzzy msgid "Remove All Offline Messages" msgstr "Missatges offline" -#: mod_proxy65/mod_proxy65_service.erl:209 +#: mod_proxy65/mod_proxy65_service.erl:213 msgid "ejabberd SOCKS5 Bytestreams module" msgstr "mòdul ejabberd SOCKS5 Bytestreams" -#: mod_pubsub/mod_pubsub.erl:1022 +#: mod_pubsub/mod_pubsub.erl:1054 mod_pubsub/mod_pubsub_odbc.erl:1053 msgid "Publish-Subscribe" msgstr "Publicar-subscriure't" -#: mod_pubsub/mod_pubsub.erl:1118 +#: mod_pubsub/mod_pubsub.erl:1150 mod_pubsub/mod_pubsub_odbc.erl:1150 msgid "ejabberd Publish-Subscribe module" msgstr "Mòdul ejannerd Publicar-Subscriure" -#: mod_pubsub/mod_pubsub.erl:1271 +#: mod_pubsub/mod_pubsub.erl:1437 mod_pubsub/mod_pubsub_odbc.erl:1442 msgid "PubSub subscriber request" msgstr "Petició de PubSub subscriure" -#: mod_pubsub/mod_pubsub.erl:1273 +#: mod_pubsub/mod_pubsub.erl:1439 mod_pubsub/mod_pubsub_odbc.erl:1444 msgid "Choose whether to approve this entity's subscription." msgstr "Tria si aprova aquesta entitat de subscripció" -#: mod_pubsub/mod_pubsub.erl:1279 +#: mod_pubsub/mod_pubsub.erl:1445 mod_pubsub/mod_pubsub_odbc.erl:1450 msgid "Node ID" msgstr "ID del Node" -#: mod_pubsub/mod_pubsub.erl:1284 +#: mod_pubsub/mod_pubsub.erl:1450 mod_pubsub/mod_pubsub_odbc.erl:1455 msgid "Subscriber Address" msgstr "Adreça del Subscriptor" -#: mod_pubsub/mod_pubsub.erl:1290 +#: mod_pubsub/mod_pubsub.erl:1456 mod_pubsub/mod_pubsub_odbc.erl:1461 msgid "Allow this Jabber ID to subscribe to this pubsub node?" msgstr "Permetre que aquesta Jabber ID es puga subscriure a aquest node pubsub" -#: mod_pubsub/mod_pubsub.erl:3005 +#: mod_pubsub/mod_pubsub.erl:3220 mod_pubsub/mod_pubsub_odbc.erl:3244 msgid "Deliver payloads with event notifications" msgstr "Enviar payloads junt a les notificacions d'events" -#: mod_pubsub/mod_pubsub.erl:3006 +#: mod_pubsub/mod_pubsub.erl:3221 mod_pubsub/mod_pubsub_odbc.erl:3245 msgid "Deliver event notifications" msgstr "Entrega de notificacions d'events" -#: mod_pubsub/mod_pubsub.erl:3007 +#: mod_pubsub/mod_pubsub.erl:3222 mod_pubsub/mod_pubsub_odbc.erl:3246 msgid "Notify subscribers when the node configuration changes" msgstr "Notificar subscriptors quan canvia la configuració del node" -#: mod_pubsub/mod_pubsub.erl:3008 +#: mod_pubsub/mod_pubsub.erl:3223 mod_pubsub/mod_pubsub_odbc.erl:3247 msgid "Notify subscribers when the node is deleted" msgstr "Notificar subscriptors quan el node és eliminat" -#: mod_pubsub/mod_pubsub.erl:3009 +#: mod_pubsub/mod_pubsub.erl:3224 mod_pubsub/mod_pubsub_odbc.erl:3248 msgid "Notify subscribers when items are removed from the node" msgstr "Notificar subscriptors quan els elements són eliminats del node" -#: mod_pubsub/mod_pubsub.erl:3010 +#: mod_pubsub/mod_pubsub.erl:3225 mod_pubsub/mod_pubsub_odbc.erl:3249 msgid "Persist items to storage" msgstr "Persistir elements al guardar" -#: mod_pubsub/mod_pubsub.erl:3011 +#: mod_pubsub/mod_pubsub.erl:3226 mod_pubsub/mod_pubsub_odbc.erl:3250 msgid "A friendly name for the node" msgstr "Un nom per al node" -#: mod_pubsub/mod_pubsub.erl:3012 +#: mod_pubsub/mod_pubsub.erl:3227 mod_pubsub/mod_pubsub_odbc.erl:3251 msgid "Max # of items to persist" msgstr "Màxim # d'elements que persistixen" -#: mod_pubsub/mod_pubsub.erl:3013 +#: mod_pubsub/mod_pubsub.erl:3228 mod_pubsub/mod_pubsub_odbc.erl:3252 msgid "Whether to allow subscriptions" msgstr "Permetre subscripcions" -#: mod_pubsub/mod_pubsub.erl:3014 +#: mod_pubsub/mod_pubsub.erl:3229 mod_pubsub/mod_pubsub_odbc.erl:3253 msgid "Specify the access model" msgstr "Especificar el model d'accés" -#: mod_pubsub/mod_pubsub.erl:3017 +#: mod_pubsub/mod_pubsub.erl:3232 mod_pubsub/mod_pubsub_odbc.erl:3256 msgid "Roster groups allowed to subscribe" msgstr "Llista de grups que tenen permés subscriures" -#: mod_pubsub/mod_pubsub.erl:3018 +#: mod_pubsub/mod_pubsub.erl:3233 mod_pubsub/mod_pubsub_odbc.erl:3257 msgid "Specify the publisher model" msgstr "Especificar el model del publicant" -#: mod_pubsub/mod_pubsub.erl:3020 +#: mod_pubsub/mod_pubsub.erl:3235 mod_pubsub/mod_pubsub_odbc.erl:3259 msgid "Max payload size in bytes" msgstr "Màxim tamany del payload en bytes" -#: mod_pubsub/mod_pubsub.erl:3021 +#: mod_pubsub/mod_pubsub.erl:3236 mod_pubsub/mod_pubsub_odbc.erl:3260 msgid "When to send the last published item" msgstr "Quan s'ha enviat l'última publicació" -#: mod_pubsub/mod_pubsub.erl:3023 +#: mod_pubsub/mod_pubsub.erl:3238 mod_pubsub/mod_pubsub_odbc.erl:3262 msgid "Only deliver notifications to available users" msgstr "Sols enviar notificacions als usuaris disponibles" +#: mod_pubsub/mod_pubsub.erl:3239 mod_pubsub/mod_pubsub_odbc.erl:3263 +msgid "The collections with which a node is affiliated" +msgstr "" + #: mod_register.erl:190 msgid "Choose a username and password to register with this server" msgstr "Tria nom d'usuari i password per a registrar-te en aquest servidor" @@ -1056,51 +1126,51 @@ msgstr "Tria nom d'usuari i password per a registrar-te en aquest servidor" msgid "Users are not allowed to register accounts so quickly" msgstr "Els usuarios no tenen permis per a crear comptes tan apresa" -#: mod_roster.erl:817 mod_roster_odbc.erl:917 web/ejabberd_web_admin.erl:1514 -#: web/ejabberd_web_admin.erl:1671 web/ejabberd_web_admin.erl:1682 -#: web/ejabberd_web_admin.erl:1962 +#: mod_roster.erl:943 mod_roster_odbc.erl:1044 web/ejabberd_web_admin.erl:1653 +#: web/ejabberd_web_admin.erl:1812 web/ejabberd_web_admin.erl:1823 +#: web/ejabberd_web_admin.erl:2140 msgid "None" msgstr "Cap" -#: mod_roster.erl:824 mod_roster_odbc.erl:924 +#: mod_roster.erl:950 mod_roster_odbc.erl:1051 msgid "Subscription" msgstr "Subscripció" -#: mod_roster.erl:825 mod_roster_odbc.erl:925 +#: mod_roster.erl:951 mod_roster_odbc.erl:1052 msgid "Pending" msgstr "Pendent" -#: mod_roster.erl:826 mod_roster_odbc.erl:926 +#: mod_roster.erl:952 mod_roster_odbc.erl:1053 msgid "Groups" msgstr "Grups" -#: mod_roster.erl:853 mod_roster_odbc.erl:953 +#: mod_roster.erl:979 mod_roster_odbc.erl:1080 msgid "Validate" msgstr "Validar" -#: mod_roster.erl:861 mod_roster_odbc.erl:961 +#: mod_roster.erl:987 mod_roster_odbc.erl:1088 msgid "Remove" msgstr "Borrar" -#: mod_roster.erl:864 mod_roster_odbc.erl:964 +#: mod_roster.erl:990 mod_roster_odbc.erl:1091 msgid "Roster of " msgstr "Llista de contactes de " -#: mod_roster.erl:867 mod_roster_odbc.erl:967 mod_shared_roster.erl:779 -#: mod_shared_roster.erl:880 web/ejabberd_web_admin.erl:709 -#: web/ejabberd_web_admin.erl:749 web/ejabberd_web_admin.erl:816 -#: web/ejabberd_web_admin.erl:851 web/ejabberd_web_admin.erl:891 -#: web/ejabberd_web_admin.erl:1353 web/ejabberd_web_admin.erl:1549 -#: web/ejabberd_web_admin.erl:1717 web/ejabberd_web_admin.erl:1879 -#: web/ejabberd_web_admin.erl:1904 web/ejabberd_web_admin.erl:1992 +#: mod_roster.erl:993 mod_roster_odbc.erl:1094 mod_shared_roster.erl:779 +#: mod_shared_roster.erl:880 web/ejabberd_web_admin.erl:814 +#: web/ejabberd_web_admin.erl:855 web/ejabberd_web_admin.erl:923 +#: web/ejabberd_web_admin.erl:959 web/ejabberd_web_admin.erl:1000 +#: web/ejabberd_web_admin.erl:1490 web/ejabberd_web_admin.erl:1688 +#: web/ejabberd_web_admin.erl:1858 web/ejabberd_web_admin.erl:2057 +#: web/ejabberd_web_admin.erl:2082 web/ejabberd_web_admin.erl:2170 msgid "Bad format" msgstr "Format erroni" -#: mod_roster.erl:874 mod_roster_odbc.erl:974 +#: mod_roster.erl:1000 mod_roster_odbc.erl:1101 msgid "Add Jabber ID" msgstr "Afegir Jabber ID" -#: mod_roster.erl:973 mod_roster_odbc.erl:1073 +#: mod_roster.erl:1099 mod_roster_odbc.erl:1200 msgid "Roster" msgstr "Llista de contactes" @@ -1109,8 +1179,8 @@ msgstr "Llista de contactes" msgid "Shared Roster Groups" msgstr "Grups de contactes compartits" -#: mod_shared_roster.erl:772 web/ejabberd_web_admin.erl:1222 -#: web/ejabberd_web_admin.erl:2176 +#: mod_shared_roster.erl:772 web/ejabberd_web_admin.erl:1346 +#: web/ejabberd_web_admin.erl:2382 msgid "Add New" msgstr "Afegir nou" @@ -1134,9 +1204,9 @@ msgstr "Mostrar grups:" msgid "Group " msgstr "Grup " -#: mod_shared_roster.erl:886 web/ejabberd_web_admin.erl:715 -#: web/ejabberd_web_admin.erl:758 web/ejabberd_web_admin.erl:822 -#: web/ejabberd_web_admin.erl:897 web/ejabberd_web_admin.erl:1802 +#: mod_shared_roster.erl:886 web/ejabberd_web_admin.erl:820 +#: web/ejabberd_web_admin.erl:864 web/ejabberd_web_admin.erl:929 +#: web/ejabberd_web_admin.erl:1006 web/ejabberd_web_admin.erl:1943 msgid "Submit" msgstr "Enviar" @@ -1144,28 +1214,28 @@ msgstr "Enviar" msgid "Erlang Jabber Server" msgstr "Servidor Erlang Jabber" -#: mod_vcard.erl:357 mod_vcard.erl:468 mod_vcard_odbc.erl:334 -#: mod_vcard_odbc.erl:443 +#: mod_vcard.erl:357 mod_vcard.erl:471 mod_vcard_odbc.erl:334 +#: mod_vcard_odbc.erl:446 msgid "Birthday" msgstr "Aniversari" -#: mod_vcard.erl:357 mod_vcard.erl:470 mod_vcard_odbc.erl:334 -#: mod_vcard_odbc.erl:445 +#: mod_vcard.erl:357 mod_vcard.erl:473 mod_vcard_odbc.erl:334 +#: mod_vcard_odbc.erl:448 msgid "City" msgstr "Ciutat" -#: mod_vcard.erl:357 mod_vcard.erl:469 mod_vcard_odbc.erl:334 -#: mod_vcard_odbc.erl:444 +#: mod_vcard.erl:357 mod_vcard.erl:472 mod_vcard_odbc.erl:334 +#: mod_vcard_odbc.erl:447 msgid "Country" msgstr "Pais" -#: mod_vcard.erl:357 mod_vcard.erl:471 mod_vcard_odbc.erl:334 -#: mod_vcard_odbc.erl:446 +#: mod_vcard.erl:357 mod_vcard.erl:474 mod_vcard_odbc.erl:334 +#: mod_vcard_odbc.erl:449 msgid "Email" msgstr "Email" -#: mod_vcard.erl:357 mod_vcard.erl:466 mod_vcard_odbc.erl:334 -#: mod_vcard_odbc.erl:441 +#: mod_vcard.erl:357 mod_vcard.erl:469 mod_vcard_odbc.erl:334 +#: mod_vcard_odbc.erl:444 msgid "Family Name" msgstr "Cognom" @@ -1177,244 +1247,237 @@ msgstr "" "Emplena el formulari per a buscar usuaris Jabber. Afegix * al final d'un " "camp per a buscar subcadenes." -#: mod_vcard.erl:357 mod_vcard.erl:463 mod_vcard_odbc.erl:334 -#: mod_vcard_odbc.erl:438 +#: mod_vcard.erl:357 mod_vcard.erl:466 mod_vcard_odbc.erl:334 +#: mod_vcard_odbc.erl:441 msgid "Full Name" msgstr "Nom complet" -#: mod_vcard.erl:357 mod_vcard.erl:465 mod_vcard_odbc.erl:334 -#: mod_vcard_odbc.erl:440 +#: mod_vcard.erl:357 mod_vcard.erl:468 mod_vcard_odbc.erl:334 +#: mod_vcard_odbc.erl:443 msgid "Middle Name" msgstr "Segon nom" -#: mod_vcard.erl:357 mod_vcard.erl:464 mod_vcard_odbc.erl:334 -#: mod_vcard_odbc.erl:439 web/ejabberd_web_admin.erl:1791 +#: mod_vcard.erl:357 mod_vcard.erl:467 mod_vcard_odbc.erl:334 +#: mod_vcard_odbc.erl:442 web/ejabberd_web_admin.erl:1932 msgid "Name" msgstr "Nom" -#: mod_vcard.erl:357 mod_vcard.erl:472 mod_vcard_odbc.erl:334 -#: mod_vcard_odbc.erl:447 +#: mod_vcard.erl:357 mod_vcard.erl:475 mod_vcard_odbc.erl:334 +#: mod_vcard_odbc.erl:450 msgid "Organization Name" msgstr "Nom de la organizació" -#: mod_vcard.erl:357 mod_vcard.erl:473 mod_vcard_odbc.erl:334 -#: mod_vcard_odbc.erl:448 +#: mod_vcard.erl:357 mod_vcard.erl:476 mod_vcard_odbc.erl:334 +#: mod_vcard_odbc.erl:451 msgid "Organization Unit" msgstr "Unitat de la organizació" -#: mod_vcard.erl:357 mod_vcard_ldap.erl:457 mod_vcard_odbc.erl:334 +#: mod_vcard.erl:357 mod_vcard_ldap.erl:458 mod_vcard_odbc.erl:334 msgid "Search users in " msgstr "Cerca usuaris en " -#: mod_vcard.erl:357 mod_vcard_odbc.erl:334 web/ejabberd_web_admin.erl:1359 -#: web/ejabberd_web_admin.erl:1414 +#: mod_vcard.erl:357 mod_vcard_odbc.erl:334 web/ejabberd_web_admin.erl:1496 +#: web/ejabberd_web_admin.erl:1551 msgid "User" msgstr "Usuari" -#: mod_vcard.erl:357 mod_vcard_ldap.erl:457 mod_vcard_odbc.erl:334 +#: mod_vcard.erl:357 mod_vcard_ldap.erl:458 mod_vcard_odbc.erl:334 msgid "You need an x:data capable client to search" msgstr "Necesites un client amb suport x:data per a poder buscar" -#: mod_vcard.erl:379 mod_vcard_ldap.erl:479 mod_vcard_odbc.erl:356 +#: mod_vcard.erl:382 mod_vcard_ldap.erl:483 mod_vcard_odbc.erl:359 msgid "vCard User Search" msgstr "Recerca de vCard d'usuari" -#: mod_vcard.erl:435 mod_vcard_ldap.erl:533 mod_vcard_odbc.erl:410 +#: mod_vcard.erl:438 mod_vcard_ldap.erl:537 mod_vcard_odbc.erl:413 msgid "ejabberd vCard module" msgstr "Mòdul ejabberd vCard" -#: mod_vcard.erl:459 mod_vcard_ldap.erl:543 mod_vcard_odbc.erl:434 +#: mod_vcard.erl:462 mod_vcard_ldap.erl:547 mod_vcard_odbc.erl:437 msgid "Search Results for " msgstr "Resultat de la búsqueda" -#: mod_vcard_ldap.erl:457 +#: mod_vcard_ldap.erl:458 msgid "Fill in fields to search for any matching Jabber User" msgstr "Emplena camps per a buscar usuaris Jabber que concorden" -#: web/ejabberd_web_admin.erl:151 web/ejabberd_web_admin.erl:168 +#: web/ejabberd_web_admin.erl:179 web/ejabberd_web_admin.erl:186 +#: web/ejabberd_web_admin.erl:202 web/ejabberd_web_admin.erl:209 +msgid "Unauthorized" +msgstr "" + +#: web/ejabberd_web_admin.erl:266 web/ejabberd_web_admin.erl:283 msgid "ejabberd Web Admin" msgstr "Web d'administració del ejabberd" -#: web/ejabberd_web_admin.erl:629 web/ejabberd_web_admin.erl:647 +#: web/ejabberd_web_admin.erl:749 web/ejabberd_web_admin.erl:760 msgid "Administration" msgstr "Administració" -#: web/ejabberd_web_admin.erl:632 web/ejabberd_web_admin.erl:634 -#: web/ejabberd_web_admin.erl:650 web/ejabberd_web_admin.erl:652 -msgid "(Raw)" -msgstr "(en format text)" - -#: web/ejabberd_web_admin.erl:635 -msgid "Virtual Hosts" -msgstr "Hosts Virtuals" - -#: web/ejabberd_web_admin.erl:636 web/ejabberd_web_admin.erl:656 -#: web/ejabberd_web_admin.erl:1691 -msgid "Nodes" -msgstr "Nodes" - -#: web/ejabberd_web_admin.erl:637 web/ejabberd_web_admin.erl:657 -#: web/ejabberd_web_admin.erl:970 web/ejabberd_web_admin.erl:1724 -msgid "Statistics" -msgstr "Estadístiques" - -#: web/ejabberd_web_admin.erl:653 web/ejabberd_web_admin.erl:912 -#: web/ejabberd_web_admin.erl:918 -msgid "Users" -msgstr "Usuaris" - -#: web/ejabberd_web_admin.erl:655 web/ejabberd_web_admin.erl:1416 -msgid "Last Activity" -msgstr "Última activitat" - -#: web/ejabberd_web_admin.erl:752 web/ejabberd_web_admin.erl:854 +#: web/ejabberd_web_admin.erl:858 web/ejabberd_web_admin.erl:962 msgid "Raw" msgstr "en format text" -#: web/ejabberd_web_admin.erl:888 +#: web/ejabberd_web_admin.erl:997 msgid "~s access rule configuration" msgstr "Configuració de les Regles d'Accés ~s" -#: web/ejabberd_web_admin.erl:905 +#: web/ejabberd_web_admin.erl:1015 msgid "ejabberd virtual hosts" msgstr "Hosts virtuals del ejabberd" -#: web/ejabberd_web_admin.erl:944 +#: web/ejabberd_web_admin.erl:1023 web/ejabberd_web_admin.erl:1030 +msgid "Users" +msgstr "Usuaris" + +#: web/ejabberd_web_admin.erl:1058 msgid "Users Last Activity" msgstr "Última activitat d'usuari" -#: web/ejabberd_web_admin.erl:946 +#: web/ejabberd_web_admin.erl:1060 msgid "Period: " msgstr "Període: " -#: web/ejabberd_web_admin.erl:956 +#: web/ejabberd_web_admin.erl:1070 msgid "Last month" msgstr "Últim mes" -#: web/ejabberd_web_admin.erl:957 +#: web/ejabberd_web_admin.erl:1071 msgid "Last year" msgstr "Últim any" -#: web/ejabberd_web_admin.erl:958 +#: web/ejabberd_web_admin.erl:1072 msgid "All activity" msgstr "Tota l'activitat" -#: web/ejabberd_web_admin.erl:960 +#: web/ejabberd_web_admin.erl:1074 msgid "Show Ordinary Table" msgstr "Mostrar Taula Ordinaria" -#: web/ejabberd_web_admin.erl:962 +#: web/ejabberd_web_admin.erl:1076 msgid "Show Integral Table" msgstr "Mostrar Taula Integral" -#: web/ejabberd_web_admin.erl:981 +#: web/ejabberd_web_admin.erl:1085 web/ejabberd_web_admin.erl:1865 +msgid "Statistics" +msgstr "Estadístiques" + +#: web/ejabberd_web_admin.erl:1097 #, fuzzy msgid "Not Found" msgstr "Node no trobat" -#: web/ejabberd_web_admin.erl:996 +#: web/ejabberd_web_admin.erl:1114 msgid "Node not found" msgstr "Node no trobat" -#: web/ejabberd_web_admin.erl:1306 +#: web/ejabberd_web_admin.erl:1441 msgid "Host" msgstr "Host" -#: web/ejabberd_web_admin.erl:1307 +#: web/ejabberd_web_admin.erl:1442 msgid "Registered Users" msgstr "Usuaris registrats" -#: web/ejabberd_web_admin.erl:1415 +#: web/ejabberd_web_admin.erl:1552 msgid "Offline Messages" msgstr "Missatges offline" -#: web/ejabberd_web_admin.erl:1472 web/ejabberd_web_admin.erl:1488 +#: web/ejabberd_web_admin.erl:1553 +msgid "Last Activity" +msgstr "Última activitat" + +#: web/ejabberd_web_admin.erl:1611 web/ejabberd_web_admin.erl:1627 msgid "Registered Users:" msgstr "Usuaris registrats:" -#: web/ejabberd_web_admin.erl:1474 web/ejabberd_web_admin.erl:1490 -#: web/ejabberd_web_admin.erl:1935 +#: web/ejabberd_web_admin.erl:1613 web/ejabberd_web_admin.erl:1629 +#: web/ejabberd_web_admin.erl:2113 msgid "Online Users:" msgstr "Usuaris en línia:" -#: web/ejabberd_web_admin.erl:1476 +#: web/ejabberd_web_admin.erl:1615 msgid "Outgoing s2s Connections:" msgstr "Connexions d'eixida s2s" -#: web/ejabberd_web_admin.erl:1478 +#: web/ejabberd_web_admin.erl:1617 msgid "Outgoing s2s Servers:" msgstr "Servidors d'eixida de s2s" -#: web/ejabberd_web_admin.erl:1543 +#: web/ejabberd_web_admin.erl:1682 msgid "Change Password" msgstr "Canviar password" -#: web/ejabberd_web_admin.erl:1546 +#: web/ejabberd_web_admin.erl:1685 msgid "User " msgstr "Usuari " -#: web/ejabberd_web_admin.erl:1553 +#: web/ejabberd_web_admin.erl:1692 msgid "Connected Resources:" msgstr "Recursos connectats:" -#: web/ejabberd_web_admin.erl:1554 +#: web/ejabberd_web_admin.erl:1693 msgid "Password:" msgstr "Password:" -#: web/ejabberd_web_admin.erl:1615 +#: web/ejabberd_web_admin.erl:1754 msgid "No Data" msgstr "No hi ha dades" -#: web/ejabberd_web_admin.erl:1714 web/ejabberd_web_admin.erl:1736 +#: web/ejabberd_web_admin.erl:1832 +msgid "Nodes" +msgstr "Nodes" + +#: web/ejabberd_web_admin.erl:1855 web/ejabberd_web_admin.erl:1877 msgid "Node " msgstr "Node " -#: web/ejabberd_web_admin.erl:1723 +#: web/ejabberd_web_admin.erl:1864 msgid "Listened Ports" msgstr "Ports a l'escolta" -#: web/ejabberd_web_admin.erl:1725 web/ejabberd_web_admin.erl:2003 -#: web/ejabberd_web_admin.erl:2164 +#: web/ejabberd_web_admin.erl:1866 web/ejabberd_web_admin.erl:2181 +#: web/ejabberd_web_admin.erl:2369 msgid "Update" msgstr "Actualitzar" -#: web/ejabberd_web_admin.erl:1728 web/ejabberd_web_admin.erl:2268 +#: web/ejabberd_web_admin.erl:1869 web/ejabberd_web_admin.erl:2490 msgid "Restart" msgstr "Reiniciar" -#: web/ejabberd_web_admin.erl:1730 web/ejabberd_web_admin.erl:2270 +#: web/ejabberd_web_admin.erl:1871 web/ejabberd_web_admin.erl:2492 msgid "Stop" msgstr "Detindre" -#: web/ejabberd_web_admin.erl:1744 +#: web/ejabberd_web_admin.erl:1885 msgid "RPC Call Error" msgstr "Error de cridada RPC" -#: web/ejabberd_web_admin.erl:1785 +#: web/ejabberd_web_admin.erl:1926 msgid "Database Tables at " msgstr "Taules de la base de dades en " -#: web/ejabberd_web_admin.erl:1792 +#: web/ejabberd_web_admin.erl:1933 msgid "Storage Type" msgstr "Tipus d'emmagatzematge" -#: web/ejabberd_web_admin.erl:1793 +#: web/ejabberd_web_admin.erl:1934 msgid "Elements" msgstr "" -#: web/ejabberd_web_admin.erl:1794 +#: web/ejabberd_web_admin.erl:1935 msgid "Memory" msgstr "Memòria" -#: web/ejabberd_web_admin.erl:1811 web/ejabberd_web_admin.erl:1880 +#: web/ejabberd_web_admin.erl:1953 web/ejabberd_web_admin.erl:2058 msgid "Error" msgstr "" -#: web/ejabberd_web_admin.erl:1813 +#: web/ejabberd_web_admin.erl:1955 msgid "Backup of " msgstr "Còpia de seguretat de " -#: web/ejabberd_web_admin.erl:1815 +#: web/ejabberd_web_admin.erl:1957 #, fuzzy msgid "" "Please note that these options will only backup the builtin Mnesia database. " @@ -1425,120 +1488,158 @@ msgstr "" "Mnesia. Si estàs utilitzant el mòdul d'ODBC també deus de fer una còpia de " "seguretat de la base de dades de SQL a part." -#: web/ejabberd_web_admin.erl:1820 +#: web/ejabberd_web_admin.erl:1962 msgid "Store binary backup:" msgstr "Guardar una còpia de seguretat binària:" -#: web/ejabberd_web_admin.erl:1824 web/ejabberd_web_admin.erl:1831 -#: web/ejabberd_web_admin.erl:1839 web/ejabberd_web_admin.erl:1846 -#: web/ejabberd_web_admin.erl:1853 +#: web/ejabberd_web_admin.erl:1966 web/ejabberd_web_admin.erl:1973 +#: web/ejabberd_web_admin.erl:1981 web/ejabberd_web_admin.erl:1988 +#: web/ejabberd_web_admin.erl:1995 web/ejabberd_web_admin.erl:2002 +#: web/ejabberd_web_admin.erl:2009 web/ejabberd_web_admin.erl:2017 +#: web/ejabberd_web_admin.erl:2024 web/ejabberd_web_admin.erl:2031 msgid "OK" msgstr "Acceptar" -#: web/ejabberd_web_admin.erl:1827 +#: web/ejabberd_web_admin.erl:1969 msgid "Restore binary backup immediately:" msgstr "Restaurar una còpia de seguretat binària ara mateix." -#: web/ejabberd_web_admin.erl:1835 +#: web/ejabberd_web_admin.erl:1977 msgid "" "Restore binary backup after next ejabberd restart (requires less memory):" msgstr "" "Restaurar una còpia de seguretat binària després de reiniciar el ejabberd " "(requereix menys memòria:" -#: web/ejabberd_web_admin.erl:1842 +#: web/ejabberd_web_admin.erl:1984 msgid "Store plain text backup:" msgstr "Guardar una còpia de seguretat en format de text pla:" -#: web/ejabberd_web_admin.erl:1849 +#: web/ejabberd_web_admin.erl:1991 msgid "Restore plain text backup immediately:" msgstr "Restaurar una còpia de seguretat en format de text pla ara mateix:" -#: web/ejabberd_web_admin.erl:1875 +#: web/ejabberd_web_admin.erl:1998 +msgid "Import users data from a PIEFXIS file (XEP-0277):" +msgstr "" + +#: web/ejabberd_web_admin.erl:2005 +msgid "Export data of all users in the server to PIEFXIS files (XEP-0277):" +msgstr "" + +#: web/ejabberd_web_admin.erl:2012 +msgid "Export data of users in a host to PIEFXIS files (XEP-0277):" +msgstr "" + +#: web/ejabberd_web_admin.erl:2020 +#, fuzzy +msgid "Import user data from jabberd14 spool file:" +msgstr "Importar usuaris de jabberd14" + +#: web/ejabberd_web_admin.erl:2027 +#, fuzzy +msgid "Import users data from jabberd14 spool directory:" +msgstr "Importar usuaris de jabberd14" + +#: web/ejabberd_web_admin.erl:2053 msgid "Listened Ports at " msgstr "Ports a la escolta en " -#: web/ejabberd_web_admin.erl:1900 +#: web/ejabberd_web_admin.erl:2078 msgid "Modules at " msgstr "Mòduls en " -#: web/ejabberd_web_admin.erl:1926 +#: web/ejabberd_web_admin.erl:2104 msgid "Statistics of ~p" msgstr "Estadístiques de ~p" -#: web/ejabberd_web_admin.erl:1929 +#: web/ejabberd_web_admin.erl:2107 msgid "Uptime:" msgstr "Temps en marxa" -#: web/ejabberd_web_admin.erl:1932 +#: web/ejabberd_web_admin.erl:2110 msgid "CPU Time:" msgstr "Temps de CPU" -#: web/ejabberd_web_admin.erl:1938 +#: web/ejabberd_web_admin.erl:2116 msgid "Transactions Committed:" msgstr "Transaccions Realitzades:" -#: web/ejabberd_web_admin.erl:1941 +#: web/ejabberd_web_admin.erl:2119 msgid "Transactions Aborted:" msgstr "Transaccions Avortades" -#: web/ejabberd_web_admin.erl:1944 +#: web/ejabberd_web_admin.erl:2122 msgid "Transactions Restarted:" msgstr "Transaccions reiniciades" -#: web/ejabberd_web_admin.erl:1947 +#: web/ejabberd_web_admin.erl:2125 msgid "Transactions Logged:" msgstr "Transaccions registrades" -#: web/ejabberd_web_admin.erl:1989 +#: web/ejabberd_web_admin.erl:2167 msgid "Update " msgstr "Actualitzar" -#: web/ejabberd_web_admin.erl:1997 +#: web/ejabberd_web_admin.erl:2175 msgid "Update plan" msgstr "Pla d'actualització" -#: web/ejabberd_web_admin.erl:1998 +#: web/ejabberd_web_admin.erl:2176 #, fuzzy msgid "Modified modules" msgstr "Mòduls actualitzats" -#: web/ejabberd_web_admin.erl:1999 +#: web/ejabberd_web_admin.erl:2177 msgid "Update script" msgstr "Script d'actualització" -#: web/ejabberd_web_admin.erl:2000 +#: web/ejabberd_web_admin.erl:2178 msgid "Low level update script" msgstr "Script d'actualització de baix nivell" -#: web/ejabberd_web_admin.erl:2001 +#: web/ejabberd_web_admin.erl:2179 msgid "Script check" msgstr "Comprovar script" -#: web/ejabberd_web_admin.erl:2144 +#: web/ejabberd_web_admin.erl:2347 msgid "Port" msgstr "Port" -#: web/ejabberd_web_admin.erl:2145 +#: web/ejabberd_web_admin.erl:2348 msgid "IP" msgstr "" -#: web/ejabberd_web_admin.erl:2146 web/ejabberd_web_admin.erl:2255 +#: web/ejabberd_web_admin.erl:2349 +#, fuzzy +msgid "Protocol" +msgstr "Port" + +#: web/ejabberd_web_admin.erl:2350 web/ejabberd_web_admin.erl:2477 msgid "Module" msgstr "Mòdul" -#: web/ejabberd_web_admin.erl:2147 web/ejabberd_web_admin.erl:2256 +#: web/ejabberd_web_admin.erl:2351 web/ejabberd_web_admin.erl:2478 msgid "Options" msgstr "Opcions" -#: web/ejabberd_web_admin.erl:2166 +#: web/ejabberd_web_admin.erl:2371 msgid "Delete" msgstr "Eliminar" -#: web/ejabberd_web_admin.erl:2278 +#: web/ejabberd_web_admin.erl:2500 msgid "Start" msgstr "Iniciar" +#~ msgid "Encodings" +#~ msgstr "Codificacions" + +#~ msgid "(Raw)" +#~ msgstr "(en format text)" + +#~ msgid "Virtual Hosts" +#~ msgstr "Hosts Virtuals" + #~ msgid "Specified nickname is already registered" #~ msgstr "El Nickname especificat ja està registrat, busca-te'n un altre" src/msgs/ca.po @@ -73,7 +73,6 @@ {"ejabberd Web Admin","Webová administrace ejabberd"}. {"Email","E-mail"}. {"Enable logging","Zaznamenávat konverzace"}. -{"Encodings","Kódování"}. {"End User Session","Ukončit sezení uživatele"}. {"Enter list of {Module, [Options]}","Vložte seznam modulů {Modul, [Parametry]}"}. {"Enter nickname you want to register","Zadejte přezdívku, kterou chcete zaregistrovat"}. @@ -81,9 +80,7 @@ {"Enter path to jabberd14 spool dir","Zadejte cestu k jabberd14 spool adresáři"}. {"Enter path to jabberd14 spool file","Zadejte cestu k spool souboru jabberd14"}. {"Enter path to text file","Zadajte cestu k textovému souboru"}. -{"Enter username and encodings you wish to use for connecting to IRC servers","Vložte jméno uživatele a kódování, které chcete používat při připojení na IRC server"}. {"Erlang Jabber Server","Erlang Jabber Server"}. -{"Example: [{\"irc.lucky.net\", \"koi8-r\"}, {\"vendetta.fef.net\", \"iso8859-1\"}].","Příklad: [{\"irc.freenode.net\",\"utf-8\"}, {\"irc.freenode.net\", \"iso8859-2\"}]."}. {"Family Name","Příjmení: "}. {"February",". února"}. {"Fill in fields to search for any matching Jabber User","Vyplňte políčka pro vyhledání uživatele Jabberu"}. @@ -106,7 +103,6 @@ {"has been kicked","byl(a) vyhozen(a) z místnosti"}. {" has set the subject to: "," změnil(a) téma na: "}. {"Host","Hostitel"}. -{"If you want to specify different encodings for IRC servers, fill this list with values in format '{\"irc server\", \"encoding\"}'. By default this service use \"~s\" encoding.","Pokud chcete zadat jiné kódování pro IRC servery, vyplňte seznam s hodnotami ve formátu '{\"irc server\",\"encoding\"}'. Předvolené kódování pro tuto službu je \"~s\"."}. {"Import Directory","Import adresáře"}. {"Import File","Import souboru"}. {"Import User from File at ","Importovat uživatele ze souboru na "}. @@ -218,7 +214,6 @@ {"Queries to the conference members are not allowed in this room","Požadavky (queries) na členy konference nejsou v této místnosti povolené"}. {"RAM and disc copy","Kopie RAM a disku"}. {"RAM copy","Kopie RAM"}. -{"(Raw)","(Zdroj)"}. {"Raw","Zdroj"}. {"Really delete message of the day?","Skutečně smazat zprávu dne?"}. {"Recipient is not in the conference room","Příjemce se nenachází v konferenční místnosti"}. @@ -315,7 +310,6 @@ {"User","Uživatel: "}. {"Validate","Ověřit"}. {"vCard User Search","Hledání uživatelů podle vizitek"}. -{"Virtual Hosts","Virtuální hostitelé"}. {"Visitors are not allowed to change their nicknames in this room","Návštěvníkům této místnosti je zakázáno měnit přezdívku"}. {"Visitors are not allowed to send messages to all occupants","Návštevníci nemají povoleno zasílat zprávy všem přihlášeným do konference"}. {"Wednesday","Středa"}. src/msgs/cs.msg @@ -8,28 +8,28 @@ msgstr "" "X-Language: Czech (čeština)\n" "X-Additional-Translator: Milos Svasek [DuxforD] from openheads.net\n" -#: ejabberd_c2s.erl:358 ejabberd_c2s.erl:662 +#: ejabberd_c2s.erl:364 ejabberd_c2s.erl:668 msgid "Use of STARTTLS required" msgstr "Je vyžadováno STARTTLS." -#: ejabberd_c2s.erl:442 +#: ejabberd_c2s.erl:448 msgid "No resource provided" msgstr "Nebyl poskytnut žádný zdroj" -#: ejabberd_c2s.erl:1067 +#: ejabberd_c2s.erl:1073 msgid "Replaced by new connection" msgstr "Nahrazeno novým spojením" -#: ejabberd_captcha.erl:74 ejabberd_captcha.erl:106 +#: ejabberd_captcha.erl:93 ejabberd_captcha.erl:125 #, fuzzy msgid "Enter the text you see" msgstr "Zadajte cestu k textovému souboru" -#: ejabberd_captcha.erl:78 +#: ejabberd_captcha.erl:97 msgid "Your messages to ~s are being blocked. To unblock them, visit ~s" msgstr "" -#: ejabberd_captcha.erl:212 +#: ejabberd_captcha.erl:235 msgid "The captcha is valid." msgstr "" @@ -110,7 +110,7 @@ msgstr "Smazat zprávu dne na všech hostitelích" msgid "Configuration" msgstr "Konfigurace" -#: mod_configure.erl:125 mod_configure.erl:544 web/ejabberd_web_admin.erl:1721 +#: mod_configure.erl:125 mod_configure.erl:544 web/ejabberd_web_admin.erl:1862 msgid "Database" msgstr "Databáze" @@ -122,7 +122,7 @@ msgstr "Spustit moduly" msgid "Stop Modules" msgstr "Zastavit moduly" -#: mod_configure.erl:131 mod_configure.erl:572 web/ejabberd_web_admin.erl:1722 +#: mod_configure.erl:131 mod_configure.erl:572 web/ejabberd_web_admin.erl:1863 msgid "Backup" msgstr "Zálohovat" @@ -151,7 +151,7 @@ msgid "Shut Down Service" msgstr "Vypnout službu" #: mod_configure.erl:145 mod_configure.erl:486 mod_configure.erl:1165 -#: web/ejabberd_web_admin.erl:1371 +#: web/ejabberd_web_admin.erl:1508 msgid "Add User" msgstr "Přidat uživatele" @@ -188,15 +188,13 @@ msgstr "Získat počet registrovaných uživatelů" msgid "Get Number of Online Users" msgstr "Získat počet online uživatelů" -#: mod_configure.erl:163 mod_configure.erl:477 web/ejabberd_web_admin.erl:631 -#: web/ejabberd_web_admin.erl:649 web/ejabberd_web_admin.erl:706 -#: web/ejabberd_web_admin.erl:746 +#: mod_configure.erl:163 mod_configure.erl:477 web/ejabberd_web_admin.erl:811 +#: web/ejabberd_web_admin.erl:852 msgid "Access Control Lists" msgstr "Seznamy přístupových práv (ACL)" -#: mod_configure.erl:165 mod_configure.erl:478 web/ejabberd_web_admin.erl:633 -#: web/ejabberd_web_admin.erl:651 web/ejabberd_web_admin.erl:813 -#: web/ejabberd_web_admin.erl:848 +#: mod_configure.erl:165 mod_configure.erl:478 web/ejabberd_web_admin.erl:920 +#: web/ejabberd_web_admin.erl:956 msgid "Access Rules" msgstr "Pravidla přístupů" @@ -204,8 +202,8 @@ msgstr "Pravidla přístupů" msgid "User Management" msgstr "Správa uživatelů" -#: mod_configure.erl:468 web/ejabberd_web_admin.erl:654 -#: web/ejabberd_web_admin.erl:925 web/ejabberd_web_admin.erl:1308 +#: mod_configure.erl:468 web/ejabberd_web_admin.erl:1038 +#: web/ejabberd_web_admin.erl:1443 msgid "Online Users" msgstr "Online uživatelé" @@ -217,15 +215,15 @@ msgstr "Všichni uživatelé" msgid "Outgoing s2s Connections" msgstr "Odchozí s2s spojení" -#: mod_configure.erl:471 web/ejabberd_web_admin.erl:1692 +#: mod_configure.erl:471 web/ejabberd_web_admin.erl:1833 msgid "Running Nodes" msgstr "Běžící uzly" -#: mod_configure.erl:472 web/ejabberd_web_admin.erl:1694 +#: mod_configure.erl:472 web/ejabberd_web_admin.erl:1835 msgid "Stopped Nodes" msgstr "Zastavené uzly" -#: mod_configure.erl:545 mod_configure.erl:555 web/ejabberd_web_admin.erl:1738 +#: mod_configure.erl:545 mod_configure.erl:555 web/ejabberd_web_admin.erl:1879 msgid "Modules" msgstr "Moduly" @@ -357,14 +355,14 @@ msgstr "Pravidla přístupů" #: mod_configure.erl:1168 mod_configure.erl:1190 mod_configure.erl:1202 #: mod_configure.erl:1214 mod_configure.erl:1226 mod_configure.erl:1243 #: mod_configure.erl:1255 mod_configure.erl:1620 mod_configure.erl:1670 -#: mod_configure.erl:1691 mod_roster.erl:822 mod_roster_odbc.erl:922 -#: mod_vcard.erl:462 mod_vcard_ldap.erl:546 mod_vcard_odbc.erl:437 +#: mod_configure.erl:1691 mod_roster.erl:948 mod_roster_odbc.erl:1049 +#: mod_vcard.erl:465 mod_vcard_ldap.erl:550 mod_vcard_odbc.erl:440 msgid "Jabber ID" msgstr "Jabber ID" #: mod_configure.erl:1173 mod_configure.erl:1231 mod_configure.erl:1621 -#: mod_configure.erl:1833 mod_muc/mod_muc_room.erl:2801 -#: web/ejabberd_web_admin.erl:1364 +#: mod_configure.erl:1833 mod_muc/mod_muc_room.erl:2849 +#: web/ejabberd_web_admin.erl:1501 msgid "Password" msgstr "Heslo" @@ -380,11 +378,11 @@ msgstr "Počet registrovaných uživatelů" msgid "Number of online users" msgstr "Počet online uživatelů" -#: mod_configure.erl:1652 web/ejabberd_web_admin.erl:1430 +#: mod_configure.erl:1652 web/ejabberd_web_admin.erl:1567 msgid "Never" msgstr "Nikdy" -#: mod_configure.erl:1666 web/ejabberd_web_admin.erl:1444 +#: mod_configure.erl:1666 web/ejabberd_web_admin.erl:1581 msgid "Online" msgstr "Online" @@ -416,233 +414,301 @@ msgstr "Akce aplikovaná na uživatele" msgid "Edit Properties" msgstr "Upravit vlastnosti" -#: mod_configure.erl:1830 web/ejabberd_web_admin.erl:1556 +#: mod_configure.erl:1830 web/ejabberd_web_admin.erl:1695 msgid "Remove User" msgstr "Odstranit uživatele" -#: mod_irc/mod_irc.erl:198 mod_muc/mod_muc.erl:335 +#: mod_irc/mod_irc.erl:201 mod_muc/mod_muc.erl:335 msgid "Access denied by service policy" msgstr "Přístup byl zamítnut nastavením služby" -#: mod_irc/mod_irc.erl:311 +#: mod_irc/mod_irc.erl:400 msgid "IRC Transport" msgstr "IRC transport" -#: mod_irc/mod_irc.erl:323 +#: mod_irc/mod_irc.erl:427 msgid "ejabberd IRC module" msgstr "Ejabberd IRC modul" -#: mod_irc/mod_irc.erl:441 +#: mod_irc/mod_irc.erl:557 msgid "You need an x:data capable client to configure mod_irc settings" msgstr "Pro konfiguraci mod_irc potřebujete klienta podporujícího x:data" -#: mod_irc/mod_irc.erl:448 +#: mod_irc/mod_irc.erl:564 msgid "Registration in mod_irc for " msgstr "Registrace do mod_irc na " -#: mod_irc/mod_irc.erl:453 +#: mod_irc/mod_irc.erl:569 +#, fuzzy msgid "" -"Enter username and encodings you wish to use for connecting to IRC servers" +"Enter username, encodings, ports and passwords you wish to use for " +"connecting to IRC servers" msgstr "" "Vložte jméno uživatele a kódování, které chcete používat při připojení na " "IRC server" -#: mod_irc/mod_irc.erl:458 +#: mod_irc/mod_irc.erl:574 msgid "IRC Username" msgstr "IRC přezdívka" -#: mod_irc/mod_irc.erl:468 +#: mod_irc/mod_irc.erl:584 +#, fuzzy msgid "" -"If you want to specify different encodings for IRC servers, fill this list " -"with values in format '{\"irc server\", \"encoding\"}'. By default this " -"service use \"~s\" encoding." +"If you want to specify different ports, passwords, encodings for IRC " +"servers, fill this list with values in format '{\"irc server\", \"encoding" +"\", port, \"password\"}'. By default this service use \"~s\" encoding, port " +"~p, empty password." msgstr "" "Pokud chcete zadat jiné kódování pro IRC servery, vyplňte seznam s hodnotami " "ve formátu '{\"irc server\",\"encoding\"}'. Předvolené kódování pro tuto " "službu je \"~s\"." -#: mod_irc/mod_irc.erl:478 +#: mod_irc/mod_irc.erl:596 +#, fuzzy msgid "" -"Example: [{\"irc.lucky.net\", \"koi8-r\"}, {\"vendetta.fef.net\", \"iso8859-1" -"\"}]." +"Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef." +"net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}]." msgstr "" "Příklad: [{\"irc.freenode.net\",\"utf-8\"}, {\"irc.freenode.net\", \"iso8859-" "2\"}]." -#: mod_irc/mod_irc.erl:483 -msgid "Encodings" -msgstr "Kódování" +#: mod_irc/mod_irc.erl:601 +msgid "Connections parameters" +msgstr "" + +#: mod_irc/mod_irc.erl:711 +msgid "Join IRC channel" +msgstr "" + +#: mod_irc/mod_irc.erl:715 +msgid "IRC channel (don't put the first #)" +msgstr "" + +#: mod_irc/mod_irc.erl:720 +#, fuzzy +msgid "IRC server" +msgstr "IRC přezdívka" + +#: mod_irc/mod_irc.erl:753 mod_irc/mod_irc.erl:757 +msgid "Join the IRC channel here." +msgstr "" + +#: mod_irc/mod_irc.erl:761 +msgid "Join the IRC channel in this Jabber ID: ~s" +msgstr "" + +#: mod_irc/mod_irc.erl:846 +msgid "IRC settings" +msgstr "" + +#: mod_irc/mod_irc.erl:851 +#, fuzzy +msgid "" +"Enter username and encodings you wish to use for connecting to IRC servers. " +"Press 'Next' to get more fields to fill in. Press 'Complete' to save " +"settings." +msgstr "" +"Vložte jméno uživatele a kódování, které chcete používat při připojení na " +"IRC server" -#: mod_muc/mod_muc.erl:433 +#: mod_irc/mod_irc.erl:857 +#, fuzzy +msgid "IRC username" +msgstr "IRC přezdívka" + +#: mod_irc/mod_irc.erl:906 +#, fuzzy +msgid "Password ~b" +msgstr "Heslo" + +#: mod_irc/mod_irc.erl:911 +#, fuzzy +msgid "Port ~b" +msgstr "Port" + +#: mod_irc/mod_irc.erl:916 +msgid "Encoding for server ~b" +msgstr "" + +#: mod_irc/mod_irc.erl:925 +msgid "Server ~b" +msgstr "" + +#: mod_muc/mod_muc.erl:437 msgid "Only service administrators are allowed to send service messages" msgstr "Pouze správci služby mají povolené odesílání servisních zpráv" -#: mod_muc/mod_muc.erl:478 +#: mod_muc/mod_muc.erl:482 msgid "Room creation is denied by service policy" msgstr "Pravidla služby nepovolují vytvořit místnost" -#: mod_muc/mod_muc.erl:485 +#: mod_muc/mod_muc.erl:489 msgid "Conference room does not exist" msgstr "Konferenční místnost neexistuje" -#: mod_muc/mod_muc.erl:549 +#: mod_muc/mod_muc.erl:553 msgid "Chatrooms" msgstr "Konference" -#: mod_muc/mod_muc.erl:668 +#: mod_muc/mod_muc.erl:672 msgid "You need an x:data capable client to register nickname" msgstr "K registraci přezdívky potřebujete klienta podporujícího x:data" -#: mod_muc/mod_muc.erl:674 +#: mod_muc/mod_muc.erl:678 msgid "Nickname Registration at " msgstr "Registrace prezdívky na " -#: mod_muc/mod_muc.erl:678 +#: mod_muc/mod_muc.erl:682 msgid "Enter nickname you want to register" msgstr "Zadejte přezdívku, kterou chcete zaregistrovat" -#: mod_muc/mod_muc.erl:679 mod_roster.erl:823 mod_roster_odbc.erl:923 -#: mod_vcard.erl:357 mod_vcard.erl:467 mod_vcard_odbc.erl:334 -#: mod_vcard_odbc.erl:442 +#: mod_muc/mod_muc.erl:683 mod_roster.erl:949 mod_roster_odbc.erl:1050 +#: mod_vcard.erl:357 mod_vcard.erl:470 mod_vcard_odbc.erl:334 +#: mod_vcard_odbc.erl:445 msgid "Nickname" msgstr "Prezdívka" -#: mod_muc/mod_muc.erl:718 mod_muc/mod_muc_room.erl:924 -#: mod_muc/mod_muc_room.erl:1511 +#: mod_muc/mod_muc.erl:722 mod_muc/mod_muc_room.erl:926 +#: mod_muc/mod_muc_room.erl:1513 #, fuzzy msgid "That nickname is registered by another person" msgstr "Přezdívka je zaregistrována jinou osobou" -#: mod_muc/mod_muc.erl:742 +#: mod_muc/mod_muc.erl:748 msgid "You must fill in field \"Nickname\" in the form" msgstr "Musíte vyplnit políčko \"Přezdívka\" ve formuláři" -#: mod_muc/mod_muc.erl:764 +#: mod_muc/mod_muc.erl:768 msgid "ejabberd MUC module" msgstr "Ejabberd MUC modul" -#: mod_muc/mod_muc_log.erl:364 +#: mod_muc/mod_muc_log.erl:371 mod_muc/mod_muc_log.erl:378 msgid "Chatroom configuration modified" msgstr "Nastavení diskuzní místnosti bylo změněno" -#: mod_muc/mod_muc_log.erl:367 +#: mod_muc/mod_muc_log.erl:381 msgid "joins the room" msgstr "vstoupil(a) do místnosti" -#: mod_muc/mod_muc_log.erl:370 mod_muc/mod_muc_log.erl:373 +#: mod_muc/mod_muc_log.erl:384 mod_muc/mod_muc_log.erl:387 msgid "leaves the room" msgstr "opustil(a) místnost" -#: mod_muc/mod_muc_log.erl:376 mod_muc/mod_muc_log.erl:379 +#: mod_muc/mod_muc_log.erl:390 mod_muc/mod_muc_log.erl:393 msgid "has been banned" msgstr "byl(a) zablokován(a)" -#: mod_muc/mod_muc_log.erl:382 mod_muc/mod_muc_log.erl:385 +#: mod_muc/mod_muc_log.erl:396 mod_muc/mod_muc_log.erl:399 msgid "has been kicked" msgstr "byl(a) vyhozen(a) z místnosti" -#: mod_muc/mod_muc_log.erl:388 +#: mod_muc/mod_muc_log.erl:402 msgid "has been kicked because of an affiliation change" msgstr "byl(a) vyhozen(a) kvůli změně přiřazení" -#: mod_muc/mod_muc_log.erl:391 +#: mod_muc/mod_muc_log.erl:405 msgid "has been kicked because the room has been changed to members-only" msgstr "byl(a) vyhozen(a), protože mísnost je nyní pouze pro členy" -#: mod_muc/mod_muc_log.erl:394 +#: mod_muc/mod_muc_log.erl:408 msgid "has been kicked because of a system shutdown" msgstr "byl(a) vyhozen(a), protože dojde k vypnutí systému" -#: mod_muc/mod_muc_log.erl:397 +#: mod_muc/mod_muc_log.erl:411 msgid "is now known as" msgstr "se přejmenoval(a) na" -#: mod_muc/mod_muc_log.erl:400 mod_muc/mod_muc_log.erl:661 -#: mod_muc/mod_muc_room.erl:2032 +#: mod_muc/mod_muc_log.erl:414 mod_muc/mod_muc_log.erl:678 +#: mod_muc/mod_muc_room.erl:2040 msgid " has set the subject to: " msgstr " změnil(a) téma na: " -#: mod_muc/mod_muc_log.erl:431 +#: mod_muc/mod_muc_log.erl:448 msgid "Monday" msgstr "Pondělí" -#: mod_muc/mod_muc_log.erl:432 +#: mod_muc/mod_muc_log.erl:449 msgid "Tuesday" msgstr "Úterý" -#: mod_muc/mod_muc_log.erl:433 +#: mod_muc/mod_muc_log.erl:450 msgid "Wednesday" msgstr "Středa" -#: mod_muc/mod_muc_log.erl:434 +#: mod_muc/mod_muc_log.erl:451 msgid "Thursday" msgstr "Čtvrtek" -#: mod_muc/mod_muc_log.erl:435 +#: mod_muc/mod_muc_log.erl:452 msgid "Friday" msgstr "Pátek" -#: mod_muc/mod_muc_log.erl:436 +#: mod_muc/mod_muc_log.erl:453 msgid "Saturday" msgstr "Sobota" -#: mod_muc/mod_muc_log.erl:437 +#: mod_muc/mod_muc_log.erl:454 msgid "Sunday" msgstr "Neděle" -#: mod_muc/mod_muc_log.erl:441 +#: mod_muc/mod_muc_log.erl:458 msgid "January" msgstr ". ledna" -#: mod_muc/mod_muc_log.erl:442 +#: mod_muc/mod_muc_log.erl:459 msgid "February" msgstr ". února" -#: mod_muc/mod_muc_log.erl:443 +#: mod_muc/mod_muc_log.erl:460 msgid "March" msgstr ". března" -#: mod_muc/mod_muc_log.erl:444 +#: mod_muc/mod_muc_log.erl:461 msgid "April" msgstr ". dubna" -#: mod_muc/mod_muc_log.erl:445 +#: mod_muc/mod_muc_log.erl:462 msgid "May" msgstr ". května" -#: mod_muc/mod_muc_log.erl:446 +#: mod_muc/mod_muc_log.erl:463 msgid "June" msgstr ". června" -#: mod_muc/mod_muc_log.erl:447 +#: mod_muc/mod_muc_log.erl:464 msgid "July" msgstr ". července" -#: mod_muc/mod_muc_log.erl:448 +#: mod_muc/mod_muc_log.erl:465 msgid "August" msgstr ". srpna" -#: mod_muc/mod_muc_log.erl:449 +#: mod_muc/mod_muc_log.erl:466 msgid "September" msgstr ". září" -#: mod_muc/mod_muc_log.erl:450 +#: mod_muc/mod_muc_log.erl:467 msgid "October" msgstr ". října" -#: mod_muc/mod_muc_log.erl:451 +#: mod_muc/mod_muc_log.erl:468 msgid "November" msgstr ". listopadu" -#: mod_muc/mod_muc_log.erl:452 +#: mod_muc/mod_muc_log.erl:469 msgid "December" msgstr ". prosince" -#: mod_muc/mod_muc_log.erl:719 +#: mod_muc/mod_muc_log.erl:740 msgid "Room Configuration" msgstr "Nastavení místnosti" -#: mod_muc/mod_muc_log.erl:820 mod_muc/mod_muc_room.erl:2777 +#: mod_muc/mod_muc_log.erl:749 +#, fuzzy +msgid "Room Occupants" +msgstr "Počet účastníků" + +#: mod_muc/mod_muc_log.erl:852 mod_muc/mod_muc_room.erl:2825 msgid "Room title" msgstr "Název místnosti" @@ -679,8 +745,8 @@ msgstr "Není dovoleno odeslání soukromé zprávy typu \"skupinová zpráva\" msgid "Recipient is not in the conference room" msgstr "Příjemce se nenachází v konferenční místnosti" -#: mod_muc/mod_muc_room.erl:448 mod_muc/mod_muc_room.erl:823 -#: mod_muc/mod_muc_room.erl:3388 +#: mod_muc/mod_muc_room.erl:448 mod_muc/mod_muc_room.erl:825 +#: mod_muc/mod_muc_room.erl:3447 msgid "Only occupants are allowed to send messages to the conference" msgstr "Jen členové mají povolené zasílat správy do konference" @@ -697,346 +763,350 @@ msgid "Queries to the conference members are not allowed in this room" msgstr "" "Požadavky (queries) na členy konference nejsou v této místnosti povolené" -#: mod_muc/mod_muc_room.erl:600 +#: mod_muc/mod_muc_room.erl:601 msgid "private, " msgstr "soukromá, " -#: mod_muc/mod_muc_room.erl:799 +#: mod_muc/mod_muc_room.erl:801 #, fuzzy msgid "" "Only moderators and participants are allowed to change the subject in this " "room" msgstr "Jen moderátoři a účastníci mají povoleno měnit téma této místnosti" -#: mod_muc/mod_muc_room.erl:804 +#: mod_muc/mod_muc_room.erl:806 #, fuzzy msgid "Only moderators are allowed to change the subject in this room" msgstr "Jen moderátoři mají povoleno měnit téma místnosti" -#: mod_muc/mod_muc_room.erl:814 +#: mod_muc/mod_muc_room.erl:816 msgid "Visitors are not allowed to send messages to all occupants" msgstr "" "Návštevníci nemají povoleno zasílat zprávy všem přihlášeným do konference" -#: mod_muc/mod_muc_room.erl:882 +#: mod_muc/mod_muc_room.erl:884 msgid "" "This participant is kicked from the room because he sent an error presence" msgstr "Tento účastník byl vyhozen, protože odeslal chybový status" -#: mod_muc/mod_muc_room.erl:900 +#: mod_muc/mod_muc_room.erl:902 msgid "Visitors are not allowed to change their nicknames in this room" msgstr "Návštěvníkům této místnosti je zakázáno měnit přezdívku" -#: mod_muc/mod_muc_room.erl:913 mod_muc/mod_muc_room.erl:1503 +#: mod_muc/mod_muc_room.erl:915 mod_muc/mod_muc_room.erl:1505 #, fuzzy msgid "That nickname is already in use by another occupant" msgstr "Přezdívka je již používána jiným členem" -#: mod_muc/mod_muc_room.erl:1492 +#: mod_muc/mod_muc_room.erl:1494 msgid "You have been banned from this room" msgstr "Byl jste vyloučen z této místnosti" -#: mod_muc/mod_muc_room.erl:1495 +#: mod_muc/mod_muc_room.erl:1497 #, fuzzy msgid "Membership is required to enter this room" msgstr "Pro vstup do místnosti musíte být členem" -#: mod_muc/mod_muc_room.erl:1531 +#: mod_muc/mod_muc_room.erl:1533 msgid "This room is not anonymous" msgstr "Tato místnost není anonymní" -#: mod_muc/mod_muc_room.erl:1557 +#: mod_muc/mod_muc_room.erl:1559 #, fuzzy msgid "A password is required to enter this room" msgstr "Pro vstup do místnosti musíte zadat heslo" -#: mod_muc/mod_muc_room.erl:1579 +#: mod_muc/mod_muc_room.erl:1581 msgid "Unable to generate a captcha" msgstr "" -#: mod_muc/mod_muc_room.erl:1589 +#: mod_muc/mod_muc_room.erl:1591 msgid "Incorrect password" msgstr "Nesprávné heslo" -#: mod_muc/mod_muc_room.erl:2087 +#: mod_muc/mod_muc_room.erl:2095 msgid "Administrator privileges required" msgstr "Jsou potřebná práva administrátora" -#: mod_muc/mod_muc_room.erl:2102 +#: mod_muc/mod_muc_room.erl:2110 msgid "Moderator privileges required" msgstr "Jsou potřebná práva moderátora" -#: mod_muc/mod_muc_room.erl:2257 +#: mod_muc/mod_muc_room.erl:2265 msgid "Jabber ID ~s is invalid" msgstr "Jabber ID ~s je neplatné" -#: mod_muc/mod_muc_room.erl:2271 +#: mod_muc/mod_muc_room.erl:2279 msgid "Nickname ~s does not exist in the room" msgstr "Přezdívka ~s v místnosti neexistuje" -#: mod_muc/mod_muc_room.erl:2297 mod_muc/mod_muc_room.erl:2673 +#: mod_muc/mod_muc_room.erl:2305 mod_muc/mod_muc_room.erl:2683 msgid "Invalid affiliation: ~s" msgstr "Neplatné přiřazení: ~s" -#: mod_muc/mod_muc_room.erl:2354 +#: mod_muc/mod_muc_room.erl:2362 msgid "Invalid role: ~s" msgstr "Neplatná role: ~s" -#: mod_muc/mod_muc_room.erl:2650 mod_muc/mod_muc_room.erl:2686 +#: mod_muc/mod_muc_room.erl:2660 mod_muc/mod_muc_room.erl:2696 msgid "Owner privileges required" msgstr "Jsou vyžadována práva vlastníka" -#: mod_muc/mod_muc_room.erl:2772 +#: mod_muc/mod_muc_room.erl:2820 #, fuzzy msgid "Configuration of room ~s" msgstr "Konfigurace pro " -#: mod_muc/mod_muc_room.erl:2780 mod_muc/mod_muc_room.erl:3187 +#: mod_muc/mod_muc_room.erl:2828 mod_muc/mod_muc_room.erl:3246 #, fuzzy msgid "Room description" msgstr "Popis:" -#: mod_muc/mod_muc_room.erl:2787 +#: mod_muc/mod_muc_room.erl:2835 msgid "Make room persistent" msgstr "Nastavit místnost jako stálou" -#: mod_muc/mod_muc_room.erl:2792 +#: mod_muc/mod_muc_room.erl:2840 msgid "Make room public searchable" msgstr "Nastavit místnost jako veřejnou" -#: mod_muc/mod_muc_room.erl:2795 +#: mod_muc/mod_muc_room.erl:2843 msgid "Make participants list public" msgstr "Nastavit seznam účastníků jako veřejný" -#: mod_muc/mod_muc_room.erl:2798 +#: mod_muc/mod_muc_room.erl:2846 msgid "Make room password protected" msgstr "Chránit místnost heslem" -#: mod_muc/mod_muc_room.erl:2809 +#: mod_muc/mod_muc_room.erl:2857 msgid "Maximum Number of Occupants" msgstr "Počet účastníků" -#: mod_muc/mod_muc_room.erl:2816 +#: mod_muc/mod_muc_room.erl:2864 msgid "No limit" msgstr "Bez limitu" -#: mod_muc/mod_muc_room.erl:2827 +#: mod_muc/mod_muc_room.erl:2875 msgid "Present real Jabber IDs to" msgstr "Odhalovat skutečná Jabber ID" -#: mod_muc/mod_muc_room.erl:2835 +#: mod_muc/mod_muc_room.erl:2883 msgid "moderators only" msgstr "moderátorům" -#: mod_muc/mod_muc_room.erl:2837 +#: mod_muc/mod_muc_room.erl:2885 msgid "anyone" msgstr "každému" -#: mod_muc/mod_muc_room.erl:2839 +#: mod_muc/mod_muc_room.erl:2887 msgid "Make room members-only" msgstr "Nastavit místnost jen pro členy" -#: mod_muc/mod_muc_room.erl:2842 +#: mod_muc/mod_muc_room.erl:2890 msgid "Make room moderated" msgstr "Nastavit místnost jako moderovanou" -#: mod_muc/mod_muc_room.erl:2845 +#: mod_muc/mod_muc_room.erl:2893 msgid "Default users as participants" msgstr "Uživatelé jsou implicitně členy" -#: mod_muc/mod_muc_room.erl:2848 +#: mod_muc/mod_muc_room.erl:2896 #, fuzzy msgid "Allow users to change the subject" msgstr "Povolit uživatelům měnit téma místnosti" -#: mod_muc/mod_muc_room.erl:2851 +#: mod_muc/mod_muc_room.erl:2899 msgid "Allow users to send private messages" msgstr "Povolit uživatelům odesílat soukromé zprávy" -#: mod_muc/mod_muc_room.erl:2854 +#: mod_muc/mod_muc_room.erl:2902 msgid "Allow users to query other users" msgstr "Povolit uživatelům odesílat požadavky (query) ostatním uživatelům" -#: mod_muc/mod_muc_room.erl:2857 +#: mod_muc/mod_muc_room.erl:2905 msgid "Allow users to send invites" msgstr "Povolit uživatelům posílání pozvánek" -#: mod_muc/mod_muc_room.erl:2860 +#: mod_muc/mod_muc_room.erl:2908 msgid "Allow visitors to send status text in presence updates" msgstr "Povolit návštěvníkům posílat stavové zprávy ve statusu" -#: mod_muc/mod_muc_room.erl:2863 +#: mod_muc/mod_muc_room.erl:2911 msgid "Allow visitors to change nickname" msgstr "Povolit návštěvníkům měnit přezdívku" -#: mod_muc/mod_muc_room.erl:2869 +#: mod_muc/mod_muc_room.erl:2917 #, fuzzy msgid "Make room captcha protected" msgstr "Chránit místnost heslem" -#: mod_muc/mod_muc_room.erl:2878 +#: mod_muc/mod_muc_room.erl:2926 msgid "Enable logging" msgstr "Zaznamenávat konverzace" -#: mod_muc/mod_muc_room.erl:2886 +#: mod_muc/mod_muc_room.erl:2934 msgid "You need an x:data capable client to configure room" msgstr "Ke konfiguraci místnosti potřebujete klienta podporujícího x:data" -#: mod_muc/mod_muc_room.erl:3189 +#: mod_muc/mod_muc_room.erl:3248 msgid "Number of occupants" msgstr "Počet účastníků" -#: mod_muc/mod_muc_room.erl:3308 +#: mod_muc/mod_muc_room.erl:3367 msgid "~s invites you to the room ~s" msgstr "~s vás zve do místnosti ~s" -#: mod_muc/mod_muc_room.erl:3317 +#: mod_muc/mod_muc_room.erl:3376 msgid "the password is" msgstr "heslo je" -#: mod_offline.erl:451 mod_offline_odbc.erl:303 +#: mod_offline.erl:509 mod_offline_odbc.erl:352 msgid "" "Your contact offline message queue is full. The message has been discarded." msgstr "Fronta offline zpráv pro váš kontakt je plná. Zpráva byla zahozena." -#: mod_offline.erl:500 mod_offline_odbc.erl:358 +#: mod_offline.erl:558 mod_offline_odbc.erl:407 msgid "~s's Offline Messages Queue" msgstr "Fronta offline zpráv uživatele ~s" -#: mod_offline.erl:503 mod_offline_odbc.erl:361 mod_roster.erl:866 -#: mod_roster_odbc.erl:966 mod_shared_roster.erl:778 mod_shared_roster.erl:879 -#: web/ejabberd_web_admin.erl:708 web/ejabberd_web_admin.erl:748 -#: web/ejabberd_web_admin.erl:815 web/ejabberd_web_admin.erl:850 -#: web/ejabberd_web_admin.erl:890 web/ejabberd_web_admin.erl:1352 -#: web/ejabberd_web_admin.erl:1548 web/ejabberd_web_admin.erl:1716 -#: web/ejabberd_web_admin.erl:1748 web/ejabberd_web_admin.erl:1810 -#: web/ejabberd_web_admin.erl:1878 web/ejabberd_web_admin.erl:1903 -#: web/ejabberd_web_admin.erl:1991 +#: mod_offline.erl:561 mod_offline_odbc.erl:410 mod_roster.erl:992 +#: mod_roster_odbc.erl:1093 mod_shared_roster.erl:778 +#: mod_shared_roster.erl:879 web/ejabberd_web_admin.erl:813 +#: web/ejabberd_web_admin.erl:854 web/ejabberd_web_admin.erl:922 +#: web/ejabberd_web_admin.erl:958 web/ejabberd_web_admin.erl:999 +#: web/ejabberd_web_admin.erl:1489 web/ejabberd_web_admin.erl:1687 +#: web/ejabberd_web_admin.erl:1857 web/ejabberd_web_admin.erl:1889 +#: web/ejabberd_web_admin.erl:1952 web/ejabberd_web_admin.erl:2056 +#: web/ejabberd_web_admin.erl:2081 web/ejabberd_web_admin.erl:2169 msgid "Submitted" msgstr "Odeslané" -#: mod_offline.erl:511 +#: mod_offline.erl:569 msgid "Time" msgstr "Čas" -#: mod_offline.erl:512 +#: mod_offline.erl:570 msgid "From" msgstr "Od" -#: mod_offline.erl:513 +#: mod_offline.erl:571 msgid "To" msgstr "Pro" -#: mod_offline.erl:514 mod_offline_odbc.erl:369 +#: mod_offline.erl:572 mod_offline_odbc.erl:418 msgid "Packet" msgstr "Paket" -#: mod_offline.erl:527 mod_offline_odbc.erl:382 mod_shared_roster.erl:785 -#: web/ejabberd_web_admin.erl:756 web/ejabberd_web_admin.erl:858 +#: mod_offline.erl:585 mod_offline_odbc.erl:431 mod_shared_roster.erl:785 +#: web/ejabberd_web_admin.erl:862 web/ejabberd_web_admin.erl:966 msgid "Delete Selected" msgstr "Smazat vybrané" -#: mod_offline.erl:562 mod_offline_odbc.erl:447 +#: mod_offline.erl:620 mod_offline_odbc.erl:496 msgid "Offline Messages:" msgstr "Offline zprávy" -#: mod_offline.erl:562 mod_offline_odbc.erl:447 +#: mod_offline.erl:620 mod_offline_odbc.erl:496 #, fuzzy msgid "Remove All Offline Messages" msgstr "Offline zprávy" -#: mod_proxy65/mod_proxy65_service.erl:209 +#: mod_proxy65/mod_proxy65_service.erl:213 msgid "ejabberd SOCKS5 Bytestreams module" msgstr "ejabberd SOCKS5 Bytestreams modul" -#: mod_pubsub/mod_pubsub.erl:1022 +#: mod_pubsub/mod_pubsub.erl:1054 mod_pubsub/mod_pubsub_odbc.erl:1053 msgid "Publish-Subscribe" msgstr "Publish-Subscribe" -#: mod_pubsub/mod_pubsub.erl:1118 +#: mod_pubsub/mod_pubsub.erl:1150 mod_pubsub/mod_pubsub_odbc.erl:1150 msgid "ejabberd Publish-Subscribe module" msgstr "ejabberd Publish-Subscribe modul" -#: mod_pubsub/mod_pubsub.erl:1271 +#: mod_pubsub/mod_pubsub.erl:1437 mod_pubsub/mod_pubsub_odbc.erl:1442 msgid "PubSub subscriber request" msgstr "Žádost odběratele PubSub" -#: mod_pubsub/mod_pubsub.erl:1273 +#: mod_pubsub/mod_pubsub.erl:1439 mod_pubsub/mod_pubsub_odbc.erl:1444 msgid "Choose whether to approve this entity's subscription." msgstr "Zvolte, zda chcete schválit odebírání touto entitou" -#: mod_pubsub/mod_pubsub.erl:1279 +#: mod_pubsub/mod_pubsub.erl:1445 mod_pubsub/mod_pubsub_odbc.erl:1450 msgid "Node ID" msgstr "ID uzlu" -#: mod_pubsub/mod_pubsub.erl:1284 +#: mod_pubsub/mod_pubsub.erl:1450 mod_pubsub/mod_pubsub_odbc.erl:1455 msgid "Subscriber Address" msgstr "Adresa odběratele" -#: mod_pubsub/mod_pubsub.erl:1290 +#: mod_pubsub/mod_pubsub.erl:1456 mod_pubsub/mod_pubsub_odbc.erl:1461 msgid "Allow this Jabber ID to subscribe to this pubsub node?" msgstr "Povolit tomuto Jabber ID odebírat tento pubsub uzel?" -#: mod_pubsub/mod_pubsub.erl:3005 +#: mod_pubsub/mod_pubsub.erl:3220 mod_pubsub/mod_pubsub_odbc.erl:3244 msgid "Deliver payloads with event notifications" msgstr "Doručovat náklad s upozorněním na událost" -#: mod_pubsub/mod_pubsub.erl:3006 +#: mod_pubsub/mod_pubsub.erl:3221 mod_pubsub/mod_pubsub_odbc.erl:3245 msgid "Deliver event notifications" msgstr "Doručovat upozornění na události" -#: mod_pubsub/mod_pubsub.erl:3007 +#: mod_pubsub/mod_pubsub.erl:3222 mod_pubsub/mod_pubsub_odbc.erl:3246 msgid "Notify subscribers when the node configuration changes" msgstr "Upozornit odběratele na změnu nastavení uzlu" -#: mod_pubsub/mod_pubsub.erl:3008 +#: mod_pubsub/mod_pubsub.erl:3223 mod_pubsub/mod_pubsub_odbc.erl:3247 msgid "Notify subscribers when the node is deleted" msgstr "Upozornit odběratele na smazání uzlu" -#: mod_pubsub/mod_pubsub.erl:3009 +#: mod_pubsub/mod_pubsub.erl:3224 mod_pubsub/mod_pubsub_odbc.erl:3248 msgid "Notify subscribers when items are removed from the node" msgstr "Upozornit odběratele na odstranění položek z uzlu" -#: mod_pubsub/mod_pubsub.erl:3010 +#: mod_pubsub/mod_pubsub.erl:3225 mod_pubsub/mod_pubsub_odbc.erl:3249 msgid "Persist items to storage" msgstr "Uložit položky natrvalo do úložiště" -#: mod_pubsub/mod_pubsub.erl:3011 +#: mod_pubsub/mod_pubsub.erl:3226 mod_pubsub/mod_pubsub_odbc.erl:3250 msgid "A friendly name for the node" msgstr "Přívětivé jméno pro uzel" -#: mod_pubsub/mod_pubsub.erl:3012 +#: mod_pubsub/mod_pubsub.erl:3227 mod_pubsub/mod_pubsub_odbc.erl:3251 msgid "Max # of items to persist" msgstr "Maximální počet položek, které je možné natrvalo uložit" -#: mod_pubsub/mod_pubsub.erl:3013 +#: mod_pubsub/mod_pubsub.erl:3228 mod_pubsub/mod_pubsub_odbc.erl:3252 msgid "Whether to allow subscriptions" msgstr "Povolit odebírání" -#: mod_pubsub/mod_pubsub.erl:3014 +#: mod_pubsub/mod_pubsub.erl:3229 mod_pubsub/mod_pubsub_odbc.erl:3253 msgid "Specify the access model" msgstr "Uveďte přístupový model" -#: mod_pubsub/mod_pubsub.erl:3017 +#: mod_pubsub/mod_pubsub.erl:3232 mod_pubsub/mod_pubsub_odbc.erl:3256 msgid "Roster groups allowed to subscribe" msgstr "Skupiny kontaktů, které mohou odebírat" -#: mod_pubsub/mod_pubsub.erl:3018 +#: mod_pubsub/mod_pubsub.erl:3233 mod_pubsub/mod_pubsub_odbc.erl:3257 msgid "Specify the publisher model" msgstr "Specifikovat model pro publikování" -#: mod_pubsub/mod_pubsub.erl:3020 +#: mod_pubsub/mod_pubsub.erl:3235 mod_pubsub/mod_pubsub_odbc.erl:3259 msgid "Max payload size in bytes" msgstr "Maximální náklad v bajtech" -#: mod_pubsub/mod_pubsub.erl:3021 +#: mod_pubsub/mod_pubsub.erl:3236 mod_pubsub/mod_pubsub_odbc.erl:3260 msgid "When to send the last published item" msgstr "Kdy odeslat poslední publikovanou položku" -#: mod_pubsub/mod_pubsub.erl:3023 +#: mod_pubsub/mod_pubsub.erl:3238 mod_pubsub/mod_pubsub_odbc.erl:3262 msgid "Only deliver notifications to available users" msgstr "Doručovat upozornění jen právě přihlášeným uživatelům" +#: mod_pubsub/mod_pubsub.erl:3239 mod_pubsub/mod_pubsub_odbc.erl:3263 +msgid "The collections with which a node is affiliated" +msgstr "" + #: mod_register.erl:190 msgid "Choose a username and password to register with this server" msgstr "Zadejte jméno uživatele a heslo pro registraci na tomto serveru" @@ -1046,51 +1116,51 @@ msgstr "Zadejte jméno uživatele a heslo pro registraci na tomto serveru" msgid "Users are not allowed to register accounts so quickly" msgstr "Je zakázáno registrovat účty v tak rychlém sledu" -#: mod_roster.erl:817 mod_roster_odbc.erl:917 web/ejabberd_web_admin.erl:1514 -#: web/ejabberd_web_admin.erl:1671 web/ejabberd_web_admin.erl:1682 -#: web/ejabberd_web_admin.erl:1962 +#: mod_roster.erl:943 mod_roster_odbc.erl:1044 web/ejabberd_web_admin.erl:1653 +#: web/ejabberd_web_admin.erl:1812 web/ejabberd_web_admin.erl:1823 +#: web/ejabberd_web_admin.erl:2140 msgid "None" msgstr "Nic" -#: mod_roster.erl:824 mod_roster_odbc.erl:924 +#: mod_roster.erl:950 mod_roster_odbc.erl:1051 msgid "Subscription" msgstr "Přihlášení" -#: mod_roster.erl:825 mod_roster_odbc.erl:925 +#: mod_roster.erl:951 mod_roster_odbc.erl:1052 msgid "Pending" msgstr "Čekající" -#: mod_roster.erl:826 mod_roster_odbc.erl:926 +#: mod_roster.erl:952 mod_roster_odbc.erl:1053 msgid "Groups" msgstr "Skupiny" -#: mod_roster.erl:853 mod_roster_odbc.erl:953 +#: mod_roster.erl:979 mod_roster_odbc.erl:1080 msgid "Validate" msgstr "Ověřit" -#: mod_roster.erl:861 mod_roster_odbc.erl:961 +#: mod_roster.erl:987 mod_roster_odbc.erl:1088 msgid "Remove" msgstr "Odstranit" -#: mod_roster.erl:864 mod_roster_odbc.erl:964 +#: mod_roster.erl:990 mod_roster_odbc.erl:1091 msgid "Roster of " msgstr "Seznam kontaktů " -#: mod_roster.erl:867 mod_roster_odbc.erl:967 mod_shared_roster.erl:779 -#: mod_shared_roster.erl:880 web/ejabberd_web_admin.erl:709 -#: web/ejabberd_web_admin.erl:749 web/ejabberd_web_admin.erl:816 -#: web/ejabberd_web_admin.erl:851 web/ejabberd_web_admin.erl:891 -#: web/ejabberd_web_admin.erl:1353 web/ejabberd_web_admin.erl:1549 -#: web/ejabberd_web_admin.erl:1717 web/ejabberd_web_admin.erl:1879 -#: web/ejabberd_web_admin.erl:1904 web/ejabberd_web_admin.erl:1992 +#: mod_roster.erl:993 mod_roster_odbc.erl:1094 mod_shared_roster.erl:779 +#: mod_shared_roster.erl:880 web/ejabberd_web_admin.erl:814 +#: web/ejabberd_web_admin.erl:855 web/ejabberd_web_admin.erl:923 +#: web/ejabberd_web_admin.erl:959 web/ejabberd_web_admin.erl:1000 +#: web/ejabberd_web_admin.erl:1490 web/ejabberd_web_admin.erl:1688 +#: web/ejabberd_web_admin.erl:1858 web/ejabberd_web_admin.erl:2057 +#: web/ejabberd_web_admin.erl:2082 web/ejabberd_web_admin.erl:2170 msgid "Bad format" msgstr "Nesprávný formát" -#: mod_roster.erl:874 mod_roster_odbc.erl:974 +#: mod_roster.erl:1000 mod_roster_odbc.erl:1101 msgid "Add Jabber ID" msgstr "Přidat Jabber ID" -#: mod_roster.erl:973 mod_roster_odbc.erl:1073 +#: mod_roster.erl:1099 mod_roster_odbc.erl:1200 msgid "Roster" msgstr "Seznam kontaktů" @@ -1099,8 +1169,8 @@ msgstr "Seznam kontaktů" msgid "Shared Roster Groups" msgstr "Skupiny pro sdílený seznam kontaktů" -#: mod_shared_roster.erl:772 web/ejabberd_web_admin.erl:1222 -#: web/ejabberd_web_admin.erl:2176 +#: mod_shared_roster.erl:772 web/ejabberd_web_admin.erl:1346 +#: web/ejabberd_web_admin.erl:2382 msgid "Add New" msgstr "Přidat nový" @@ -1124,9 +1194,9 @@ msgstr "Zobrazené skupiny:" msgid "Group " msgstr "Skupina " -#: mod_shared_roster.erl:886 web/ejabberd_web_admin.erl:715 -#: web/ejabberd_web_admin.erl:758 web/ejabberd_web_admin.erl:822 -#: web/ejabberd_web_admin.erl:897 web/ejabberd_web_admin.erl:1802 +#: mod_shared_roster.erl:886 web/ejabberd_web_admin.erl:820 +#: web/ejabberd_web_admin.erl:864 web/ejabberd_web_admin.erl:929 +#: web/ejabberd_web_admin.erl:1006 web/ejabberd_web_admin.erl:1943 msgid "Submit" msgstr "Odeslat" @@ -1134,28 +1204,28 @@ msgstr "Odeslat" msgid "Erlang Jabber Server" msgstr "Erlang Jabber Server" -#: mod_vcard.erl:357 mod_vcard.erl:468 mod_vcard_odbc.erl:334 -#: mod_vcard_odbc.erl:443 +#: mod_vcard.erl:357 mod_vcard.erl:471 mod_vcard_odbc.erl:334 +#: mod_vcard_odbc.erl:446 msgid "Birthday" msgstr "Datum narození: " -#: mod_vcard.erl:357 mod_vcard.erl:470 mod_vcard_odbc.erl:334 -#: mod_vcard_odbc.erl:445 +#: mod_vcard.erl:357 mod_vcard.erl:473 mod_vcard_odbc.erl:334 +#: mod_vcard_odbc.erl:448 msgid "City" msgstr "Město: " -#: mod_vcard.erl:357 mod_vcard.erl:469 mod_vcard_odbc.erl:334 -#: mod_vcard_odbc.erl:444 +#: mod_vcard.erl:357 mod_vcard.erl:472 mod_vcard_odbc.erl:334 +#: mod_vcard_odbc.erl:447 msgid "Country" msgstr "Země: " -#: mod_vcard.erl:357 mod_vcard.erl:471 mod_vcard_odbc.erl:334 -#: mod_vcard_odbc.erl:446 +#: mod_vcard.erl:357 mod_vcard.erl:474 mod_vcard_odbc.erl:334 +#: mod_vcard_odbc.erl:449 msgid "Email" msgstr "E-mail" -#: mod_vcard.erl:357 mod_vcard.erl:466 mod_vcard_odbc.erl:334 -#: mod_vcard_odbc.erl:441 +#: mod_vcard.erl:357 mod_vcard.erl:469 mod_vcard_odbc.erl:334 +#: mod_vcard_odbc.erl:444 msgid "Family Name" msgstr "Příjmení: " @@ -1167,244 +1237,237 @@ msgstr "" "Pro vyhledání uživatele Jabberu vyplňte formulář (přidejte znak * na konec, " "pro vyhledání podřetězce)" -#: mod_vcard.erl:357 mod_vcard.erl:463 mod_vcard_odbc.erl:334 -#: mod_vcard_odbc.erl:438 +#: mod_vcard.erl:357 mod_vcard.erl:466 mod_vcard_odbc.erl:334 +#: mod_vcard_odbc.erl:441 msgid "Full Name" msgstr "Celé jméno: " -#: mod_vcard.erl:357 mod_vcard.erl:465 mod_vcard_odbc.erl:334 -#: mod_vcard_odbc.erl:440 +#: mod_vcard.erl:357 mod_vcard.erl:468 mod_vcard_odbc.erl:334 +#: mod_vcard_odbc.erl:443 msgid "Middle Name" msgstr "Druhé jméno: " -#: mod_vcard.erl:357 mod_vcard.erl:464 mod_vcard_odbc.erl:334 -#: mod_vcard_odbc.erl:439 web/ejabberd_web_admin.erl:1791 +#: mod_vcard.erl:357 mod_vcard.erl:467 mod_vcard_odbc.erl:334 +#: mod_vcard_odbc.erl:442 web/ejabberd_web_admin.erl:1932 msgid "Name" msgstr "Jméno" -#: mod_vcard.erl:357 mod_vcard.erl:472 mod_vcard_odbc.erl:334 -#: mod_vcard_odbc.erl:447 +#: mod_vcard.erl:357 mod_vcard.erl:475 mod_vcard_odbc.erl:334 +#: mod_vcard_odbc.erl:450 msgid "Organization Name" msgstr "Název firmy: " -#: mod_vcard.erl:357 mod_vcard.erl:473 mod_vcard_odbc.erl:334 -#: mod_vcard_odbc.erl:448 +#: mod_vcard.erl:357 mod_vcard.erl:476 mod_vcard_odbc.erl:334 +#: mod_vcard_odbc.erl:451 msgid "Organization Unit" msgstr "Oddělení: " -#: mod_vcard.erl:357 mod_vcard_ldap.erl:457 mod_vcard_odbc.erl:334 +#: mod_vcard.erl:357 mod_vcard_ldap.erl:458 mod_vcard_odbc.erl:334 msgid "Search users in " msgstr "Hledat uživatele v " -#: mod_vcard.erl:357 mod_vcard_odbc.erl:334 web/ejabberd_web_admin.erl:1359 -#: web/ejabberd_web_admin.erl:1414 +#: mod_vcard.erl:357 mod_vcard_odbc.erl:334 web/ejabberd_web_admin.erl:1496 +#: web/ejabberd_web_admin.erl:1551 msgid "User" msgstr "Uživatel: " -#: mod_vcard.erl:357 mod_vcard_ldap.erl:457 mod_vcard_odbc.erl:334 +#: mod_vcard.erl:357 mod_vcard_ldap.erl:458 mod_vcard_odbc.erl:334 msgid "You need an x:data capable client to search" msgstr "K vyhledávání potřebujete klienta podporujícího x:data" -#: mod_vcard.erl:379 mod_vcard_ldap.erl:479 mod_vcard_odbc.erl:356 +#: mod_vcard.erl:382 mod_vcard_ldap.erl:483 mod_vcard_odbc.erl:359 msgid "vCard User Search" msgstr "Hledání uživatelů podle vizitek" -#: mod_vcard.erl:435 mod_vcard_ldap.erl:533 mod_vcard_odbc.erl:410 +#: mod_vcard.erl:438 mod_vcard_ldap.erl:537 mod_vcard_odbc.erl:413 msgid "ejabberd vCard module" msgstr "ejabberd vCard modul" -#: mod_vcard.erl:459 mod_vcard_ldap.erl:543 mod_vcard_odbc.erl:434 +#: mod_vcard.erl:462 mod_vcard_ldap.erl:547 mod_vcard_odbc.erl:437 msgid "Search Results for " msgstr "Výsledky hledání pro " -#: mod_vcard_ldap.erl:457 +#: mod_vcard_ldap.erl:458 msgid "Fill in fields to search for any matching Jabber User" msgstr "Vyplňte políčka pro vyhledání uživatele Jabberu" -#: web/ejabberd_web_admin.erl:151 web/ejabberd_web_admin.erl:168 +#: web/ejabberd_web_admin.erl:179 web/ejabberd_web_admin.erl:186 +#: web/ejabberd_web_admin.erl:202 web/ejabberd_web_admin.erl:209 +msgid "Unauthorized" +msgstr "" + +#: web/ejabberd_web_admin.erl:266 web/ejabberd_web_admin.erl:283 msgid "ejabberd Web Admin" msgstr "Webová administrace ejabberd" -#: web/ejabberd_web_admin.erl:629 web/ejabberd_web_admin.erl:647 +#: web/ejabberd_web_admin.erl:749 web/ejabberd_web_admin.erl:760 msgid "Administration" msgstr "Administrace" -#: web/ejabberd_web_admin.erl:632 web/ejabberd_web_admin.erl:634 -#: web/ejabberd_web_admin.erl:650 web/ejabberd_web_admin.erl:652 -msgid "(Raw)" -msgstr "(Zdroj)" - -#: web/ejabberd_web_admin.erl:635 -msgid "Virtual Hosts" -msgstr "Virtuální hostitelé" - -#: web/ejabberd_web_admin.erl:636 web/ejabberd_web_admin.erl:656 -#: web/ejabberd_web_admin.erl:1691 -msgid "Nodes" -msgstr "Uzly" - -#: web/ejabberd_web_admin.erl:637 web/ejabberd_web_admin.erl:657 -#: web/ejabberd_web_admin.erl:970 web/ejabberd_web_admin.erl:1724 -msgid "Statistics" -msgstr "Statistiky" - -#: web/ejabberd_web_admin.erl:653 web/ejabberd_web_admin.erl:912 -#: web/ejabberd_web_admin.erl:918 -msgid "Users" -msgstr "Uživatelé" - -#: web/ejabberd_web_admin.erl:655 web/ejabberd_web_admin.erl:1416 -msgid "Last Activity" -msgstr "Poslední aktivita" - -#: web/ejabberd_web_admin.erl:752 web/ejabberd_web_admin.erl:854 +#: web/ejabberd_web_admin.erl:858 web/ejabberd_web_admin.erl:962 msgid "Raw" msgstr "Zdroj" -#: web/ejabberd_web_admin.erl:888 +#: web/ejabberd_web_admin.erl:997 msgid "~s access rule configuration" msgstr "~s konfigurace pravidla přístupu" -#: web/ejabberd_web_admin.erl:905 +#: web/ejabberd_web_admin.erl:1015 msgid "ejabberd virtual hosts" msgstr "Virtuální hostitelé ejabberd" -#: web/ejabberd_web_admin.erl:944 +#: web/ejabberd_web_admin.erl:1023 web/ejabberd_web_admin.erl:1030 +msgid "Users" +msgstr "Uživatelé" + +#: web/ejabberd_web_admin.erl:1058 msgid "Users Last Activity" msgstr "Poslední aktivita uživatele" -#: web/ejabberd_web_admin.erl:946 +#: web/ejabberd_web_admin.erl:1060 msgid "Period: " msgstr "Čas:" -#: web/ejabberd_web_admin.erl:956 +#: web/ejabberd_web_admin.erl:1070 msgid "Last month" msgstr "Poslední měsíc" -#: web/ejabberd_web_admin.erl:957 +#: web/ejabberd_web_admin.erl:1071 msgid "Last year" msgstr "Poslední rok" -#: web/ejabberd_web_admin.erl:958 +#: web/ejabberd_web_admin.erl:1072 msgid "All activity" msgstr "Všechny aktivity" -#: web/ejabberd_web_admin.erl:960 +#: web/ejabberd_web_admin.erl:1074 msgid "Show Ordinary Table" msgstr "Zobrazit běžnou tabulku" -#: web/ejabberd_web_admin.erl:962 +#: web/ejabberd_web_admin.erl:1076 msgid "Show Integral Table" msgstr "Zobrazit kompletní tabulku" -#: web/ejabberd_web_admin.erl:981 +#: web/ejabberd_web_admin.erl:1085 web/ejabberd_web_admin.erl:1865 +msgid "Statistics" +msgstr "Statistiky" + +#: web/ejabberd_web_admin.erl:1097 #, fuzzy msgid "Not Found" msgstr "Uzel nenalezen" -#: web/ejabberd_web_admin.erl:996 +#: web/ejabberd_web_admin.erl:1114 msgid "Node not found" msgstr "Uzel nenalezen" -#: web/ejabberd_web_admin.erl:1306 +#: web/ejabberd_web_admin.erl:1441 msgid "Host" msgstr "Hostitel" -#: web/ejabberd_web_admin.erl:1307 +#: web/ejabberd_web_admin.erl:1442 msgid "Registered Users" msgstr "Registrovaní uživatelé" -#: web/ejabberd_web_admin.erl:1415 +#: web/ejabberd_web_admin.erl:1552 msgid "Offline Messages" msgstr "Offline zprávy" -#: web/ejabberd_web_admin.erl:1472 web/ejabberd_web_admin.erl:1488 +#: web/ejabberd_web_admin.erl:1553 +msgid "Last Activity" +msgstr "Poslední aktivita" + +#: web/ejabberd_web_admin.erl:1611 web/ejabberd_web_admin.erl:1627 msgid "Registered Users:" msgstr "Registrovaní živatelé:" -#: web/ejabberd_web_admin.erl:1474 web/ejabberd_web_admin.erl:1490 -#: web/ejabberd_web_admin.erl:1935 +#: web/ejabberd_web_admin.erl:1613 web/ejabberd_web_admin.erl:1629 +#: web/ejabberd_web_admin.erl:2113 msgid "Online Users:" msgstr "Online uživatelé:" -#: web/ejabberd_web_admin.erl:1476 +#: web/ejabberd_web_admin.erl:1615 msgid "Outgoing s2s Connections:" msgstr "Odchozí s2s spojení:" -#: web/ejabberd_web_admin.erl:1478 +#: web/ejabberd_web_admin.erl:1617 msgid "Outgoing s2s Servers:" msgstr "Odchozí s2s servery:" -#: web/ejabberd_web_admin.erl:1543 +#: web/ejabberd_web_admin.erl:1682 msgid "Change Password" msgstr "Změnit heslo" -#: web/ejabberd_web_admin.erl:1546 +#: web/ejabberd_web_admin.erl:1685 msgid "User " msgstr "Uživatel " -#: web/ejabberd_web_admin.erl:1553 +#: web/ejabberd_web_admin.erl:1692 msgid "Connected Resources:" msgstr "Připojené zdroje:" -#: web/ejabberd_web_admin.erl:1554 +#: web/ejabberd_web_admin.erl:1693 msgid "Password:" msgstr "Heslo:" -#: web/ejabberd_web_admin.erl:1615 +#: web/ejabberd_web_admin.erl:1754 msgid "No Data" msgstr "Žádná data" -#: web/ejabberd_web_admin.erl:1714 web/ejabberd_web_admin.erl:1736 +#: web/ejabberd_web_admin.erl:1832 +msgid "Nodes" +msgstr "Uzly" + +#: web/ejabberd_web_admin.erl:1855 web/ejabberd_web_admin.erl:1877 msgid "Node " msgstr "Uzel " -#: web/ejabberd_web_admin.erl:1723 +#: web/ejabberd_web_admin.erl:1864 msgid "Listened Ports" msgstr "Otevřené porty" -#: web/ejabberd_web_admin.erl:1725 web/ejabberd_web_admin.erl:2003 -#: web/ejabberd_web_admin.erl:2164 +#: web/ejabberd_web_admin.erl:1866 web/ejabberd_web_admin.erl:2181 +#: web/ejabberd_web_admin.erl:2369 msgid "Update" msgstr "Aktualizovat" -#: web/ejabberd_web_admin.erl:1728 web/ejabberd_web_admin.erl:2268 +#: web/ejabberd_web_admin.erl:1869 web/ejabberd_web_admin.erl:2490 msgid "Restart" msgstr "Restart" -#: web/ejabberd_web_admin.erl:1730 web/ejabberd_web_admin.erl:2270 +#: web/ejabberd_web_admin.erl:1871 web/ejabberd_web_admin.erl:2492 msgid "Stop" msgstr "Stop" -#: web/ejabberd_web_admin.erl:1744 +#: web/ejabberd_web_admin.erl:1885 msgid "RPC Call Error" msgstr "Chyba RPC volání" -#: web/ejabberd_web_admin.erl:1785 +#: web/ejabberd_web_admin.erl:1926 msgid "Database Tables at " msgstr "Databázové tabulky na " -#: web/ejabberd_web_admin.erl:1792 +#: web/ejabberd_web_admin.erl:1933 msgid "Storage Type" msgstr "Typ úložiště" -#: web/ejabberd_web_admin.erl:1793 +#: web/ejabberd_web_admin.erl:1934 msgid "Elements" msgstr "" -#: web/ejabberd_web_admin.erl:1794 +#: web/ejabberd_web_admin.erl:1935 msgid "Memory" msgstr "Paměť" -#: web/ejabberd_web_admin.erl:1811 web/ejabberd_web_admin.erl:1880 +#: web/ejabberd_web_admin.erl:1953 web/ejabberd_web_admin.erl:2058 msgid "Error" msgstr "" -#: web/ejabberd_web_admin.erl:1813 +#: web/ejabberd_web_admin.erl:1955 msgid "Backup of " msgstr "Záloha na " -#: web/ejabberd_web_admin.erl:1815 +#: web/ejabberd_web_admin.erl:1957 #, fuzzy msgid "" "Please note that these options will only backup the builtin Mnesia database. " @@ -1415,120 +1478,158 @@ msgstr "" "Mnesia. Pokud používáte ODBC modul, musíte zálohovat svoji SQL databázi " "samostatně." -#: web/ejabberd_web_admin.erl:1820 +#: web/ejabberd_web_admin.erl:1962 msgid "Store binary backup:" msgstr "Uložit binární zálohu:" -#: web/ejabberd_web_admin.erl:1824 web/ejabberd_web_admin.erl:1831 -#: web/ejabberd_web_admin.erl:1839 web/ejabberd_web_admin.erl:1846 -#: web/ejabberd_web_admin.erl:1853 +#: web/ejabberd_web_admin.erl:1966 web/ejabberd_web_admin.erl:1973 +#: web/ejabberd_web_admin.erl:1981 web/ejabberd_web_admin.erl:1988 +#: web/ejabberd_web_admin.erl:1995 web/ejabberd_web_admin.erl:2002 +#: web/ejabberd_web_admin.erl:2009 web/ejabberd_web_admin.erl:2017 +#: web/ejabberd_web_admin.erl:2024 web/ejabberd_web_admin.erl:2031 msgid "OK" msgstr "OK" -#: web/ejabberd_web_admin.erl:1827 +#: web/ejabberd_web_admin.erl:1969 msgid "Restore binary backup immediately:" msgstr "Okamžitě obnovit binární zálohu:" -#: web/ejabberd_web_admin.erl:1835 +#: web/ejabberd_web_admin.erl:1977 msgid "" "Restore binary backup after next ejabberd restart (requires less memory):" msgstr "" "Obnovit binární zálohu při následujícím restartu ejabberd (vyžaduje méně " "paměti)" -#: web/ejabberd_web_admin.erl:1842 +#: web/ejabberd_web_admin.erl:1984 msgid "Store plain text backup:" msgstr "Uložit zálohu do textového souboru:" -#: web/ejabberd_web_admin.erl:1849 +#: web/ejabberd_web_admin.erl:1991 msgid "Restore plain text backup immediately:" msgstr "Okamžitě obnovit zálohu z textového souboru:" -#: web/ejabberd_web_admin.erl:1875 +#: web/ejabberd_web_admin.erl:1998 +msgid "Import users data from a PIEFXIS file (XEP-0277):" +msgstr "" + +#: web/ejabberd_web_admin.erl:2005 +msgid "Export data of all users in the server to PIEFXIS files (XEP-0277):" +msgstr "" + +#: web/ejabberd_web_admin.erl:2012 +msgid "Export data of users in a host to PIEFXIS files (XEP-0277):" +msgstr "" + +#: web/ejabberd_web_admin.erl:2020 +#, fuzzy +msgid "Import user data from jabberd14 spool file:" +msgstr "Importovat uživatele z jabberd14 spool souborů" + +#: web/ejabberd_web_admin.erl:2027 +#, fuzzy +msgid "Import users data from jabberd14 spool directory:" +msgstr "Importovat uživatele z jabberd14 spool souborů" + +#: web/ejabberd_web_admin.erl:2053 msgid "Listened Ports at " msgstr "Otevřené porty na " -#: web/ejabberd_web_admin.erl:1900 +#: web/ejabberd_web_admin.erl:2078 msgid "Modules at " msgstr "Moduly na " -#: web/ejabberd_web_admin.erl:1926 +#: web/ejabberd_web_admin.erl:2104 msgid "Statistics of ~p" msgstr "Statistiky ~p" -#: web/ejabberd_web_admin.erl:1929 +#: web/ejabberd_web_admin.erl:2107 msgid "Uptime:" msgstr "Čas běhu" -#: web/ejabberd_web_admin.erl:1932 +#: web/ejabberd_web_admin.erl:2110 msgid "CPU Time:" msgstr "Čas procesoru" -#: web/ejabberd_web_admin.erl:1938 +#: web/ejabberd_web_admin.erl:2116 msgid "Transactions Committed:" msgstr "Transakce potvrzena" -#: web/ejabberd_web_admin.erl:1941 +#: web/ejabberd_web_admin.erl:2119 msgid "Transactions Aborted:" msgstr "Transakce zrušena" -#: web/ejabberd_web_admin.erl:1944 +#: web/ejabberd_web_admin.erl:2122 msgid "Transactions Restarted:" msgstr "Transakce restartována" -#: web/ejabberd_web_admin.erl:1947 +#: web/ejabberd_web_admin.erl:2125 msgid "Transactions Logged:" msgstr "Transakce zaznamenána" -#: web/ejabberd_web_admin.erl:1989 +#: web/ejabberd_web_admin.erl:2167 msgid "Update " msgstr "Aktualizovat " -#: web/ejabberd_web_admin.erl:1997 +#: web/ejabberd_web_admin.erl:2175 msgid "Update plan" msgstr "Aktualizovat plán" -#: web/ejabberd_web_admin.erl:1998 +#: web/ejabberd_web_admin.erl:2176 #, fuzzy msgid "Modified modules" msgstr "Aktualizované moduly" -#: web/ejabberd_web_admin.erl:1999 +#: web/ejabberd_web_admin.erl:2177 msgid "Update script" msgstr "Aktualizované skripty" -#: web/ejabberd_web_admin.erl:2000 +#: web/ejabberd_web_admin.erl:2178 msgid "Low level update script" msgstr "Nízkoúrovňový aktualizační skript" -#: web/ejabberd_web_admin.erl:2001 +#: web/ejabberd_web_admin.erl:2179 msgid "Script check" msgstr "Kontrola skriptu" -#: web/ejabberd_web_admin.erl:2144 +#: web/ejabberd_web_admin.erl:2347 msgid "Port" msgstr "Port" -#: web/ejabberd_web_admin.erl:2145 +#: web/ejabberd_web_admin.erl:2348 msgid "IP" msgstr "" -#: web/ejabberd_web_admin.erl:2146 web/ejabberd_web_admin.erl:2255 +#: web/ejabberd_web_admin.erl:2349 +#, fuzzy +msgid "Protocol" +msgstr "Port" + +#: web/ejabberd_web_admin.erl:2350 web/ejabberd_web_admin.erl:2477 msgid "Module" msgstr "Modul" -#: web/ejabberd_web_admin.erl:2147 web/ejabberd_web_admin.erl:2256 +#: web/ejabberd_web_admin.erl:2351 web/ejabberd_web_admin.erl:2478 msgid "Options" msgstr "Nastavení" -#: web/ejabberd_web_admin.erl:2166 +#: web/ejabberd_web_admin.erl:2371 msgid "Delete" msgstr "Smazat" -#: web/ejabberd_web_admin.erl:2278 +#: web/ejabberd_web_admin.erl:2500 msgid "Start" msgstr "Start" +#~ msgid "Encodings" +#~ msgstr "Kódování" + +#~ msgid "(Raw)" +#~ msgstr "(Zdroj)" + +#~ msgid "Virtual Hosts" +#~ msgstr "Virtuální hostitelé" + #~ msgid "Specified nickname is already registered" #~ msgstr "Zadaná přezdívka je již zaregistrována" src/msgs/cs.po @@ -9,12 +9,13 @@ {"Add Jabber ID","Jabber ID hinzufügen"}. {"Add New","Neuen hinzufügen"}. {"Add User","Benutzer hinzufügen"}. -{"Administration of ","Administration der "}. +{"Administration of ","Administration von "}. {"Administration","Verwaltung"}. {"Administrator privileges required","Administratorenrechte benötigt"}. {"A friendly name for the node","Ein passender Name für den Knoten"}. {"All activity","Alle Aktivitäten"}. -{"Allow this Jabber ID to subscribe to this pubsub node?","Erlauben Sie dieser Jabber ID das Abonnement dieses pubsub Knotens?"}. +{"Allow this Jabber ID to subscribe to this pubsub node?","Erlauben sie dieser Jabber ID das Abonnement dieses pubsub Knotens?"}. +{"Allow users to change the subject","Erlaube Benutzern das Thema zu ändern"}. {"Allow users to query other users","Erlaube Benutzern andere Benutzer abzufragen"}. {"Allow users to send invites","Erlaube Benutzern Einladungen zu senden"}. {"Allow users to send private messages","Erlaube Benutzern private Nachrichten zu senden"}. @@ -23,6 +24,7 @@ {"All Users","Alle Benutzer"}. {"Announcements","Ankündigungen"}. {"anyone","jeder"}. +{"A password is required to enter this room","Sie brauchen ein Passwort um diesen Raum zu betreten"}. {"April","April"}. {"August","August"}. {"Backup","Datensicherung"}. @@ -35,7 +37,7 @@ {"Change User Password","Benutzer Passwort ändern"}. {"Chatroom configuration modified","Chatraum Konfiguration geändert"}. {"Chatrooms","Chaträume"}. -{"Choose a username and password to register with this server","Wählen Sie zum Registrieren einen Benutzernamen und ein Passwort"}. +{"Choose a username and password to register with this server","Wählen sie zum Registrieren einen Benutzernamen und ein Passwort"}. {"Choose modules to stop","Wähle zu stoppende Module"}. {"Choose storage type of tables","Wähle Speichertyp der Tabellen"}. {"Choose whether to approve this entity's subscription.","Wähle ob dieses Abonnement bestätigt wird."}. @@ -43,7 +45,9 @@ {"Commands","Befehle"}. {"Conference room does not exist","Konferenzraum existiert nicht"}. {"Configuration","Konfiguration"}. +{"Configuration of room ~s","Konfiguration für Raum ~s"}. {"Connected Resources:","Verbundene Resourcen"}. +{"Connections parameters","Verbindungsparameter"}. {"Country","Land"}. {"CPU Time:","CPU Zeit:"}. {"Database","Datenbank"}. @@ -56,8 +60,8 @@ {"Delete message of the day on all hosts","Lösche Nachricht des Tages auf allen Hosts"}. {"Delete Selected","Markiertes löschen"}. {"Delete User","Benutzer löschen"}. -{"Deliver event notifications","Versende Ereignisbenachrichtigung"}. -{"Deliver payloads with event notifications","Versende Nutzlast mit Ereignis Benachrichtigung"}. +{"Deliver event notifications","Versende Ereignisbenachrichtigungen"}. +{"Deliver payloads with event notifications","Versende Nutzlast mit Ereignisbenachrichtigungen"}. {"Description:","Beschreibung:"}. {"Disc only copy","Festplatten Kopie"}. {"Displayed Groups:","Angezeigte Gruppen:"}. @@ -71,27 +75,33 @@ {"ejabberd vCard module","ejabberd vCard Modul"}. {"ejabberd virtual hosts","ejabberd virtuelle Hosts"}. {"ejabberd Web Admin","ejabberd Web Admin"}. +{"Elements","Elemente"}. {"Email","E-Mail"}. {"Enable logging","Log-Funktion aktivieren"}. -{"Encodings","Kodierung"}. +{"Encoding for server ~b","Kodierung für Server ~b"}. {"End User Session","Benutzer Sitzung beenden"}. -{"Enter list of {Module, [Options]}","Geben Sie eine Liste bestehend aus {Modul, [Optionen]} ein"}. -{"Enter nickname you want to register","Geben Sie den zu registrierenden Spitznamen ein"}. -{"Enter path to backup file","Geben Sie den Pfad zur Datensicherung ein"}. -{"Enter path to jabberd14 spool dir","Geben Sie den Pfad zum jabberd14 spool Verzeichnis ein"}. -{"Enter path to jabberd14 spool file","Geben Sie den Pfad zur jabberd14 spool Datei ein"}. -{"Enter path to text file","Geben Sie den Pfad zur Textdatei ein"}. -{"Enter username and encodings you wish to use for connecting to IRC servers","Geben Sie Benutzernamen und Kodierung für die Verbindung zum IRC Server an"}. +{"Enter list of {Module, [Options]}","Geben sie eine Liste bestehend aus {Modul, [Optionen]} ein"}. +{"Enter nickname you want to register","Geben sie den zu registrierenden Spitznamen ein"}. +{"Enter path to backup file","Geben sie den Pfad zur Datensicherung ein"}. +{"Enter path to jabberd14 spool dir","Geben sie den Pfad zum jabberd14 spool Verzeichnis ein"}. +{"Enter path to jabberd14 spool file","Geben sie den Pfad zur jabberd14 spool Datei ein"}. +{"Enter path to text file","Geben sie den Pfad zur Textdatei ein"}. +{"Enter the text you see","Geben sie den Text den sie sehen ein"}. +{"Enter username and encodings you wish to use for connecting to IRC servers. Press 'Next' to get more fields to fill in. Press 'Complete' to save settings.","Geben sie Benutzernamen und Kodierung für Verbindungen zu IRC Servern an. Drücken sie 'Mehr' um leere Felder hinzuzufügen. Drücken sie 'Beenden' um die Einstellungen zu speichern."}. +{"Enter username, encodings, ports and passwords you wish to use for connecting to IRC servers","Geben sie Benutzernamen, Kodierungen, Ports und Passwörter für die Verbindung zu IRC Servern an"}. {"Erlang Jabber Server","Erlang Jabber Server"}. -{"Example: [{\"irc.lucky.net\", \"koi8-r\"}, {\"vendetta.fef.net\", \"iso8859-1\"}].","Beispiel: [{\"irc.lucky.net\",\"koi8-r\"}, {\"vendetta.fef.net\", \"iso8859-1\"}]."}. +{"Error","Fehler"}. +{"Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}].","Beispiel: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}]."}. +{"Export data of all users in the server to PIEFXIS files (XEP-0277):","Alle Benutzerdaten des Servers in PIEFXIS Dateien (XEP-0277) exportieren:"}. +{"Export data of users in a host to PIEFXIS files (XEP-0277):","Alle Benutzerdaten des Hosts in PIEFXIS Dateien (XEP-0277) exportieren:"}. {"Family Name","Nachname"}. {"February","Februar"}. {"Fill in fields to search for any matching Jabber User","Felder ausfüllen, um nach passenden Jabber Benutzern zu suchen"}. -{"Fill in the form to search for any matching Jabber User (Add * to the end of field to match substring)","Füllen Sie die Felder aus, um nach passenden Jabber Benutzern zu suchen (beenden Sie ein Feld mit *, um auch nach Teilzeichenketten zu suchen)"}. +{"Fill in the form to search for any matching Jabber User (Add * to the end of field to match substring)","Füllen sie die Felder aus, um nach passenden Jabber Benutzern zu suchen (beenden sie ein Feld mit *, um auch nach Teilzeichenketten zu suchen)"}. {"Friday","Freitag"}. -{"From ~s","Von ~s"}. +{"From ~s","Von ~s"}. {"From","Von"}. -{"Full Name","Ganzer Name"}. +{"Full Name","Gesamter Name"}. {"Get Number of Online Users","Anzahl der angemeldeten Benutzer abrufen"}. {"Get Number of Registered Users","Anzahl der registrierten Benutzer abrufen"}. {"Get User Last Login Time","letzte Anmeldezeit abrufen"}. @@ -106,10 +116,13 @@ {"has been kicked","wurde gekickt"}. {" has set the subject to: "," hat das Thema geändert auf: "}. {"Host","Host"}. -{"If you want to specify different encodings for IRC servers, fill this list with values in format '{\"irc server\", \"encoding\"}'. By default this service use \"~s\" encoding.","Wenn Sie verschiedene Kodierungen für IRC Server angeben, schreiben Sie diese im Format '{\"Irc Server\", \"Kodierung\"}'. Standardmässig benutzt der Dienst die \"~s\" Kodierung"}. +{"If you want to specify different ports, passwords, encodings for IRC servers, fill this list with values in format '{\"irc server\", \"encoding\", port, \"password\"}'. By default this service use \"~s\" encoding, port ~p, empty password.","Wenn sie verschiedene Ports, Passwörter und Kodierungen für IRC Server angeben wollen, erstellen sie die Liste mit folgendem Format '{\"IRC Server\", \"Kodierung\", Port, \"Passwort\"}'. Standardmässig benutzt dieser Dienst die \"~s\" Kodierung, den Port ~p und kein Passwort."}. {"Import Directory","Verzeichnis importieren"}. {"Import File","Datei importieren"}. +{"Import user data from jabberd14 spool file:","Importiere Benutzer von jabberd14 Spool Datei:"}. {"Import User from File at ","Benutzer aus dieser Datei importieren "}. +{"Import users data from a PIEFXIS file (XEP-0277):","Benutzerdaten von einer PIEFXIS Datei (XEP-0277) importieren:"}. +{"Import users data from jabberd14 spool directory:","Importiere Benutzer von jabberd14 Spool Verzeichnis:"}. {"Import Users from Dir at ","Benutzer vom Verzeichnis importieren "}. {"Import Users From jabberd14 Spool Files","Importiere Benutzer von jabberd14 Spool Dateien"}. {"Improper message type","Unzulässiger Nachrichtentyp"}. @@ -117,7 +130,12 @@ {"Invalid affiliation: ~s","Ungültige Mitgliedschaft: ~s"}. {"Invalid role: ~s","Ungültige Rolle: ~s"}. {"IP addresses","IP Addresse"}. +{"IP","IP"}. +{"IRC channel (don't put the first #)","IRC Channel (ohne dem ersten #)"}. +{"IRC server","IRC Server"}. +{"IRC settings","IRC Einstellungen"}. {"IRC Transport","IRC Transport"}. +{"IRC username","IRC Benutzername"}. {"IRC Username","IRC Benutzername"}. {"is now known as","ist nun bekannt als"}. {"It is not allowed to send private messages","Es ist nicht erlaubt private Nachrichten zu senden"}. @@ -126,7 +144,10 @@ {"Jabber ID","Jabber ID"}. {"Jabber ID ~s is invalid","Jabber ID ~s ist ungültig"}. {"January","Januar"}. +{"Join IRC channel","IRC Channel beitreten"}. {"joins the room","kommt in den Raum"}. +{"Join the IRC channel here.","Hier den IRC Channel beitreten."}. +{"Join the IRC channel in this Jabber ID: ~s","Den IRC Channel mit dieser Jabber ID beitreten: ~s"}. {"July","Juli"}. {"June","Juni"}. {"Last Activity","Letzte Aktion"}. @@ -135,34 +156,37 @@ {"Last year","Letztes Jahr"}. {"leaves the room","verlässt den Raum"}. {"Listened Ports","Aktive Ports"}. -{"Listened Ports at ","aktive Ports "}. +{"Listened Ports at ","Aktive Ports bei"}. {"List of modules to start","Liste der zu startenden Module"}. {"Low level update script","Low level Aktualisierungsscript"}. {"Make participants list public","Teilnehmerliste öffentlich machen"}. +{"Make room captcha protected","Raum mit Verifizierung (Captcha) versehen"}. {"Make room members-only","Raum nur für Mitglieder zugänglich machen"}. {"Make room moderated","Raum modieriert machen"}. {"Make room password protected","Raum passwortgeschützt machen"}. {"Make room persistent","Raum persistent machen"}. {"Make room public searchable","Raum öffentlich suchbar machen"}. {"March","März"}. -{"Maximum Number of Occupants","maximale Anzahl von Teilnehmern"}. +{"Maximum Number of Occupants","Maximale Anzahl von Teilnehmern"}. {"Max # of items to persist","Maximale Anzahl dauerhaft zu speichernder Einträge"}. {"Max payload size in bytes","Maximale Nutzlastgrösse in Bytes"}. {"May","Mai"}. +{"Membership is required to enter this room","Um diesen Raum zu betreten müssen sie Mitglied sein"}. {"Members:","Mitglieder:"}. {"Memory","Speicher"}. {"Message body","Nachrichtentext"}. {"Middle Name","Zweiter Vorname"}. {"Moderator privileges required","Moderatorrechte benötigt"}. {"moderators only","ausschliesslich Moderatoren"}. +{"Modified modules","Geänderte Module"}. {"Module","Modul"}. -{"Modules at ","Module auf "}. +{"Modules at ","Module bei "}. {"Modules","Module"}. {"Monday","Montag"}. {"Name:","Name:"}. {"Name","Vorname"}. {"Never","Nie"}. -{"Nickname Registration at ","Registrieren des Spitznamens "}. +{"Nickname Registration at ","Registrieren des Spitznamens bei"}. {"Nickname ~s does not exist in the room","Spitzname ~s existiert im Raum nicht"}. {"Nickname","Spitzname"}. {"No body provided for announce message","Kein Text für die Ankündigung angegeben"}. @@ -171,9 +195,10 @@ {"Node ","Knoten "}. {"Node not found","Knoten nicht gefunden"}. {"Nodes","Knoten"}. -{"No limit","keine Begrenzung"}. +{"No limit","Keine Begrenzung"}. {"None","Keine"}. {"No resource provided","Keine Ressource angegeben"}. +{"Not Found","nicht gefunden"}. {"Notify subscribers when items are removed from the node","Abonnenten benachrichtigen, wenn Einträge vom Knoten entfernt werden"}. {"Notify subscribers when the node configuration changes","Abonnenten benachrichtigen, wenn die Knotenkonfiguration sich ändert"}. {"Notify subscribers when the node is deleted","Abonnenten benachrichtigen, wenn der Knoten gelöscht wird"}. @@ -189,6 +214,8 @@ {"Online Users:","Angemeldete Benutzer:"}. {"Online Users","Angemeldete Benutzer"}. {"Only deliver notifications to available users","Benachrichtigungen nur an verfügbare Benutzer schicken"}. +{"Only moderators and participants are allowed to change the subject in this room","Nur Moderatoren und Mitglieder dürfen das Thema in diesem Raum ändern"}. +{"Only moderators are allowed to change the subject in this room","Nur Moderatoren dürfen das Thema in diesem Raum ändern"}. {"Only occupants are allowed to send messages to the conference","Nur Teilnehmer dürfen Nachrichten an den Raum schicken"}. {"Only occupants are allowed to send queries to the conference","Nur Teilnehmer sind berechtig Anfragen an die Konferenz zu senden"}. {"Only service administrators are allowed to send service messages","Nur Service Administratoren sind berechtigt, Servicenachrichten zu senden"}. @@ -200,6 +227,7 @@ {"Outgoing s2s Servers:","Ausgehende s2s Server:"}. {"Owner privileges required","Besitzerrechte benötigt"}. {"Packet","Paket"}. +{"Password ~b","Passwort ~b"}. {"Password:","Passwort:"}. {"Password","Passwort"}. {"Password Verification","Passwort bestätigen"}. @@ -209,16 +237,18 @@ {"Period: ","Zeitraum: "}. {"Persist items to storage","Einträge dauerhaft speichern"}. {"Ping","Ping"}. +{"Please note that these options will only backup the builtin Mnesia database. If you are using the ODBC module, you also need to backup your SQL database separately.","Beachten sie, das diese Optionen nur die eingebaute Mnesia Datenbank sichert. Wenn sie das ODBC Modul verwenden müssen sie die SQL Datenbank zusätzlich manuell sichern."}. {"Pong","Pong"}. +{"Port ~b","Port ~b"}. {"Port","Port"}. {"Present real Jabber IDs to","Echte Jabber IDs anzeigen für"}. {"private, ","privat, "}. +{"Protocol","Protokoll"}. {"Publish-Subscribe","Publish-Subscribe"}. {"PubSub subscriber request","PubSub Abonnenten Anfrage"}. {"Queries to the conference members are not allowed in this room","Anfragen an die Teilnehmer sind in diesem Raum nicht erlaubt"}. {"RAM and disc copy","RAM und Festplatten Kopie"}. {"RAM copy","RAM Kopie"}. -{"(Raw)","(unformatiert)"}. {"Raw","Unformatiert"}. {"Really delete message of the day?","Wirklich die Nachricht des Tages löschen?"}. {"Recipient is not in the conference room","Der Empfänger ist nicht im Raum"}. @@ -226,10 +256,11 @@ {"Registered Users","Registrierte Benutzer"}. {"Registration in mod_irc for ","Registrierung in mod_irc für "}. {"Remote copy","Fernkopie"}. +{"Remove All Offline Messages","Alle Offline Nachrichten löschen"}. {"Remove","Entfernen"}. {"Remove User","Benutzer löschen"}. {"Replaced by new connection","Durch neue Verbindung ersetzt"}. -{"Resources","Resource"}. +{"Resources","Ressourcen"}. {"Restart","Neustart"}. {"Restart Service","Dienst neustarten"}. {"Restore Backup from File at ","Datenwiederherstellung aus der Datei "}. @@ -239,11 +270,13 @@ {"Restore","Wiederherstellung"}. {"Room Configuration","Raum Konfiguration"}. {"Room creation is denied by service policy","Anlegen des Raumes aufgrund der Dienstrichtlinien verweigert"}. +{"Room description","Raum Beschreibung"}. +{"Room Occupants","Teilnehmer in diesem Raum"}. {"Room title","Raumname"}. {"Roster groups allowed to subscribe","Kontaktlisten-Gruppen die abonnieren dürfen"}. {"Roster","Kontaktliste"}. {"Roster of ","Kontaktliste von "}. -{"Roster size","Kontaktlistengrösse"}. +{"Roster size","Kontaktlistengröße"}. {"RPC Call Error","RPC Abruf-Fehler"}. {"Running Nodes","Aktive Knoten"}. {"~s access rule configuration","~s Zugangsregel Konfiguration"}. @@ -256,6 +289,7 @@ {"Send announcement to all users on all hosts","Sende Ankündigung an alle Benutzer auf allen Hosts"}. {"Send announcement to all users","Sende Ankündigung an alle Benutzer"}. {"September","September"}. +{"Server ~b","Server ~b"}. {"Set message of the day and send to online users","Setze Nachricht des Tages und sende sie an alle angemeldeten Benutzer"}. {"Set message of the day on all hosts and send to online users","Setze Nachricht des Tages auf allen Hosts und sende sie an alle angemeldeten Benutzer"}. {"Shared Roster Groups","Gruppen der gemeinsamen Kontaktliste"}. @@ -263,8 +297,8 @@ {"Show Ordinary Table","Normale Tabelle anzeigen"}. {"Shut Down Service","Dienst herunterfahren"}. {"~s invites you to the room ~s","~s lädt sie in den Raum ~s ein"}. -{"Specify the access model","Geben Sie das Zugangsmodell an"}. -{"Specify the publisher model","Geben Sie das Publikationsmodell an"}. +{"Specify the access model","Geben sie das Zugangsmodell an"}. +{"Specify the publisher model","Geben sie das Publikationsmodell an"}. {"~s's Offline Messages Queue","~s's Offline Nachrichten Warteschlange"}. {"Start","Anfang"}. {"Start Modules at ","Starte Module bei "}. @@ -284,6 +318,10 @@ {"Subscriber Address","Abonnenten Adresse"}. {"Subscription","Abonnement"}. {"Sunday","Sonntag"}. +{"That nickname is already in use by another occupant","Dieser Spitzname wird bereits von einem Teilnehmer genutzt"}. +{"That nickname is registered by another person","Dieser Spitzname wurde bereits von jemand anderem registriert"}. +{"The captcha is valid.","Die Verifizierung ist gültig."}. +{"The collections with which a node is affiliated","Sammlungen, mit denen ein Knoten verknüpft ist"}. {"the password is","das Passwort ist"}. {"This participant is kicked from the room because he sent an error message","Dieser Teilnehmer wurde aus dem Raum gekickt, da er eine Fehlernachricht gesendet hat"}. {"This participant is kicked from the room because he sent an error message to another participant","Dieser Teilnehmer wurde aus dem Raum gekickt, da er eine Fehlernachricht an einen anderen Teilnehmer gesendet hat"}. @@ -294,12 +332,14 @@ {"Time","Zeit"}. {"To ~s","An ~s"}. {"To","Zu"}. -{"Traffic rate limit is exceeded","Datenrate ist zu hoch"}. +{"Traffic rate limit is exceeded","Datenratenlimit wurde überschritten"}. {"Transactions Aborted:","Vorgänge abgebrochen:"}. {"Transactions Committed:","Vorgänge durchgeführt:"}. {"Transactions Logged:","Vorgänge protokolliert:"}. {"Transactions Restarted:","Vorgänge neu gestartet:"}. {"Tuesday","Dienstag"}. +{"Unable to generate a captcha","Konnte Verifizierung nicht erstellen"}. +{"Unauthorized","Nicht berechtigt"}. {"Update","Aktualisieren"}. {"Update ","Aktualisierung "}. {"Update message of the day (don't send)","Aktualisiere Nachricht des Tages (nicht senden)"}. @@ -311,11 +351,11 @@ {"User ","Benutzer "}. {"User","Benutzer"}. {"User Management","Benutzer Verwaltung"}. +{"Users are not allowed to register accounts so quickly","Benutzer dürfen Konten nicht so schnell registrieren"}. {"Users","Benutzer"}. {"Users Last Activity","Letzte Benutzeraktivität"}. {"Validate","Validieren"}. {"vCard User Search","vCard Benutzer Suche"}. -{"Virtual Hosts","Virtuelle Hosts"}. {"Visitors are not allowed to change their nicknames in this room","Besucher dürfen in diesem Raum ihren Spitznamen nicht ändern"}. {"Visitors are not allowed to send messages to all occupants","Besucher dürfen nicht an alle Teilnehmer Nachrichten verschicken"}. {"Wednesday","Mittwoch"}. @@ -328,3 +368,4 @@ {"You need an x:data capable client to register nickname","Sie benötigen einen Client, der x:data unterstützt, um Ihren Spitznamen zu registrieren"}. {"You need an x:data capable client to search","Sie benötigen einen Client, der x:data unterstützt, um suchen zu können"}. {"Your contact offline message queue is full. The message has been discarded.","Ihre offline Kontakt Warteschlange ist voll. Die Nachricht wurde verworfen."}. +{"Your messages to ~s are being blocked. To unblock them, visit ~s","Ihre Nachrichten an ~s werden blockiert. Um dies zu ändern, besuchen sie ~s"}. src/msgs/de.msg @@ -1,7 +1,10 @@ msgid "" msgstr "" "Project-Id-Version: 2.1.0-alpha\n" -"Last-Translator: Nikolaus Polak\n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"Last-Translator: Nikolaus Polak <nik [at] linuxlovers [dot] at>\n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -12,30 +15,30 @@ msgstr "" "X-Additional-Translator: Torsten Werner\n" "X-Additional-Translator: Marina Hahn\n" -#: ejabberd_c2s.erl:358 ejabberd_c2s.erl:662 +#: ejabberd_c2s.erl:364 ejabberd_c2s.erl:668 msgid "Use of STARTTLS required" msgstr "Verwendung von STARTTLS erforderlich" -#: ejabberd_c2s.erl:442 +#: ejabberd_c2s.erl:448 msgid "No resource provided" msgstr "Keine Ressource angegeben" -#: ejabberd_c2s.erl:1067 +#: ejabberd_c2s.erl:1073 msgid "Replaced by new connection" msgstr "Durch neue Verbindung ersetzt" -#: ejabberd_captcha.erl:74 ejabberd_captcha.erl:106 -#, fuzzy +#: ejabberd_captcha.erl:93 ejabberd_captcha.erl:125 msgid "Enter the text you see" -msgstr "Geben Sie den Pfad zur Textdatei ein" +msgstr "Geben sie den Text den sie sehen ein" -#: ejabberd_captcha.erl:78 +#: ejabberd_captcha.erl:97 msgid "Your messages to ~s are being blocked. To unblock them, visit ~s" msgstr "" +"Ihre Nachrichten an ~s werden blockiert. Um dies zu ändern, besuchen sie ~s" -#: ejabberd_captcha.erl:212 +#: ejabberd_captcha.erl:235 msgid "The captcha is valid." -msgstr "" +msgstr "Die Verifizierung ist gültig." #: mod_adhoc.erl:95 mod_adhoc.erl:125 mod_adhoc.erl:143 mod_adhoc.erl:161 msgid "Commands" @@ -116,7 +119,7 @@ msgstr "Lösche Nachricht des Tages auf allen Hosts" msgid "Configuration" msgstr "Konfiguration" -#: mod_configure.erl:125 mod_configure.erl:544 web/ejabberd_web_admin.erl:1721 +#: mod_configure.erl:125 mod_configure.erl:544 web/ejabberd_web_admin.erl:1862 msgid "Database" msgstr "Datenbank" @@ -128,7 +131,7 @@ msgstr "Module starten" msgid "Stop Modules" msgstr "Module stoppen" -#: mod_configure.erl:131 mod_configure.erl:572 web/ejabberd_web_admin.erl:1722 +#: mod_configure.erl:131 mod_configure.erl:572 web/ejabberd_web_admin.erl:1863 msgid "Backup" msgstr "Datensicherung" @@ -157,7 +160,7 @@ msgid "Shut Down Service" msgstr "Dienst herunterfahren" #: mod_configure.erl:145 mod_configure.erl:486 mod_configure.erl:1165 -#: web/ejabberd_web_admin.erl:1371 +#: web/ejabberd_web_admin.erl:1508 msgid "Add User" msgstr "Benutzer hinzufügen" @@ -194,15 +197,13 @@ msgstr "Anzahl der registrierten Benutzer abrufen" msgid "Get Number of Online Users" msgstr "Anzahl der angemeldeten Benutzer abrufen" -#: mod_configure.erl:163 mod_configure.erl:477 web/ejabberd_web_admin.erl:631 -#: web/ejabberd_web_admin.erl:649 web/ejabberd_web_admin.erl:706 -#: web/ejabberd_web_admin.erl:746 +#: mod_configure.erl:163 mod_configure.erl:477 web/ejabberd_web_admin.erl:811 +#: web/ejabberd_web_admin.erl:852 msgid "Access Control Lists" msgstr "Zugangskontroll-Listen (ACL)" -#: mod_configure.erl:165 mod_configure.erl:478 web/ejabberd_web_admin.erl:633 -#: web/ejabberd_web_admin.erl:651 web/ejabberd_web_admin.erl:813 -#: web/ejabberd_web_admin.erl:848 +#: mod_configure.erl:165 mod_configure.erl:478 web/ejabberd_web_admin.erl:920 +#: web/ejabberd_web_admin.erl:956 msgid "Access Rules" msgstr "Zugangsregeln" @@ -210,8 +211,8 @@ msgstr "Zugangsregeln" msgid "User Management" msgstr "Benutzer Verwaltung" -#: mod_configure.erl:468 web/ejabberd_web_admin.erl:654 -#: web/ejabberd_web_admin.erl:925 web/ejabberd_web_admin.erl:1308 +#: mod_configure.erl:468 web/ejabberd_web_admin.erl:1038 +#: web/ejabberd_web_admin.erl:1443 msgid "Online Users" msgstr "Angemeldete Benutzer" @@ -223,15 +224,15 @@ msgstr "Alle Benutzer" msgid "Outgoing s2s Connections" msgstr "Ausgehende s2s Verbindungen" -#: mod_configure.erl:471 web/ejabberd_web_admin.erl:1692 +#: mod_configure.erl:471 web/ejabberd_web_admin.erl:1833 msgid "Running Nodes" msgstr "Aktive Knoten" -#: mod_configure.erl:472 web/ejabberd_web_admin.erl:1694 +#: mod_configure.erl:472 web/ejabberd_web_admin.erl:1835 msgid "Stopped Nodes" msgstr "Inaktive Knoten" -#: mod_configure.erl:545 mod_configure.erl:555 web/ejabberd_web_admin.erl:1738 +#: mod_configure.erl:545 mod_configure.erl:555 web/ejabberd_web_admin.erl:1879 msgid "Modules" msgstr "Module" @@ -249,7 +250,7 @@ msgstr "An ~s" #: mod_configure.erl:685 msgid "From ~s" -msgstr "Von ~s" +msgstr "Von ~s" #: mod_configure.erl:881 msgid "Database Tables Configuration at " @@ -289,7 +290,7 @@ msgstr "Starte Module bei " #: mod_configure.erl:941 msgid "Enter list of {Module, [Options]}" -msgstr "Geben Sie eine Liste bestehend aus {Modul, [Optionen]} ein" +msgstr "Geben sie eine Liste bestehend aus {Modul, [Optionen]} ein" #: mod_configure.erl:942 msgid "List of modules to start" @@ -301,7 +302,7 @@ msgstr "Datensicherung in die Datei " #: mod_configure.erl:955 mod_configure.erl:969 msgid "Enter path to backup file" -msgstr "Geben Sie den Pfad zur Datensicherung ein" +msgstr "Geben sie den Pfad zur Datensicherung ein" #: mod_configure.erl:956 mod_configure.erl:970 mod_configure.erl:984 #: mod_configure.erl:998 @@ -318,7 +319,7 @@ msgstr "Ausgabe der Sicherung in diese Textdatei " #: mod_configure.erl:983 msgid "Enter path to text file" -msgstr "Geben Sie den Pfad zur Textdatei ein" +msgstr "Geben sie den Pfad zur Textdatei ein" #: mod_configure.erl:993 msgid "Import User from File at " @@ -326,7 +327,7 @@ msgstr "Benutzer aus dieser Datei importieren " #: mod_configure.erl:997 msgid "Enter path to jabberd14 spool file" -msgstr "Geben Sie den Pfad zur jabberd14 spool Datei ein" +msgstr "Geben sie den Pfad zur jabberd14 spool Datei ein" #: mod_configure.erl:1007 msgid "Import Users from Dir at " @@ -334,7 +335,7 @@ msgstr "Benutzer vom Verzeichnis importieren " #: mod_configure.erl:1011 msgid "Enter path to jabberd14 spool dir" -msgstr "Geben Sie den Pfad zum jabberd14 spool Verzeichnis ein" +msgstr "Geben sie den Pfad zum jabberd14 spool Verzeichnis ein" #: mod_configure.erl:1012 msgid "Path to Dir" @@ -363,14 +364,14 @@ msgstr "Zugangsregeln" #: mod_configure.erl:1168 mod_configure.erl:1190 mod_configure.erl:1202 #: mod_configure.erl:1214 mod_configure.erl:1226 mod_configure.erl:1243 #: mod_configure.erl:1255 mod_configure.erl:1620 mod_configure.erl:1670 -#: mod_configure.erl:1691 mod_roster.erl:822 mod_roster_odbc.erl:922 -#: mod_vcard.erl:462 mod_vcard_ldap.erl:546 mod_vcard_odbc.erl:437 +#: mod_configure.erl:1691 mod_roster.erl:948 mod_roster_odbc.erl:1049 +#: mod_vcard.erl:465 mod_vcard_ldap.erl:550 mod_vcard_odbc.erl:440 msgid "Jabber ID" msgstr "Jabber ID" #: mod_configure.erl:1173 mod_configure.erl:1231 mod_configure.erl:1621 -#: mod_configure.erl:1833 mod_muc/mod_muc_room.erl:2801 -#: web/ejabberd_web_admin.erl:1364 +#: mod_configure.erl:1833 mod_muc/mod_muc_room.erl:2849 +#: web/ejabberd_web_admin.erl:1501 msgid "Password" msgstr "Passwort" @@ -386,11 +387,11 @@ msgstr "Anzahl der registrierten Benutzer" msgid "Number of online users" msgstr "Anzahl der angemeldeten Benutzer" -#: mod_configure.erl:1652 web/ejabberd_web_admin.erl:1430 +#: mod_configure.erl:1652 web/ejabberd_web_admin.erl:1567 msgid "Never" msgstr "Nie" -#: mod_configure.erl:1666 web/ejabberd_web_admin.erl:1444 +#: mod_configure.erl:1666 web/ejabberd_web_admin.erl:1581 msgid "Online" msgstr "Angemeldet" @@ -400,7 +401,7 @@ msgstr "Letzte Anmeldung" #: mod_configure.erl:1692 msgid "Roster size" -msgstr "Kontaktlistengrösse" +msgstr "Kontaktlistengröße" #: mod_configure.erl:1693 msgid "IP addresses" @@ -408,11 +409,11 @@ msgstr "IP Addresse" #: mod_configure.erl:1694 msgid "Resources" -msgstr "Resource" +msgstr "Ressourcen" #: mod_configure.erl:1820 msgid "Administration of " -msgstr "Administration der " +msgstr "Administration von " #: mod_configure.erl:1823 msgid "Action on user" @@ -422,243 +423,304 @@ msgstr "Aktion auf Benutzer" msgid "Edit Properties" msgstr "Einstellungen ändern" -#: mod_configure.erl:1830 web/ejabberd_web_admin.erl:1556 +#: mod_configure.erl:1830 web/ejabberd_web_admin.erl:1695 msgid "Remove User" msgstr "Benutzer löschen" -#: mod_irc/mod_irc.erl:198 mod_muc/mod_muc.erl:335 +#: mod_irc/mod_irc.erl:201 mod_muc/mod_muc.erl:335 msgid "Access denied by service policy" msgstr "Zugang aufgrund der Dienstrichtlinien verweigert" -#: mod_irc/mod_irc.erl:311 +#: mod_irc/mod_irc.erl:400 msgid "IRC Transport" msgstr "IRC Transport" -#: mod_irc/mod_irc.erl:323 +#: mod_irc/mod_irc.erl:427 msgid "ejabberd IRC module" msgstr "ejabberd IRC Modul" -#: mod_irc/mod_irc.erl:441 +#: mod_irc/mod_irc.erl:557 msgid "You need an x:data capable client to configure mod_irc settings" msgstr "" "Sie benötigen einen Client, der x:data unterstützt, um die mod_irc " "Einstellungen zu konfigurieren" -#: mod_irc/mod_irc.erl:448 +#: mod_irc/mod_irc.erl:564 msgid "Registration in mod_irc for " msgstr "Registrierung in mod_irc für " -#: mod_irc/mod_irc.erl:453 +#: mod_irc/mod_irc.erl:569 msgid "" -"Enter username and encodings you wish to use for connecting to IRC servers" +"Enter username, encodings, ports and passwords you wish to use for " +"connecting to IRC servers" msgstr "" -"Geben Sie Benutzernamen und Kodierung für die Verbindung zum IRC Server an" +"Geben sie Benutzernamen, Kodierungen, Ports und Passwörter für die " +"Verbindung zu IRC Servern an" -#: mod_irc/mod_irc.erl:458 +#: mod_irc/mod_irc.erl:574 msgid "IRC Username" msgstr "IRC Benutzername" -#: mod_irc/mod_irc.erl:468 +#: mod_irc/mod_irc.erl:584 +msgid "" +"If you want to specify different ports, passwords, encodings for IRC " +"servers, fill this list with values in format '{\"irc server\", \"encoding" +"\", port, \"password\"}'. By default this service use \"~s\" encoding, port &