Fix release date of ejabberd 2.0.2 to 28 August 2008

SVN Revision: 1557
* src/ejabberd.app: Fix version number to 2.0.2
2008-08-30 11:17:03 +00:00 · 2008-08-30 11:13:06 +00:00 · 2008-08-27 16:35:26 +00:00 · 2008-08-27 16:33:06 +00:00 · 2008-08-27 09:25:24 +00:00 · 2008-08-26 14:26:56 +00:00
188 changed files with 4569 additions and 3162 deletions
@@ -1,3 +1,459 @@
+2008-08-30  Badlop  <badlop@process-one.net>
+
+	* src/ejabberd.app: Fix version number to 2.0.2
+
+2008-08-27  Christophe Romain  <christophe.romain@process-one.net>
+
+	* src/mod_pubsub/mod_pubsub.erl: send last published events now supports
+	PEP events from unavailable users nodes (EJAB-698)
+	* src/ejabberd_c2s.erl: Likewise
+
+2008-08-26  Badlop  <badlop@process-one.net>
+
+	* doc/release_notes_2.0.2.txt: Update for final release
+
+	* doc/guide.tex: Windows binary installer requires MSVC++ 5
+	* doc/guide.html: Likewise
+
+2008-08-26  Christophe Romain  <christophe.romain@process-one.net>
+
+	* src/mod_pubsub/mod_pubsub.erl: get_items bugfix (EJAB-716)
+
+2008-08-25  Christophe Romain  <christophe.romain@process-one.net>
+
+	* src/mod_privacy_odbc.erl: Prevent case_clause error when
+	ejabber_odbc:sql_query returns {error, Reason}
+	* src/mod_vcard_odbc.erl: Likewise
+	* src/mod_last_odbc.erl: Likewise
+	* src/mod_offline_odbc.erl: Likewise
+
+2008-08-25  Badlop  <badlop@process-one.net>
+
+	* src/ejabberd_check.erl: Detect correctly MSSQL and ODBC
+	configuration (EJAB-710)
+
+2008-08-24  Geoff Cant  <gcant@process-one.net>
+
+	* src/mod_mud/mod_muc_room.erl: is_visitor/2 fix - use get_role
+	not get_affiliation
+
+2008-08-22  Badlop  <badlop@process-one.net>
+
+	* src/ejabberd_router.erl: Fix call to mnesia match_object
+
+2008-08-21  Badlop  <badlop@process-one.net>
+
+	* doc/guide.tex: Fix names of chatroom to room, user to occupant
+	* doc/guide.html: Likewise
+
+2008-08-18  Badlop  <badlop@process-one.net>
+
+	* src/mod_register.erl: Change password using mod_register always
+	returns success regardless of real result (EJAB-723)
+	* src/ejabberd_auth.erl: Likewise
+	* src/ejabberd_auth_external.erl: Likewise
+	* src/ejabberd_auth_internal.erl: Likewise
+	* src/ejabberd_auth_odbc.erl: Likewise
+
+2008-08-16  Badlop  <badlop@process-one.net>
+
+	* src/msgs/sv.msg: Fixed formatting typos
+
+	* src/gen_mod.erl: Export stop_module_keep_config/2 (EJAB-706)
+
+2008-08-13  Badlop  <badlop@process-one.net>
+
+	* doc/guide.tex: Explain that LDAP is read-only storage (thanks to
+	Evgeniy Khramtsov)
+	* doc/guide.html: Likewise
+
+2008-08-10  Badlop  <badlop@process-one.net>
+
+	* src/msgs/eo.msg: Updated (thanks to Andreas van Cranenburgh)
+	* src/msgs/nl.msg: Updated (thanks to Andreas van Cranenburgh)
+	* src/msgs/sk.msg: Updated (thanks to Marek Becka)
+	* src/msgs/sv.msg: Updated (thanks to Thore Alstromer and Heysan)
+
+2008-08-09  Badlop  <badlop@process-one.net>
+
+	* src/ejabberd_service.erl: Fix XEP-0114 compliance: define xmlns
+	in header of error response; include in response the JID of served
+	component not server (thanks to Sergei Golovan)(EJAB-717)
+
+2008-08-01  Badlop  <badlop@process-one.net>
+
+	* doc/release_notes_2.0.2.txt: Added for ejabberd 2.0.2-beta1
+
+	* src/web/ejabberd_http.erl: Temporary solution for check of
+	packet size when HTTPS (EJAB-611)(EJAB-507)(EJAB-574)
+
+2008-07-31  Badlop  <badlop@process-one.net>
+
+	* doc/guide.tex: Update Process-one name to ProcessOne (EJAB-708)
+	* doc/guide.html: Likewise
+	* doc/api/overview.edoc: Likewise
+	* src/*/*.erl: Likewise
+	* src/*/*.hrl: Likewise
+	* src/*/*.c: Likewise
+	* src/odbc/*.sql: Likewise
+
+2008-07-30  Badlop  <badlop@process-one.net>
+
+	* src/mod_muc/mod_muc_room.erl: Support Reasons for all
+	affiliation and role changes (EJAB-306)
+
+	* src/gen_mod.erl: When ejabberd is kindly stopped, don't forget
+	modules configuration (EJAB-706)
+	* src/ejabberd_app.erl: Likewise
+
+	* src/msgs/uk.msg: Fix: each string in a single line
+	* src/msgs/wa.msg: Likewise
+
+	* src/msgs/es.msg: Fix typo
+	* src/msgs/gl.msg: Likewise
+	* src/msgs/pt-br.msg: Likewise
+
+	* src/msgs/zh.msg: Fix some translations (thanks to Zhan Caibao)
+
+2008-07-29  Badlop  <badlop@process-one.net>
+
+	* src/msgs/ca.msg: Updated (thanks to Badlop)
+	* src/msgs/cs.msg: Updated (thanks to Lukas Poliuvk)
+	* src/msgs/de.msg: Updated (thanks to Nikolaus Polak)
+	* src/msgs/es.msg: Updated (thanks to Badlop)
+	* src/msgs/fr.msg: Updated (thanks to Christophe Romain)
+	* src/msgs/it.msg: Updated (thanks to Luca Brivio)
+	* src/msgs/ja.msg: Updated (thanks to Tsukasa Hamano)
+	* src/msgs/no.msg: Updated (thanks to Stian B. Barmen)
+	* src/msgs/pl.msg: Updated (thanks to Zbyszek Zolkiewski)
+	* src/msgs/pt-br.msg: Updated (thanks to Otavio Fernandes)
+	* src/msgs/ru.msg: Updated (thanks to Evgeniy Khramtsov)
+	* src/msgs/tr.msg: Updated (thanks to Doruk Fisek)
+	* src/msgs/uk.msg: Updated (thanks to Ruslan Rakhmanin)
+	* src/msgs/wa.msg: Updated (thanks to Pablo Saratxaga)
+	* src/msgs/zh.msg: Updated (thanks to Shelley Shyan)
+
+2008-07-28  Badlop  <badlop@process-one.net>
+
+	* doc/guide.tex: Document how to get error message when ejabberd
+	crash dumps at start (EJAB-660)
+	* doc/guide.html: Likewise
+
+	* src/mod_muc/mod_muc_room.erl: Add 'description' to the
+	mod_muc_room config record; it will be used in ejabberd 2.1.x
+	branch (EJAB-670)
+
+2008-07-25  Christophe Romain  <christophe.romain@process-one.net>
+
+	* src/mod_pubsub/mod_pubsub.erl: Speedup startup with many pubsub
+	nodes (EJAB-669)
+	* src/mod_pubsub/nodetree_default.erl: Likewise
+
+2008-07-24  Badlop  <badlop@process-one.net>
+
+	* doc/guide.tex: Include example PAM configuration file
+	ejabberd.pam (thanks to Evgeniy Khramtsov)(EJAB-704)
+	* doc/guide.html: Likewise
+
+	* src/mod_proxy65/mod_proxy65_lib.erl: Send protocol compliant
+	SOCKS5 reply; this breaks support of uncompliant Psi<0.10 (thanks
+	to Felix Geyer)(EJAB-632)
+	* src/mod_proxy65/mod_proxy65_stream.erl: Likewise
+
+	* src/mod_register.erl: When a registration is blocked due to IP
+	limitation, return description in error stanza (EJAB-692)
+	
+2008-07-24  Christophe Romain  <christophe.romain@process-one.net>
+
+	* src/mod_pubsub/mod_pubsub.erl: Allow owner to subscribe/get its own
+	node (EJAB-705)
+
+2008-07-24  Badlop  <badlop@process-one.net>
+
+	* src/Makefile.in: Support for parallel compilation with 'make -j'
+	in multi core CPUs: fix compilation dependencies; compile
+	behaviors before other source code (EJAB-697)(thanks to Jonathan
+	Schleifer)
+	* src/mod_pubsub/Makefile.in: Likewise
+	* src/eldap/Makefile.in: Likewise
+
+	* doc/guide.tex: Document room options allow_visitor_nickchange
+	and allow_visitor_status (EJAB-624)
+	* doc/guide.html: Likewise
+
+2008-07-23  Geoff Cant  <geoff.cant@process-one.net>
+
+	* src/mod_muc/mod_muc_room.erl: new room options,
+	allow_visitor_presence and allow_visitor_nickchange to
+	block/enable visitors to broadcast presence updates to the room
+	(EJAB-624).
+	* src/mod_muc/mod_muc_room.erl: renaming allow_visitor_presence to
+	allow_visitor_status and altering effect (when false) to remove
+	custom status tags in presence broadcasts to muc rooms by
+	visitors.
+
+2008-07-23  Christophe Romain  <christophe.romain@process-one.net>
+
+	* src/mod_pubsub/mod_pubsub.erl: remove_user hook removes
+	subscriptions (EJAB-684), send the last published and not the
+	first published item (EJAB-675), remove the pubsub/nodes tree,
+	subscribing to a node sends only last items (EJAB-700)
+	* src/mod_pubsub/node_pep.erl: added acl and jid match on node
+	creation permission (EJAB-663)
+	* src/mod_pubsub/node_default.erl: fix node creation permission 
+	issue for service
+
+2008-07-22  Badlop  <badlop@process-one.net>
+
+	* src/ejabberd_config.erl: If syntax mistake in config file, show
+	specific error message (EJAB-616)
+
+2008-07-17  Badlop  <badlop@process-one.net>
+
+	* src/mod_muc/mod_muc_room.erl: Fix to allow a server admin to add
+	himself as owner of a room (EJAB-687)
+
+	* src/Makefile.in: ejabberctl doesn't use the erl found by the
+	configure script (EJAB-676)
+	* src/ejabberdctl.template: Likewise
+
+2008-07-17  Christophe Romain  <christophe.romain@process-one.net>
+
+	* src/web/Makefile.in: use -DSSL39 if compiling with R12 
+
+2008-07-16  Badlop  <badlop@process-one.net>
+
+	* src/ejabberd_c2s.erl: Put auth_module in Info always (EJAB-549)
+
+2008-07-16  Alexey Shchepin  <alexey@process-one.net>
+
+	* src/web/ejabberd_http_poll.erl: Report connection's IP address 
+
+	* src/ejabberd_c2s.erl: Rolled back the previous IP getting patch
+	* src/ejabberd_sm.erl: Likewise
+	* src/ejabberd_receiver.erl: Likewise
+	* src/web/ejabberd_http_poll.erl: Likewise
+
+2008-07-16  Badlop  <badlop@process-one.net>
+
+	* doc/guide.tex: Improve explanation of option 'hosts' in
+	ejabberd_service
+	* doc/guide.html: Likewise
+
+2008-07-12  Badlop  <badlop@process-one.net>
+
+	* src/configure.ac: Improve legibility
+	* src/aclocal.m4: Likewise
+	* src/configure: Likewise
+
+	* src/ejabberdctl.template: Remove garbage variable. Document node
+	option
+
+	* doc/guide.tex: Add references to sections.
+	* doc/guide.html: Likewise
+
+2008-07-11  Badlop  <badlop@process-one.net>
+
+	* doc/guide.tex: Document how to insert a newline character in
+	welcome_message (EJAB-501)
+	* src/ejabberd.cfg.example: Likewise
+
+2008-07-11  Christophe Romain  <christophe.romain@process-one.net>
+
+	* src/ejabberd_c2s.erl: Backport C2S blacklist support from trunk
+	was (EJAB-625).
+	* src/mod_ip_blacklist.erl: Likewise
+	* src/jlib.erl: Added IP format tuple to string function
+	* src/ejabberd_socket.erl: Properly handled c2s start failure (happen
+	for blacklisted IP).
+
+2008-07-10  Badlop  <badlop@process-one.net>
+
+	* src/configure.ac: Don't check for erlang header file (EJAB-232)
+	* src/configure: Likewise
+
+2008-07-09  Badlop  <badlop@process-one.net>
+
+	* src/configure.ac: Check for erlang header files (EJAB-232)
+	* src/configure: Likewise
+
+	* src/mod_pubsub/mod_pubsub.erl: Fix compilator warnings
+
+	* src/mod_muc/mod_muc_log.erl: Fix XHTML compliance: ensure some
+	language is set, include ID attribute in each message, add
+	microseconds to ensure unique value (EJAB-497)
+
+	* src/ejabberd_config.erl (load_file): error message on sasl.log
+	is not flattened (EJAB-616)
+
+	* doc/guide.tex: mod_muc_log XMPP URI supports the updated version
+	RFC 5122 (EJAB-631)
+	* doc/guide.html: Likewise
+
+2008-07-08  Badlop  <badlop@process-one.net>
+
+	* tools/ejabberdctl: Work also when 'which' is unavailable
+
+2008-07-08  Christophe Romain  <christophe.romain@process-one.net>
+
+	* src/web/ejabberd_http_poll.erl: improve ip fetching patch
+
+2008-07-07  Badlop  <badlop@process-one.net>
+
+	* src/Makefile.in: Spool, config and log dirs: writtable by owner,
+	readable by group, nothing by others (EJAB-686)
+	* doc/guide.tex: New section Securing sensible files
+	* doc/guide.html: Likewise
+
+	* doc/guide.tex: Solaris Makefile install: use ginstall (thanks to
+	Jonathan Auer)(EJAB-649)
+	* doc/guide.html: Likewise
+
+2008-07-03  Jerome Sautret  <jerome.sautret@process-one.net>
+
+	* src/mod_privacy_odbc.erl: Support for privacy lists in MySQL
+	(thanks to Igor Goryachev)(EJAB-538)
+
+2008-07-03  Christophe Romain  <christophe.romain@process-one.net>
+
+	* src/mod_pubsub/mod_pubsub.erl: Fix permission control on item
+	retrieve (EJAB-453)
+	* src/mod_pubsub/node_dispatch.erl: Likewise
+	* src/mod_pubsub/node_buddy.erl: Likewise
+	* src/mod_pubsub/node_private.erl: Likewise
+	* src/mod_pubsub/node_public.erl: Likewise
+	* src/mod_pubsub/node_default.erl: Likewise
+	* src/mod_pubsub/node_pep.erl: Likewise
+	* src/mod_pubsub/node_club.erl: Likewise
+	* src/mod_pubsub/gen_pubsub_node.erl: Likewise
+	* src/mod_pubsub/node.template: Likewise
+
+	* src/mod_pubsub/mod_pubsub.erl: Allow subscriber to request specific
+	items by ItemID; Allow to retrieve pubsub#title configuration (thanks
+	to Kevin Crosbie); Fix forbidden result on setting
+	affiliation/subscription
+
+	* src/ejabberd_local.erl: prevent iq_response table overload
+	(EJAB-608)
+	* src/mod_caps.erl: Likewise
+
+	* src/web/ejabberd_http.erl: Retrieve correct IP from http connection
+	* src/web/ejabberd_http_poll.erl: Likewise
+	* src/ejabberd_receiver.erl: Likewise
+	* src/ejabberd_sm.erl: Likewise
+	* src/ejabberd_c2s.erl: Likewise
+
+	* src/web/ejabberd_http_poll.erl: Fixed HTTP headers when a
+	requested session doesn't exist (backport from trunk r1223)
+
+2008-06-29  Badlop  <badlop@process-one.net>
+
+	* src/ejabberd_ctl.erl: Web Admin and Ad-hoc admin: dump only
+	persistent tables (EJAB-678)
+
+	* src/mod_pubsub/node_pep.erl: Complain if mod_caps disabled and
+	mod_pubsub has PEP plugin enabled (EJAB-677)
+
+2008-06-21  Badlop  <badlop@process-one.net>
+
+	* doc/guide.tex: Explain that S2S outgoing first tries IPv4 and if
+	that fails then tries IPv6
+	* doc/guide.html: Likewise
+
+2008-06-18  Badlop  <badlop@process-one.net>
+
+	* src/ejabberd.app: The ejabberd version number is defined in the
+	OTP application resource file, in the key 'vsn' (EJAB-657)
+	* src/ejabberd.hrl: The macro VERSION now consults the ejabberd
+	application key vsn
+	* src/configure.erl: Load the ejabberd application description
+	* doc/Makefile: Read ejabberd version from ejabberd.app vsn
+	* doc/api/Makefile: Likewise
+
+2008-06-18  Christophe Romain  <christophe.romain@process-one.net>
+
+	* src/mod_pubsub/mod_pubsub.erl: get_default bugfix (EJAB-656)
+
+2008-06-13  Badlop  <badlop@process-one.net>
+
+	* src/ejabberd.cfg.example: Add registration_timeout (EJAB-653)
+
+	* doc/guide.tex: Table of listener modules converted to
+	description. Table of modules overview simplified, and module
+	names link to their sections. Document
+	ldap_local_filter (EJAB-179). Title in HTML is shorter.
+	Update several external URIs.
+
+	* doc/guide.html: Regenerated with all the latest changes
+
+2008-06-12  Badlop  <badlop@process-one.net>
+
+	* doc/guide.tex: Permanent reference URL for sections (EJAB-651).
+	Changes in CSS: verbatim text is indented and has grey background;
+	descriptions are indented; table borders are softer. Fix
+	indentation of verbatim text.
+
+2008-06-08  Badlop  <badlop@process-one.net>
+
+	* doc/guide.tex: Small fixes (thanks to Christoph Anton Mitterer)
+	* doc/introduction.tex: Likewise
+	* doc/guide.html: Likewise
+
+2008-06-05  Badlop  <badlop@process-one.net>
+
+	* doc/guide.tex: Document ejabberdctl status code (EJAB-633)
+	* doc/guide.html: Likewise
+
+2008-06-04  Badlop  <badlop@process-one.net>
+
+	* src/msgs/pl.msg: Bugfix in arguments of translated string that
+	could crash the room (thanks to Anastasia Gornostaeva)
+
+2008-05-31  Badlop  <badlop@process-one.net>
+
+	* src/web/ejabberd_web.erl (make_xhtml/2): Allow to include
+	elements in the HTTP header
+
+	* src/odbc/odbc_queries.erl (del_user_return_password): Return
+	password (thanks to Oleg Palij)
+
+2008-05-22  Badlop  <badlop@process-one.net>
+
+	* README: R12 support: remove compilation warning (EJAB-630)
+
+2008-05-19  Badlop  <badlop@process-one.net>
+
+	* doc/guide.html: Updated
+	* doc/dev.html: Likewise
+	* doc/features.html: Likewise
+	* doc/version.tex: Likewise
+
+	* src/ejabberd.hrl: Version is 2.0.x
+
+	* src/configure.ac: R12 support: remove compilation
+	warning (EJAB-630)
+	* src/configure: Likewise
+	* doc/guide.tex: Likewise
+
+	* doc/guide.tex: Describe how to disable registration
+	limitation (EJAB-614)
+
+2008-05-16  Christophe Romain <christophe.romain@process-one.net>
+
+	* src/ejabberd_receiver.erl: Don't activate a socket untill its
+	receiver process is controlling it (Thanks to Aleksey)
+
+	* src/ejabberd_s2s_out.erl: Change FSMTIMEOUT to 30s
+
+2008-05-12  Badlop  <badlop@process-one.net>
+
+	* src/mod_muc/mod_muc_room.erl: Return Forbidden error message
+	when user sends private message in a room that disallows
+	it (EJAB-595)
+
+	* src/web/ejabberd_http.erl (parse_auth): Allow password that
+	include colon character (EJAB-622)
+
 2008-04-30  Christophe Romain <christophe.romain@process-one.net>

 	* src/mod_caps.erl: XEP-0115 patch (EJAB-618)
@@ -132,7 +588,7 @@
 	* doc/webadmmainru.png: Likewise

 	* doc/disco.png: Removed because not used
-	
+
 	* doc/guide.tex: Fix Latex reference to webadmin section. Update
 	explanation of screenshots. Update xmpp addresses of Mickael
 	Remond and Sander Devrieze.
@@ -227,7 +683,7 @@

 	* src/eldap.erl: Faster LDAP reconnection (Thanks to Christophe
 	Romain) (EJAB-581)
-					 
+
 2008-03-17  Mickael Remond  <mremond@process-one.net>

 	* src/ejabberd_s2s.erl: Only trigger s2s_connect_hook on
@@ -313,7 +769,7 @@
 	configuration sanity checks (EJAB-533)
 	* src/src/ejabberd_app.erl: Likewise
 	* src/ejabberd_app.erl: Likewise
-	
+
 2008-02-26  Badlop  <badlop@process-one.net>

 	* src/msgs/it.msg: Updated (thanks to Smart2128)
@@ -354,7 +810,7 @@
 	* src/msgs/no.msg: Updated (thanks to Stian B. Barmen)
 	* src/msgs/pt-br.msg: Updated (thanks to Otavio Fernandes)
 	* src/msgs/uk.msg: Updated (thanks to Stoune and Ruslan Rakhmanin)
-	
+
 2008-02-19  Christophe Romain <christophe.romain@process-one.net>

 	* src/odbc/ejabberd_odbc.erl: add pgsql driver monitoring
@@ -501,7 +957,7 @@
 	* src/ejabberd.hrl: Likewise

 	* doc/introduction.tex: Updated to 22 languages
-	
+
 	* doc/Makefile: Ensure that Bash is used

 	* doc/guide.tex: Updated copyright dates to 2008.
@@ -9,9 +9,7 @@ To compile ejabberd you need:
 - GNU Make
 - GCC
 - libexpat 1.95 or higher
- - Erlang/OTP R10B-9 up to R11B-5. Erlang R12 releases are not yet
-   officially supported, and are not recommended for production
-   servers
+ - Erlang/OTP R10B-9 or newer
 - OpenSSL 0.9.6 or higher, for STARTTLS, SASL and SSL
   encryption. Optional, highly recommended.
 - Zlib 1.2.3 or higher, for Stream Compression support
@@ -1,5 +1,5 @@
 % List of ejabberd-modules to add for ejabberd packaging (source archive and installer)
 %
 % HTTP-binding:
-https://svn.process-one.net/ejabberd-modules/http_bind/tags/ejabberd-2.0.0
-https://svn.process-one.net/ejabberd-modules/mod_http_fileserver/tags/ejabberd-2.0.0
+https://svn.process-one.net/ejabberd-modules/http_bind/trunk
+https://svn.process-one.net/ejabberd-modules/mod_http_fileserver/trunk
@@ -21,7 +21,7 @@ release:
 	@echo "Press any key to continue"
 	@read foo
 	@echo "% ejabberd version (automatically generated)." > version.tex
-	@echo "\newcommand{\version}{"`sed '/VERSION/!d;s/\(.*\)"\(.*\)"\(.*\)/\2/' ../src/ejabberd.hrl`"}" >> version.tex
+	@echo "\newcommand{\version}{"`sed '/vsn/!d;s/\(.*\)"\(.*\)"\(.*\)/\2/' ../src/ejabberd.app`"}" >> version.tex
 	@echo -n "% Contributed modules (automatically generated)."  > contributed_modules.tex
 	@echo -e "$(CONTRIBUTED_MODULES)" >> contributed_modules.tex

@@ -1,5 +1,5 @@
 APPNAME = ejabberd
-VSN = SVN
+VSN = $(shell sed '/vsn/!d;s/\(.*\)"\(.*\)"\(.*\)/\2/' ../../src/ejabberd.app)

 DOCDIR=.
 SRCDIR=../../src
@@ -1,6 +1,6 @@
@author Mickael Remond <mickael.remond@process-one.net>
  [http://www.process-one.net/]
-@copyright 2007 Process-one
+@copyright 2007 ProcessOne
@version {@vsn}, {@date} {@time}
@title ejabberd Development API Documentation

@@ -2,7 +2,7 @@
            "http://www.w3.org/TR/REC-html40/loose.dtd">
 <HTML>
 <HEAD>
-<TITLE>Ejabberd 2.0.0 Developers Guide
+<TITLE>Ejabberd 2.0.x Developers Guide
 </TITLE>

 <META http-equiv="Content-Type" content="text/html; charset=US-ASCII">
@@ -49,7 +49,7 @@ TD P{margin:0px;}
 <!--HEVEA command line is: /usr/bin/hevea -fix -pedantic dev.tex -->
 <!--CUT DEF section 1 --><P><A NAME="titlepage"></A>

-</P><TABLE CLASS="title"><TR><TD><H1 CLASS="titlemain">Ejabberd 2.0.0 Developers Guide</H1><H3 CLASS="titlerest">Alexey Shchepin<BR>
+</P><TABLE CLASS="title"><TR><TD><H1 CLASS="titlemain">Ejabberd 2.0.x Developers Guide</H1><H3 CLASS="titlerest">Alexey Shchepin<BR>
 <A HREF="mailto:alexey@sevcom.net"><TT>mailto:alexey@sevcom.net</TT></A><BR>
 <A HREF="xmpp:aleksey@jabber.ru"><TT>xmpp:aleksey@jabber.ru</TT></A></H3></TD></TR>
 </TABLE><DIV CLASS="center">
@@ -139,7 +139,7 @@ Support for virtual hosting.
 </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">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-00163.html">Personal Eventing via Pubsub</A>.
+</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">IRC transport.
 </LI><LI CLASS="li-itemize">Component support: interface with networks such as AIM, ICQ and MSN installing special tranports.
@@ -2,7 +2,7 @@
            "http://www.w3.org/TR/REC-html40/loose.dtd">
 <HTML>
 <HEAD>
-<TITLE>Ejabberd 2.0.0 Feature Sheet
+<TITLE>Ejabberd 2.0.x Feature Sheet
 </TITLE>

 <META http-equiv="Content-Type" content="text/html; charset=US-ASCII">
@@ -50,7 +50,7 @@ SPAN{width:20%; float:right; text-align:left; margin-left:auto;}
 <!--HEVEA command line is: /usr/bin/hevea -fix -pedantic features.tex -->
 <!--CUT DEF section 1 --><P><A NAME="titlepage"></A>

-</P><TABLE CLASS="title"><TR><TD><H1 CLASS="titlemain">Ejabberd 2.0.0 Feature Sheet</H1><H3 CLASS="titlerest">Sander Devrieze<BR>
+</P><TABLE CLASS="title"><TR><TD><H1 CLASS="titlemain">Ejabberd 2.0.x Feature Sheet</H1><H3 CLASS="titlerest">Sander Devrieze<BR>
 <A HREF="mailto:s.devrieze@pandora.be"><TT>mailto:s.devrieze@pandora.be</TT></A><BR>
 <A HREF="xmpp:sander@devrieze.dyndns.org"><TT>xmpp:sander@devrieze.dyndns.org</TT></A></H3></TD></TR>
 </TABLE><DIV CLASS="center">
@@ -118,7 +118,7 @@ Support for virtual hosting.
 </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">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-00163.html">Personal Eventing via Pubsub</A>.
+</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">IRC transport.
 </LI><LI CLASS="li-itemize">Component support: interface with networks such as AIM, ICQ and MSN installing special tranports.
@@ -125,7 +125,7 @@ Moreover, \ejabberd{} comes with a wide range of other state-of-the-art features
 \item IPv6 support both for c2s and s2s connections.
 \item \txepref{0045}{Multi-User Chat} module with support for clustering and HTML logging. %%\improved{}
 \item Users Directory based on users vCards.
-\item \txepref{0060}{Publish-Subscribe} component with support for \txepref{00163}{Personal Eventing via Pubsub}.
+\item \txepref{0060}{Publish-Subscribe} component with support for \txepref{0163}{Personal Eventing via Pubsub}.
 \item Support for web clients: \txepref{0025}{HTTP Polling} and \txepref{0206}{HTTP Binding (BOSH)} services.
 \item IRC transport.
 \item Component support: interface with networks such as AIM, ICQ and MSN installing special tranports.
@@ -0,0 +1,30 @@
+
+                              Release Notes
+                             ejabberd 2.0.1
+                               20 May 2008
+
+  ejabberd 2.0.1 is a bugfix release for ejabberd 2.0.x branch.
+
+  ejabberd 2.0.1 includes 10 improvements and 32 bugfixes.
+  A complete list of changes can be retrieved from:
+     http://redir.process-one.net/ejabberd-2.0.1
+
+  The new code can be downloaded from ejabberd download page:
+     http://www.process-one.net/en/projects/ejabberd/
+
+
+   Recent changes include:
+
+- Erlang R12 support.
+- Better LDAP handling.
+- PubSub bugfixes.
+- Documentation improvements.
+- inband registration limitation per IP.
+- s2s improvements.
+
+Bugs report
+
+  You can officially report bugs on Process-one support site:
+  http://support.process-one.net/
+
+END
@@ -0,0 +1,34 @@
+
+                              Release Notes
+                             ejabberd 2.0.2
+                             28 August 2008
+
+  ejabberd 2.0.2 is the second bug fix release for ejabberd 2.0.x branch.
+
+  ejabberd 2.0.2 includes many bugfixes and a few improvements.
+  A complete list of changes can be retrieved from:
+     http://redir.process-one.net/ejabberd-2.0.2
+
+  The new code can be downloaded from ejabberd download page:
+     http://www.process-one.net/en/ejabberd/
+
+
+  Recent changes include:
+
+- Anti-abuse feature: client blacklist support by IP.
+- Guide: new section Securing ejabberd; improved usability.
+- LDAP filter optimisation: ability to filter user in ejabberd and not LDAP.
+- MUC improvements: room options to restrict visitors; broadcast reasons.
+- Privacy rules: fix MySQL storage.
+- Pub/Sub and PEP: many improvements in implementation and protocol compliance.
+- Proxy65: send valid SOCKS5 reply (removed support for Psi < 0.10).
+- Web server embedded: better support for HTTPS.
+- Binary installers: SMP on Windows; don't remove config when uninstalling.
+
+
+  Bug reports
+
+  You can officially report bugs on ProcessOne support site:
+  http://support.process-one.net/
+
+END
@@ -1,2 +1,2 @@
 % ejabberd version (automatically generated).
-\newcommand{\version}{2.0.0}
+\newcommand{\version}{2.0.x}
@@ -51,13 +51,16 @@ exec_prefix = @exec_prefix@
 SUBDIRS = @mod_irc@ @mod_pubsub@ @mod_muc@ @mod_proxy65@ @eldap@ @pam@ @web@ stringprep @tls@ @odbc@ @ejabberd_zlib@
 ERLSHLIBS = expat_erl.so
 ERLBEHAVS = cyrsasl.erl gen_mod.erl p1_fsm.erl
-SOURCES = $(ERLBEHAVS) $(wildcard *.erl)
+SOURCES_ALL = $(wildcard *.erl)
+SOURCES = $(filter-out $(ERLBEHAVS),$(SOURCES_ALL))
+ERLBEHAVBEAMS = $(ERLBEHAVS:.erl=.beam)
 BEAMS = $(SOURCES:.erl=.beam)

 DESTDIR =

 EJABBERDDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
 BEAMDIR = $(EJABBERDDIR)/ebin
+SPOOLDIR = $(EJABBERDDIR)/db
 PRIVDIR = $(EJABBERDDIR)/priv
 SODIR = $(PRIVDIR)/lib
 PBINDIR = $(PRIVDIR)/bin
@@ -75,7 +78,11 @@ endif

 all: $(ERLSHLIBS) compile-beam all-recursive

-compile-beam: XmppAddr.hrl $(BEAMS)
+compile-beam: XmppAddr.hrl $(ERLBEHAVBEAMS) $(BEAMS)
+
+$(BEAMS): $(ERLBEHAVBEAMS)
+
+all-recursive: $(ERLBEHAVBEAMS)

 %.beam:       %.erl
 	@ERLC@ -W $(ERLC_FLAGS) $<
@@ -107,20 +114,21 @@ install: all
 	install -m 644 *.beam $(BEAMDIR)
 	rm -f $(BEAMDIR)/configure.beam
 	install -m 644 *.app $(BEAMDIR)
+	install -d -m 750 $(SPOOLDIR)
 	install -d $(SODIR)
 	install -d $(PBINDIR)
 	install -m 644 *.so $(SODIR)
 	$(INSTALL_EPAM)
 	install -d $(MSGSDIR)
 	install -m 644 msgs/*.msg $(MSGSDIR)
-	install -d $(ETCDIR)
+	install -d -m 750 $(ETCDIR)
 	[ -f $(ETCDIR)/ejabberd.cfg ] && install -b -m 644 ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg-new || install -b -m 644 ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg
-	sed -e "s*@rootdir@*@prefix@*" ejabberdctl.template > ejabberdctl.example
+	sed -e "s*@rootdir@*@prefix@*" -e "s*@erl@*@ERL@*" ejabberdctl.template > ejabberdctl.example
 	[ -f $(ETCDIR)/ejabberdctl.cfg ] && install -b -m 644 ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new || install -b -m 644 ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
 	install -b -m 644 inetrc $(ETCDIR)/inetrc
 	install -d $(SBINDIR)
 	install -m 755 ejabberdctl.example $(SBINDIR)/ejabberdctl
-	install -d $(LOGDIR)
+	install -d -m 750 $(LOGDIR)

 uninstall: uninstall-binary

@@ -5,7 +5,7 @@
 %%% Created : 18 Jan 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -1,6 +1,6 @@
 AC_DEFUN(AM_WITH_EXPAT,
 [ AC_ARG_WITH(expat,
-	      [  --with-expat=PREFIX	prefix where EXPAT is installed])
+	      [AC_HELP_STRING([--with-expat=PREFIX], [prefix where EXPAT is installed])])

  EXPAT_CFLAGS=
  EXPAT_LIBS=
@@ -34,7 +34,7 @@ AC_DEFUN(AM_WITH_EXPAT,

 AC_DEFUN(AM_WITH_ZLIB,
 [ AC_ARG_WITH(zlib,
-	      [  --with-zlib=PREFIX	prefix where zlib is installed])
+	      [AC_HELP_STRING([--with-zlib=PREFIX], [prefix where zlib is installed])])

  ZLIB_CFLAGS=
  ZLIB_LIBS=
@@ -68,7 +68,7 @@ AC_DEFUN(AM_WITH_ZLIB,

 AC_DEFUN(AM_WITH_PAM,
 [ AC_ARG_WITH(pam,
-	      [  --with-pam=PREFIX	prefix where PAM is installed])
+	      [AC_HELP_STRING([--with-pam=PREFIX], [prefix where PAM is installed])])

  PAM_CFLAGS=
  PAM_LIBS=
@@ -102,7 +102,7 @@ AC_DEFUN(AM_WITH_PAM,

 AC_DEFUN(AM_WITH_ERLANG,
 [ AC_ARG_WITH(erlang,
-	      [  --with-erlang=PREFIX    path to erlc and erl ])
+	      [AC_HELP_STRING([--with-erlang=PREFIX], [path to erlc and erl])])

   AC_PATH_TOOL(ERLC, erlc, , $with_erlang:$with_erlang/bin:$PATH)
   AC_PATH_TOOL(ERL, erl, , $with_erlang:$with_erlang/bin:$PATH)
@@ -195,14 +195,13 @@ _EOF
   AC_SUBST(ERL)
 ])

-
 AC_DEFUN(AC_MOD_ENABLE,
 [
 $1=
 make_$1=
 AC_MSG_CHECKING([whether build $1])
 AC_ARG_ENABLE($1,
-  [  --enable-$1        enable $1 (default: $2)],
+  [AC_HELP_STRING([--enable-$1], [enable $1 (default: $2)])],
    [mr_enable_$1="$enableval"],
     [mr_enable_$1=$2])
 if test "$mr_enable_$1" = "yes"; then
@@ -223,7 +222,7 @@ AC_DEFUN([AM_ICONV],
  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
  dnl those with the standalone portable GNU libiconv installed).
  AC_ARG_WITH([libiconv-prefix],
-[  --with-libiconv-prefix=PREFIX	prefix where libiconv is installed], [
+   [AC_HELP_STRING([--with-libiconv-prefix=PREFIX], [prefix where libiconv is installed])], [
    for dir in `echo "$withval" | tr : ' '`; do
      if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
      if test -d $dir/include; then CFLAGS="$CFLAGS -I$dir/include"; fi
@@ -308,7 +307,7 @@ size_t iconv();
 dnl <openssl>
 AC_DEFUN(AM_WITH_OPENSSL,
 [ AC_ARG_WITH(openssl,
-          [  --with-openssl=PREFIX    prefix where OPENSSL is installed ])
+      [AC_HELP_STRING([--with-openssl=PREFIX], [prefix where OPENSSL is installed])])
 unset SSL_LIBS;
 unset SSL_CFLAGS;
 have_openssl=no
@@ -5,7 +5,7 @@
 %%% Created : 31 Oct 2005 by Magnus Henoch <henoch@dtek.chalmers.se>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -1281,31 +1281,39 @@ if test -n "$ac_init_help"; then
 Optional Features:
  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-mod_pubsub        enable mod_pubsub (default: yes)
+  --enable-mod_pubsub     enable mod_pubsub (default: yes)
  --enable-mod_irc        enable mod_irc (default: yes)
  --enable-mod_muc        enable mod_muc (default: yes)
-  --enable-mod_proxy65        enable mod_proxy65 (default: yes)
-  --enable-eldap        enable eldap (default: yes)
-  --enable-pam        enable pam (default: no)
-  --enable-web        enable web (default: yes)
-  --enable-tls        enable tls (default: yes)
-  --enable-odbc        enable odbc (default: no)
-  --enable-ejabberd_zlib        enable ejabberd_zlib (default: yes)
-  --enable-hipe        Compile natively with HiPE, not recommended (default: no)
-  --enable-roster-gateway-workaround    Turn on workaround for processing gateway subscriptions (default: no)
-  --enable-mssql    Use Microsoft SQL Server database (default: no, requires --enable-odbc)
-  --enable-transient_supervisors    Use Erlang supervision for transient process (default: yes)
-  --enable-full-xml    Use XML features in XMPP stream (ex: CDATA) (default: no, requires XML compliant clients)
+  --enable-mod_proxy65    enable mod_proxy65 (default: yes)
+  --enable-eldap          enable eldap (default: yes)
+  --enable-pam            enable pam (default: no)
+  --enable-web            enable web (default: yes)
+  --enable-tls            enable tls (default: yes)
+  --enable-odbc           enable odbc (default: no)
+  --enable-ejabberd_zlib  enable ejabberd_zlib (default: yes)
+  --enable-hipe           compile natively with HiPE, not recommended
+                          (default: no)
+  --enable-roster-gateway-workaround
+                          turn on workaround for processing gateway
+                          subscriptions (default: no)
+  --enable-mssql          use Microsoft SQL Server database (default: no,
+                          requires --enable-odbc)
+  --enable-transient_supervisors
+                          use Erlang supervision for transient process
+                          (default: yes)
+  --enable-full-xml       use XML features in XMPP stream (ex: CDATA)
+                          (default: no, requires XML compliant clients)

 Optional Packages:
  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
  --with-erlang=PREFIX    path to erlc and erl
-  --with-libiconv-prefix=PREFIX	prefix where libiconv is installed
-  --with-expat=PREFIX	prefix where EXPAT is installed
-  --with-zlib=PREFIX	prefix where zlib is installed
-  --with-pam=PREFIX	prefix where PAM is installed
-  --with-openssl=PREFIX    prefix where OPENSSL is installed
+  --with-libiconv-prefix=PREFIX
+                          prefix where libiconv is installed
+  --with-expat=PREFIX     prefix where EXPAT is installed
+  --with-zlib=PREFIX      prefix where zlib is installed
+  --with-pam=PREFIX       prefix where PAM is installed
+  --with-openssl=PREFIX   prefix where OPENSSL is installed

 Some influential environment variables:
  CC          C compiler command
@@ -4755,6 +4763,9 @@ _ACEOF
 fi


+# Check Erlang headers are installed
+#AC_CHECK_HEADER(erl_driver.h,,[AC_MSG_ERROR([cannot find Erlang header files])])
+
 # Change default prefix


@@ -6910,12 +6921,3 @@ if test "$no_create" != yes; then
  $ac_cs_success || { (exit 1); exit 1; }
 fi

-
-if test -n "$ERLANG_SSL39" ; then
-	echo
-	echo "**************** WARNING ! ********************"
-	echo "ejabberd will be compiled with Erlang R12."
-	echo "This version of Erlang is not supported"
-	echo "and not recommended for production servers"
-	echo "***********************************************"
-fi
@@ -26,6 +26,9 @@ AM_WITH_PAM
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST

+# Check Erlang headers are installed
+#AC_CHECK_HEADER(erl_driver.h,,[AC_MSG_ERROR([cannot find Erlang header files])])
+
 # Change default prefix
 AC_PREFIX_DEFAULT(/)

@@ -45,7 +48,7 @@ AC_MOD_ENABLE(odbc, no)
 AC_MOD_ENABLE(ejabberd_zlib, yes)

 AC_ARG_ENABLE(hipe,
-[  --enable-hipe        Compile natively with HiPE, not recommended (default: no)],
+[AC_HELP_STRING([--enable-hipe], [compile natively with HiPE, not recommended (default: no)])],
 [case "${enableval}" in
  yes) hipe=true ;;
  no)  hipe=false ;;
@@ -54,7 +57,7 @@ esac],[hipe=false])
 AC_SUBST(hipe)

 AC_ARG_ENABLE(roster_gateway_workaround,
-[  --enable-roster-gateway-workaround    Turn on workaround for processing gateway subscriptions (default: no)],
+[AC_HELP_STRING([--enable-roster-gateway-workaround], [turn on workaround for processing gateway subscriptions (default: no)])],
 [case "${enableval}" in
  yes) roster_gateway_workaround=true ;;
  no)  roster_gateway_workaround=false ;;
@@ -63,7 +66,7 @@ esac],[roster_gateway_workaround=false])
 AC_SUBST(roster_gateway_workaround)

 AC_ARG_ENABLE(mssql,
-[  --enable-mssql    Use Microsoft SQL Server database (default: no, requires --enable-odbc)],
+[AC_HELP_STRING([--enable-mssql], [use Microsoft SQL Server database (default: no, requires --enable-odbc)])],
 [case "${enableval}" in
  yes) db_type=mssql ;;
  no)  db_type=generic ;;
@@ -72,7 +75,7 @@ esac],[db_type=generic])
 AC_SUBST(db_type)

 AC_ARG_ENABLE(transient_supervisors,
-[  --enable-transient_supervisors    Use Erlang supervision for transient process (default: yes)],
+[AC_HELP_STRING([--enable-transient_supervisors], [use Erlang supervision for transient process (default: yes)])],
 [case "${enableval}" in
  yes) transient_supervisors=true ;;
  no)  transient_supervisors=false ;;
@@ -81,7 +84,7 @@ esac],[transient_supervisors=true])
 AC_SUBST(transient_supervisors)

 AC_ARG_ENABLE(full_xml,
-[  --enable-full-xml    Use XML features in XMPP stream (ex: CDATA) (default: no, requires XML compliant clients)],
+[AC_HELP_STRING([--enable-full-xml], [use XML features in XMPP stream (ex: CDATA) (default: no, requires XML compliant clients)])],
 [case "${enableval}" in
  yes) full_xml=true ;;
  no)  full_xml=false ;;
@@ -120,12 +123,3 @@ fi
 AC_CHECK_HEADER(krb5.h,,)

 AC_OUTPUT
-
-if test -n "$ERLANG_SSL39" ; then
-	echo
-	echo "**************** WARNING ! ********************"
-	echo "ejabberd will be compiled with Erlang R12."
-	echo "This version of Erlang is not supported"
-	echo "and not recommended for production servers"
-	echo "***********************************************"
-fi
@@ -5,7 +5,7 @@
 %%% Created : 27 Jan 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -60,6 +60,8 @@ start() ->
    EVersion = "ERLANG_VERSION = " ++ erlang:system_info(version) ++ "\n",
    EIDirS   = "EI_DIR = " ++ code:lib_dir("erl_interface") ++ "\n",
    RootDirS = "ERLANG_DIR = " ++ code:root_dir() ++ "\n",
+    %% Load the ejabberd application description so that ?VERSION can read the vsn key
+    application:load(ejabberd),
    Version  = "EJABBERD_VERSION = " ++ ?VERSION ++ "\n",
    ExpatDir = "EXPAT_DIR = c:\\sdk\\Expat-2.0.0\n",
    OpenSSLDir = "OPENSSL_DIR = c:\\sdk\\OpenSSL\n",
@@ -5,7 +5,7 @@
 %%% Created :  8 Mar 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -6,7 +6,7 @@
 %%% Created : 23 Aug 2005 by Magnus Henoch <henoch@dtek.chalmers.se>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created :  8 Mar 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -2,7 +2,7 @@

 {application, ejabberd,
 [{description, "ejabberd"},
-  {vsn, "2.0.0"},
+  {vsn, "2.0.2"},
  {modules, [acl,
 	     adhoc,
 	     configure,
@@ -383,12 +383,16 @@
 %% All users are allowed to use MUC service:
 {access, muc, [{allow, all}]}.

+%% Everybody can create pubsub nodes
+{access, pubsub_createnode, [{allow, all}]}.
+
 %% In-band registration allows registration of any possible username.
 %% To disable in-band registration, replace 'allow' with 'deny'.
 {access, register, [{allow, all}]}.

-%% Everybody can create pubsub nodes
-{access, pubsub_createnode, [{allow, all}]}.
+%% By default frequency of account registrations from a the same IP
+%% is limited to 1 account every 10 minutes. To disable put: infinity
+%%{registration_timeout, 600}.

 %%
 %% Define specific Access rules in a virtual host.
@@ -455,7 +459,7 @@
 		  %% a message with this subject and body.
 		  %%
 		  {welcome_message, {"Welcome!", 
-				     "Welcome to this Jabber server."}},
+				     "Hi\nWelcome to this Jabber server."}},

 		  %%
 		  %% When a user registers, send a notification to 
@@ -5,7 +5,7 @@
 %%% Created : 16 Nov 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -19,7 +19,9 @@
 %%%
 %%%----------------------------------------------------------------------

-define(VERSION, "2.0.0").
+%% This macro returns a string of the ejabberd version running, e.g. "2.3.4"
+%% If the ejabberd application description isn't loaded, returns atom: undefined
+-define(VERSION, element(2, application:get_key(ejabberd,vsn))).

 -define(MYHOSTS, ejabberd_config:get_global_option(hosts)).
 -define(MYNAME, hd(ejabberd_config:get_global_option(hosts))).
@@ -9,7 +9,7 @@
 %%% Created :  7 May 2006 by Mickael Remond <mremond@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created : 31 Jan 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -153,7 +153,7 @@ stop_modules() ->
 		  Modules ->
 		      lists:foreach(
 			fun({Module, _Args}) ->
-				gen_mod:stop_module(Host, Module)
+				gen_mod:stop_module_keep_config(Host, Module)
 			end, Modules)
 	      end
      end, ?MYHOSTS).
@@ -5,7 +5,7 @@
 %%% Created : 23 Nov 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -127,6 +127,12 @@ check_password_with_authmodule(User, Server, Password, StreamID, Digest) ->
 	[AuthMod | _] -> {true, AuthMod}
    end.

+%% @spec (User::string(), Server::string(), Password::string()) ->
+%%       ok | {error, ErrorType}
+%% where ErrorType = empty_password | not_allowed | invalid_jid
+set_password(_User, _Server, "") ->
+    %% We do not allow empty password
+    {error, empty_password};
 set_password(User, Server, Password) ->
    lists:foldl(
      fun(M, {error, _}) ->
@@ -135,6 +141,9 @@ set_password(User, Server, Password) ->
 	      Res
      end, {error, not_allowed}, auth_modules(Server)).

+try_register(_User, _Server, "") ->
+    %% We do not allow empty password
+    {error, not_allowed};    
 try_register(User, Server, Password) ->
    case is_user_exists(User,Server) of
 	true ->
@@ -5,7 +5,7 @@
 %%% Created : 17 Feb 2006 by Mickael Remond <mremond@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created : 12 Dec 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -61,7 +61,10 @@ check_password(User, Server, Password, _StreamID, _Digest) ->
    check_password(User, Server, Password).

 set_password(User, Server, Password) ->
-    extauth:set_password(User, Server, Password).
+    case extauth:set_password(User, Server, Password) of
+	true -> ok;
+	_ -> {error, unknown_problem}
+    end.

 try_register(_User, _Server, _Password) ->
    {error, not_allowed}.
@@ -5,7 +5,7 @@
 %%% Created : 12 Dec 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -98,6 +98,8 @@ check_password(User, Server, Password, StreamID, Digest) ->
 	    false
    end.

+%% @spec (User::string(), Server::string(), Password::string()) ->
+%%       ok | {error, invalid_jid}
 set_password(User, Server, Password) ->
    LUser = jlib:nodeprep(User),
    LServer = jlib:nameprep(Server),
@@ -110,7 +112,8 @@ set_password(User, Server, Password) ->
 			mnesia:write(#passwd{us = US,
 					     password = Password})
 		end,
-	    mnesia:transaction(F)
+	    {atomic, ok} = mnesia:transaction(F),
+	    ok
    end.


@@ -5,7 +5,7 @@
 %%% Created : 12 Dec 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created : 12 Dec 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -101,6 +101,8 @@ check_password(User, Server, Password, StreamID, Digest) ->
 	    end
    end.

+%% @spec (User::string(), Server::string(), Password::string()) ->
+%%       ok | {error, invalid_jid}
 set_password(User, Server, Password) ->
    case jlib:nodeprep(User) of
 	error ->
@@ -109,7 +111,10 @@ set_password(User, Server, Password) ->
 	    Username = ejabberd_odbc:escape(LUser),
 	    Pass = ejabberd_odbc:escape(Password),
 	    LServer = jlib:nameprep(Server),
-	    catch odbc_queries:set_password_t(LServer, Username, Pass)
+	    case catch odbc_queries:set_password_t(LServer, Username, Pass) of
+	        {atomic, ok} -> ok;
+	        Other -> {error, Other}
+	    end
    end.


@@ -5,7 +5,7 @@
 %%% Created : 5 Jul 2007 by Evgeniy Khramtsov <xram@jabber.ru>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created : 16 Nov 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -37,6 +37,7 @@
 	 send_element/2,
 	 socket_type/0,
 	 get_presence/1,
+	 get_subscribed/1,
 	 get_subscribed_and_online/1]).

 %% gen_fsm callbacks
@@ -176,29 +177,40 @@ init([{SockMod, Socket}, Opts]) ->
 			      (_) -> false
 			   end, Opts),
    IP = peerip(SockMod, Socket),
-    Socket1 =
-	if
-	    TLSEnabled ->
-		SockMod:starttls(Socket, TLSOpts);
-	    true ->
-		Socket
-	end,
-    SocketMonitor = SockMod:monitor(Socket1),
-    {ok, wait_for_stream, #state{socket         = Socket1,
-				 sockmod        = SockMod,
-				 socket_monitor = SocketMonitor,
-				 zlib           = Zlib,
-				 tls            = TLS,
-				 tls_required   = StartTLSRequired,
-				 tls_enabled    = TLSEnabled,
-				 tls_options    = TLSOpts,
-				 streamid       = new_id(),
-				 access         = Access,
-				 shaper         = Shaper,
-				 ip             = IP}, ?C2S_OPEN_TIMEOUT}.
+    %% Check if IP is blacklisted:
+    case is_ip_blacklisted(IP) of
+	true ->
+	    ?INFO_MSG("Connection attempt from blacklisted IP: ~s",
+	              [jlib:ip_to_list(IP)]),
+	    {stop, normal};
+	false ->
+	    Socket1 =
+		if
+		    TLSEnabled ->
+			SockMod:starttls(Socket, TLSOpts);
+		    true ->
+			Socket
+		end,
+	    SocketMonitor = SockMod:monitor(Socket1),
+	    {ok, wait_for_stream, #state{socket         = Socket1,
+					sockmod        = SockMod,
+					socket_monitor = SocketMonitor,
+					zlib           = Zlib,
+					tls            = TLS,
+					tls_required   = StartTLSRequired,
+					tls_enabled    = TLSEnabled,
+					tls_options    = TLSOpts,
+					streamid       = new_id(),
+					access         = Access,
+					shaper         = Shaper,
+					ip             = IP}, ?C2S_OPEN_TIMEOUT}
+    end.

 %% Return list of all available resources of contacts,
 %% in form [{JID, Caps}].
+get_subscribed(FsmRef) ->
+    gen_fsm:sync_send_all_state_event(
+      FsmRef, get_subscribed, 1000).
 get_subscribed_and_online(FsmRef) ->
    gen_fsm:sync_send_all_state_event(
      FsmRef, get_subscribed_and_online, 1000).
@@ -997,6 +1009,20 @@ handle_sync_event({get_presence}, _From, StateName, StateData) ->
    Reply = {User, Resource, Show, Status},
    fsm_reply(Reply, StateName, StateData);

+handle_sync_event(get_subscribed, _From, StateName, StateData) ->
+    Subscribed = StateData#state.pres_f,
+    Online = StateData#state.pres_available,
+    Pred = fun(User, _Caps) ->
+		   ?SETS:is_element(jlib:jid_remove_resource(User),
+				    Subscribed) orelse
+		       ?SETS:is_element(User, Subscribed)
+	   end,
+    SubscribedAndOnline = ?DICT:filter(Pred, Online),
+    SubscribedWithCaps  = ?SETS:fold(fun(User, Acc) ->
+	    [{User, undefined}|Acc]
+	end, ?DICT:to_list(SubscribedAndOnline), Subscribed),
+    {reply, SubscribedWithCaps, StateName, StateData};
+
 handle_sync_event(get_subscribed_and_online, _From, StateName, StateData) ->
    Subscribed = StateData#state.pres_f,
    Online = StateData#state.pres_available,
@@ -1448,7 +1474,8 @@ presence_update(From, Packet, StateData) ->
 			 StatusTag ->
 			    xml:get_tag_cdata(StatusTag)
 		     end,
-	    Info = [{ip, StateData#state.ip},{conn, StateData#state.conn}],
+	    Info = [{ip, StateData#state.ip}, {conn, StateData#state.conn},
+		    {auth_module, StateData#state.auth_module}],
 	    ejabberd_sm:unset_presence(StateData#state.sid,
 				       StateData#state.user,
 				       StateData#state.server,
@@ -1780,7 +1807,8 @@ roster_change(IJID, ISubscription, StateData) ->


 update_priority(Priority, Packet, StateData) ->
-    Info = [{ip, StateData#state.ip},{conn, StateData#state.conn}],
+    Info = [{ip, StateData#state.ip}, {conn, StateData#state.conn},
+	    {auth_module, StateData#state.auth_module}],
    ejabberd_sm:set_presence(StateData#state.sid,
 			     StateData#state.user,
 			     StateData#state.server,
@@ -1952,3 +1980,7 @@ fsm_reply(Reply, session_established, StateData) ->
    {reply, Reply, session_established, StateData, ?C2S_HIBERNATE_TIMEOUT};
 fsm_reply(Reply, StateName, StateData) ->
    {reply, Reply, StateName, StateData, ?C2S_OPEN_TIMEOUT}.
+
+%% Used by c2s blacklist plugins
+is_ip_blacklisted({IP,_Port}) ->
+    ejabberd_hooks:run_fold(check_bl_c2s, false, [IP]).
@@ -6,7 +6,7 @@
 %%% Created :  2 Nov 2007 by Mickael Remond <mremond@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created : 27 Feb 2008 by Mickael Remond <mremond@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -39,19 +39,21 @@
 libs() ->
    ok.

-%% Consistency check on ejabberd configuration
+%% @doc Consistency check on ejabberd configuration
 config() ->
    check_database_modules().

 check_database_modules() ->
     [check_database_module(M)||M<-get_db_used()].

+check_database_module(odbc) ->
+    check_modules(odbc, [odbc, odbc_app, odbc_sup, ejabberd_odbc, ejabberd_odbc_sup, odbc_queries]);
 check_database_module(mysql) ->
    check_modules(mysql, [mysql, mysql_auth, mysql_conn, mysql_recv]);
 check_database_module(pgsql) ->
    check_modules(pgsql, [pgsql, pgsql_proto, pgsql_tcp, pgsql_util]).

-%% Issue a critical error and throw an exit if needing module is
+%% @doc Issue a critical error and throw an exit if needing module is
 %% missing.
 check_modules(DB, Modules) ->
    case get_missing_modules(Modules) of
@@ -63,7 +65,7 @@ check_modules(DB, Modules) ->
    end.


-%% Return the list of undefined modules
+%% @doc Return the list of undefined modules
 get_missing_modules(Modules) ->
    lists:filter(fun(Module) ->
 			 case catch Module:module_info() of
@@ -73,7 +75,7 @@ get_missing_modules(Modules) ->
 			 end
 		 end, Modules).

-%% Return the list of databases used
+%% @doc Return the list of databases used
 get_db_used() ->
    %% Retrieve domains with a database configured:
    Domains = 
@@ -86,14 +88,22 @@ get_db_used() ->
 		    case check_odbc_option(
 			   ejabberd_config:get_local_option(
 			     {auth_method, Domain})) of
-			true -> [element(1, DB)|Acc];
+			true -> [get_db_type(DB)|Acc];
 			_ -> Acc
 		    end
 	    end,
 	    [], Domains),
    lists:usort(DBs).

-%% Return true if odbc option is used
+%% @doc Depending in the DB definition, return which type of DB this is
+%% Note that MSSQL is detected as ODBC.
+%% @spec (DB) -> mysql | pgsql | odbc
+get_db_type(DB) when is_tuple(DB) ->
+    element(1, DB);
+get_db_type(DB) when is_list(DB) ->
+    odbc.
+
+%% @doc Return true if odbc option is used
 check_odbc_option(odbc) ->
    true;
 check_odbc_option(AuthMethods) when is_list(AuthMethods) ->
@@ -5,7 +5,7 @@
 %%% Created : 14 Dec 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -64,9 +64,15 @@ load_file(File) ->
 	    State = lists:foldl(fun search_hosts/2, #state{}, Terms),
 	    Res = lists:foldl(fun process_term/2, State, Terms),
 	    set_opts(Res);
+	{error, {_LineNumber, erl_parse, _ParseMessage} = Reason} ->
+	    ExitText = lists:flatten(File ++ " approximately in the line "
+				     ++ file:format_error(Reason)),
+	    ?ERROR_MSG("Problem loading ejabberd config file ~n~s", [ExitText]),
+	    exit(ExitText);
 	{error, Reason} ->
-	    ?ERROR_MSG("Can't load config file ~p: ~p", [File, Reason]),
-	    exit(File ++ ": " ++ file:format_error(Reason))
+	    ExitText = lists:flatten(File ++ ": " ++ file:format_error(Reason)),
+	    ?ERROR_MSG("Problem loading ejabberd config file ~n~s", [ExitText]),
+	    exit(ExitText)
    end.

 search_hosts(Term, State) ->
@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created : 11 Jan 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -30,6 +30,7 @@
 -export([start/0,
 	 init/0,
 	 process/1,
+	 dump_to_textfile/1,
 	 register_commands/3,
 	 register_commands/4,
 	 unregister_commands/3,
@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created : 23 Aug 2006 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created :  8 Aug 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created : 16 Nov 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created : 30 Nov 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -37,6 +37,7 @@
 	 register_iq_handler/5,
 	 register_iq_response_handler/4,
 	 unregister_iq_handler/2,
+	 unregister_iq_response_handler/2,
 	 refresh_iq_handlers/0,
 	 bounce_resource_packet/3
 	]).
@@ -138,6 +139,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_handler(Host, XMLNS) ->
    ejabberd_local ! {unregister_iq_handler, Host, XMLNS}.

@@ -214,6 +218,9 @@ handle_info({route, From, To, Packet}, 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),
@@ -5,7 +5,7 @@
 %%% Created : 23 Oct 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -9,7 +9,7 @@
 %%% Created : 29 Nov 2006 by Mickael Remond <mremond@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created :  1 Nov 2006 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created : 31 Jan 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created : 10 Nov 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -293,11 +293,14 @@ activate_socket(#state{socket = Socket,

 process_data(Data,
 	     #state{xml_stream_state = XMLStreamState,
-		    shaper_state = ShaperState} = State) ->
+		    shaper_state = ShaperState,
+		    c2s_pid = C2SPid} = State) ->
    ?DEBUG("Received XML on stream = ~p", [binary_to_list(Data)]),
    XMLStreamState1 = xml_stream:parse(XMLStreamState, Data),
    {NewShaperState, Pause} = shaper:update(ShaperState, size(Data)),
    if
+	C2SPid == undefined ->
+	    ok;
 	Pause > 0 ->
 	    erlang:start_timer(Pause, self(), activate);
 	true ->
@@ -5,7 +5,7 @@
 %%% Created : 27 Nov 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -150,9 +150,9 @@ unregister_route(Domain) ->
 		    mnesia:transaction(F);
 		_ ->
 		    F = fun() ->
-				case mnesia:match(#route{domain = LDomain,
-							 pid = Pid,
-							 _ = '_'}) of
+				case mnesia:match_object(#route{domain=LDomain,
+								pid = Pid,
+								_ = '_'}) of
 				    [R] ->
 					I = R#route.local_hint,
 					mnesia:write(
@@ -5,7 +5,7 @@
 %%% Created :  7 Dec 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created :  6 Dec 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created :  6 Dec 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -92,7 +92,7 @@
 %% Only change this value if you now what your are doing:
 -define(FSMLIMITS,[]).
 %% -define(FSMLIMITS, [{max_queue, 2000}]).
-define(FSMTIMEOUT, 5000).
+-define(FSMTIMEOUT, 30000).

 %% Maximum delay to wait before retrying to connect after a failed attempt.
 %% Specified in miliseconds. Default value is 5 minutes.
@@ -1,11 +1,11 @@
 %%%----------------------------------------------------------------------
 %%% File    : ejabberd_service.erl
 %%% Author  : Alexey Shchepin <alexey@process-one.net>
-%%% Purpose : External component management
+%%% Purpose : External component management (XEP-0114)
 %%% Created :  6 Dec 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -73,7 +73,8 @@
 -define(STREAM_TRAILER, "</stream:stream>").

 -define(INVALID_HEADER_ERR,
-	"<stream:stream>"
+	"<stream:stream "
+	"xmlns:stream='http://etherx.jabber.org/streams'>"
 	"<stream:error>Invalid Stream Header</stream:error>"
 	"</stream:stream>"
       ).
@@ -168,11 +169,15 @@ init([{SockMod, Socket}, Opts]) ->
 %%----------------------------------------------------------------------

 wait_for_stream({xmlstreamstart, _Name, Attrs}, StateData) ->
-    % TODO
    case xml:get_attr_s("xmlns", Attrs) of
 	"jabber:component:accept" ->
+	    %% Note: XEP-0114 requires to check that destination is a Jabber
+	    %% component served by this Jabber server.
+	    %% However several transports don't respect that,
+	    %% so ejabberd doesn't check 'to' attribute (EJAB-717)
+	    To = xml:get_attr_s("to", Attrs),
 	    Header = io_lib:format(?STREAM_HEADER,
-				   [StateData#state.streamid, ?MYNAME]),
+				   [StateData#state.streamid, xml:crypt(To)]),
 	    send_text(StateData, Header),
 	    {next_state, wait_for_handshake, StateData};
 	_ ->
@@ -5,7 +5,7 @@
 %%% Created : 24 Nov 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created : 23 Aug 2006 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -65,19 +65,27 @@ start(Module, SockMod, Socket, Opts) ->
 	    SocketData = #socket_state{sockmod = SockMod,
 				       socket = Socket,
 				       receiver = Receiver},
-	    {ok, Pid} = Module:start({?MODULE, SocketData}, Opts),
-	    case SockMod:controlling_process(Socket, Receiver) of
-		ok ->
-		    ok;
+	    case Module:start({?MODULE, SocketData}, Opts) of
+		{ok, Pid} ->
+		    case SockMod:controlling_process(Socket, Receiver) of
+			ok ->
+			    ok;
+			{error, _Reason} ->
+			    SockMod:close(Socket)
+		    end,
+		    ejabberd_receiver:become_controller(Receiver, Pid);
 		{error, _Reason} ->
 		    SockMod:close(Socket)
-	    end,
-	    ejabberd_receiver:become_controller(Receiver, Pid);
+	    end;
 	raw ->
-	    {ok, Pid} = Module:start({SockMod, Socket}, Opts),
-	    case SockMod:controlling_process(Socket, Pid) of
-		ok ->
-		    ok;
+	    case Module:start({SockMod, Socket}, Opts) of
+		{ok, Pid} ->
+		    case SockMod:controlling_process(Socket, Pid) of
+			ok ->
+			    ok;
+			{error, _Reason} ->
+			    SockMod:close(Socket)
+		    end;
 		{error, _Reason} ->
 		    SockMod:close(Socket)
 	    end
@@ -5,7 +5,7 @@
 %%% Created : 31 Jan 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created : 21 Mar 2007 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created : 18 Jul 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created : 27 Jan 2006 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created : 19 Jan 2006 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -1,5 +1,5 @@
 /*
- * ejabberd, Copyright (C) 2002-2008   Process-one
+ * ejabberd, Copyright (C) 2002-2008   ProcessOne
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
@@ -11,6 +11,7 @@ ERL_MAX_ETS_TABLES=1400
 NODE=ejabberd
 HOST=localhost
 ERLANG_NODE=$NODE@$HOST
+ERL=@erl@
 ROOTDIR=@rootdir@
 EJABBERD_CONFIG_PATH=$ROOTDIR/etc/ejabberd/ejabberd.cfg
 LOGS_DIR=$ROOTDIR/var/log/ejabberd/
@@ -74,7 +75,7 @@ export HOME
 # start server
 start ()
 {
-    erl \
+    $ERL \
      $NAME $ERLANG_NODE \
      -noinput -detached \
      -pa $EJABBERD_EBIN \
@@ -103,7 +104,7 @@ debug ()
    echo "Press any key to continue"
    read foo
    echo ""
-    erl \
+    $ERL \
      $NAME ${NODE}debug \
      -remsh $ERLANG_NODE \
      $ERLANG_OPTS $ARGS "$@"
@@ -127,9 +128,8 @@ live ()
    echo "Press any key to continue"
    read foo
    echo ""
-    erl \
+    $ERL \
      $NAME $ERLANG_NODE \
-      $ERLANG_OPTS \
      -pa $EJABBERD_EBIN \
      -mnesia dir "\"$EJABBERD_DB\"" \
      -s ejabberd \
@@ -139,7 +139,7 @@ live ()
 # common control function
 ctl ()
 {
-    erl \
+    $ERL \
      $NAME ejabberdctl \
      -noinput \
      -pa $EJABBERD_EBIN \
@@ -159,6 +159,7 @@ ctl ()
        echo "  --ctl-config file  Config file of ejabberdctl: $CONFIG"
        echo "  --logs dir         Directory for logs:         $LOGS_DIR"
        echo "  --spool dir        Database spool dir:         $EJABBERD_DB"
+        echo "  --node nodename    ejabberd node name:         $ERLANG_NODE"
        echo "";;
    esac
    return $result
@@ -5,7 +5,7 @@
 %%% Created : 22 Aug 2005 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -22,6 +22,8 @@ BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))

 all:    $(BEAMS) ELDAPv3.beam

+ELDAPv3.beam: ELDAPv3.erl
+
 ELDAPv3.erl:       ELDAPv3.asn
 	@ERLC@ -bber_bin -W $(EFLAGS) $<

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -6,7 +6,7 @@
 %%% Author:  Evgeniy Khramtsov <xramtsov@gmail.com>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created : 12 Nov 2006 by Evgeniy Khramtsov <xram@jabber.ru>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created : 12 Oct 2006 by Mickael Remond <mremond@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created : 30 Jul 2004 by Leif Johansson <leifj@it.su.se>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created : 22 Jan 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created : 24 Jan 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -30,6 +30,7 @@
 -export([start/0,
 	 start_module/3,
 	 stop_module/2,
+	 stop_module_keep_config/2,
 	 get_opt/2,
 	 get_opt/3,
 	 get_opt_host/3,
@@ -72,22 +73,34 @@ start_module(Host, Module, Opts) ->
 	    ok
    end.

+%% @doc Stop the module in a host, and forget its configuration.
 stop_module(Host, Module) ->
+    case stop_module_keep_config(Host, Module) of
+	error ->
+	    error;
+	ok ->
+	    del_module_mnesia(Host, Module)
+    end.
+
+%% @doc Stop the module in a host, but keep its configuration.
+%% As the module configuration is kept in the Mnesia local_config table,
+%% when ejabberd is restarted the module will be started again.
+%% This function is useful when ejabberd is being stopped
+%% and it stops all modules.
+stop_module_keep_config(Host, Module) ->
    case catch Module:stop(Host) of
 	{'EXIT', Reason} ->
-	    ?ERROR_MSG("~p", [Reason]);
+	    ?ERROR_MSG("~p", [Reason]),
+	    error;
 	{wait, ProcList} when is_list(ProcList) ->
 	    lists:foreach(fun wait_for_process/1, ProcList),
-	    del_module_mnesia(Host, Module),
 	    ets:delete(ejabberd_modules, {Module, Host}),
 	    ok;
 	{wait, Process} ->
 	    wait_for_process(Process),
-	    del_module_mnesia(Host, Module),
 	    ets:delete(ejabberd_modules, {Module, Host}),
 	    ok;
 	_ ->
-	    del_module_mnesia(Host, Module),
 	    ets:delete(ejabberd_modules, {Module, Host}),
 	    ok
    end.
@@ -5,7 +5,7 @@
 %%% Created : 10 Apr 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created :  2 Feb 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created : 23 Nov 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -59,7 +59,8 @@
 	 now_to_local_string/1,
 	 datetime_string_to_timestamp/1,
 	 decode_base64/1,
-	 encode_base64/1]).
+	 encode_base64/1,
+	 ip_to_list/1]).

 -include("jlib.hrl").

@@ -676,3 +677,9 @@ e(X) when X>51, X<62 ->     X-4;
 e(62) ->                    $+;
 e(63) ->                    $/;
 e(X) ->                     exit({bad_encode_base64_token, X}).
+
+%% Convert Erlang inet IP to list
+ip_to_list({IP, _Port}) ->
+    ip_to_list(IP);
+ip_to_list({A,B,C,D}) ->
+    lists:flatten(io_lib:format("~w.~w.~w.~w",[A,B,C,D])).
@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created : 15 Nov 2005 by Magnus Henoch <henoch@dtek.chalmers.se>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created : 11 Aug 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created : 7 Oct 2006 by Magnus Henoch <henoch@dtek.chalmers.se>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -53,6 +53,7 @@

 -define(PROCNAME, ejabberd_mod_caps).
 -define(DICT, dict).
+-define(CAPS_QUERY_TIMEOUT, 60000). % 1mn without answer, consider client never answer

 -record(caps, {node, version, exts}).
 -record(caps_features, {node_pair, features}).
@@ -220,6 +221,7 @@ handle_cast({note_caps, From,
 			  ejabberd_local:register_iq_response_handler
 			    (Host, ID, ?MODULE, handle_disco_response),
 			  ejabberd_router:route(jlib:make_jid("", Host, ""), From, Stanza),
+			  timer:send_after(?CAPS_QUERY_TIMEOUT, self(), {disco_timeout, ID}),
 			  ?DICT:store(ID, {Node, SubNode}, Dict)
 		  end, Requests, Missing),
 	    {noreply, State#state{disco_requests = NewRequests}};
@@ -274,6 +276,16 @@ handle_cast({disco_response, From, _To,
    end,
    NewRequests = ?DICT:erase(ID, Requests),
    {noreply, State#state{disco_requests = NewRequests}};
+handle_cast({disco_timeout, ID}, #state{host = Host, disco_requests = Requests} = State) ->
+    %% do not wait a response anymore for this IQ, client certainly will never answer
+    NewRequests = case ?DICT:is_key(ID, Requests) of
+    true ->
+	ejabberd_local:unregister_iq_response_handler(Host, ID),
+	?DICT:erase(ID, Requests);
+    false ->
+	Requests
+    end,
+    {noreply, State#state{disco_requests = NewRequests}};
 handle_cast(visit_feature_queries, #state{feature_queries = FeatureQueries} = State) ->
    Timestamp = timestamp(),
    NewFeatureQueries =
@@ -5,7 +5,7 @@
 %%% Created : 19 Jan 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -1416,7 +1416,7 @@ set_form(_From, _Host, ["running nodes", ENode, "backup", "textfile"], _Lang, XD
 		false ->
 		    {error, ?ERR_BAD_REQUEST};
 		{value, {_, [String]}} ->
-		    case rpc:call(Node, mnesia, dump_to_textfile, [String]) of
+		    case rpc:call(Node, ejabberd_ctl, dump_to_textfile, [String]) of
 			{badrpc, _Reason} ->
 			    {error, ?ERR_INTERNAL_SERVER_ERROR};
 			{error, _Reason} ->
@@ -5,7 +5,7 @@
 %%% Created : 26 Oct 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created :  1 Jan 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created : 15 Jan 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -0,0 +1,119 @@
+%%%----------------------------------------------------------------------
+%%% File    : mod_ip_blacklist.erl
+%%% Author  : Mickael Remond <mremond@process-one.net>
+%%% Purpose : Download blacklists from ProcessOne
+%%% Created : 5 May 2008 by Mickael Remond <mremond@process-one.net>
+%%% Usage   : Add the following line in modules section of ejabberd.cfg:
+%%%              {mod_ip_blacklist, []}
+%%%
+%%%
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%%
+%%% This program 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 of the
+%%% License, or (at your option) any later version.
+%%%
+%%% This program is distributed in the hope that it will be useful,
+%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%%% General Public License for more details.
+%%%                         
+%%% You should have received a copy of the GNU General Public License
+%%% along with this program; if not, write to the Free Software
+%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+%%% 02111-1307 USA
+%%%
+%%%----------------------------------------------------------------------
+
+-module(mod_ip_blacklist).
+-author('mremond@process-one.net').
+
+-behaviour(gen_mod).
+
+%% API:
+-export([start/2,
+         init/1,
+         stop/1]).
+-export([update_bl_c2s/0]).
+%% Hooks:
+-export([is_ip_in_c2s_blacklist/2]).
+
+-include("ejabberd.hrl").
+
+-define(PROCNAME, ?MODULE).
+-define(BLC2S, "http://xaai.process-one.net/bl_c2s.txt").
+-define(UPDATE_INTERVAL, 6). %% in hours
+
+-record(state, {timer}).
+-record(bl_c2s, {ip}).
+
+%% Start once for all vhost
+start(Host, Opts) ->
+    case whereis(?PROCNAME) of
+        undefined ->
+            ?DEBUG("Starting mod_ip_blacklist ~p  ~p~n", [Host, Opts]),
+              register(?PROCNAME,
+                     spawn(?MODULE, init, [#state{}]));
+        _ ->
+            ok
+    end.
+
+%% TODO:
+stop(_Host) ->
+    ok.
+
+init(State)->
+    inets:start(),
+    ets:new(bl_c2s, [named_table, public, {keypos, #bl_c2s.ip}]),
+    update_bl_c2s(),
+    %% Register hooks for blacklist
+    ejabberd_hooks:add(check_bl_c2s, ?MODULE, is_ip_in_c2s_blacklist, 50),
+    %% Set timer: Download the blacklist file every 6 hours
+    timer:apply_interval(timer:hours(?UPDATE_INTERVAL), ?MODULE, update_bl_c2s, []),
+    loop(State).
+
+%% Remove timer when stop is received.
+loop(_State) ->
+    receive
+	stop ->
+	    ok
+    end.
+
+%% Download blacklist file from ProcessOne XAAI
+%% and update the table internal table
+%% TODO: Support comment lines starting by %
+update_bl_c2s() ->
+    ?INFO_MSG("Updating C2S Blacklist", []),
+    case http:request(?BLC2S) of
+	{ok, {{_Version, 200, _Reason}, _Headers, Body}} ->
+	    IPs = string:tokens(Body,"\n"),
+	    ets:delete_all_objects(bl_c2s),
+	    lists:foreach(
+	      fun(IP) ->
+		      ets:insert(bl_c2s, #bl_c2s{ip=list_to_binary(IP)})
+	      end, IPs);
+	{error, Reason} ->
+	    ?ERROR_MSG("Cannot download C2S blacklist file. Reason: ~p",
+		       [Reason])
+    end.
+
+%% Hook is run with:
+%% ejabberd_hooks:run_fold(check_bl_c2s, false, [IP]),
+%% Return: false: IP not blacklisted
+%%         true: IP is blacklisted
+%% IPV4 IP tuple:
+is_ip_in_c2s_blacklist(_Val, IP) when is_tuple(IP) ->
+    BinaryIP = list_to_binary(jlib:ip_to_list(IP)),
+    case ets:lookup(bl_c2s, BinaryIP) of
+	[] -> %% Not in blacklist
+	    false;
+	[_] -> %% Blacklisted!
+	    {stop, true}
+    end;
+is_ip_in_c2s_blacklist(_Val, _IP) ->
+    false.
+
+%% TODO:
+%% - For now, we do not kick user already logged on a given IP after
+%%    we update the blacklist.
@@ -5,7 +5,7 @@
 %%% Created : 16 Feb 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -1,5 +1,5 @@
 /*
- * ejabberd, Copyright (C) 2002-2008   Process-one
+ * ejabberd, Copyright (C) 2002-2008   ProcessOne
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created : 15 Feb 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created : 15 Feb 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created : 24 Oct 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created : 24 Oct 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -114,8 +114,6 @@ process_sm_iq(From, To, #iq{type = Type, sub_el = SubEl} = IQ) ->
 get_last(IQ, SubEl, LUser, LServer) ->
    Username = ejabberd_odbc:escape(LUser),
    case catch odbc_queries:get_last(LServer, Username) of
-	{'EXIT', _Reason} ->
-	    IQ#iq{type = error, sub_el = [SubEl, ?ERR_INTERNAL_SERVER_ERROR]};
 	{selected, ["seconds","state"], []} ->
 	    IQ#iq{type = error, sub_el = [SubEl, ?ERR_SERVICE_UNAVAILABLE]};
 	{selected, ["seconds","state"], [{STimeStamp, Status}]} ->
@@ -132,7 +130,9 @@ get_last(IQ, SubEl, LUser, LServer) ->
 		_ ->
 		    IQ#iq{type = error,
 			  sub_el = [SubEl, ?ERR_INTERNAL_SERVER_ERROR]}
-	    end
+	    end;
+	_ ->
+	    IQ#iq{type = error, sub_el = [SubEl, ?ERR_INTERNAL_SERVER_ERROR]}
    end.

 on_presence_update(User, Server, _Resource, Status) ->
@@ -152,8 +152,6 @@ store_last_info(User, Server, TimeStamp, Status) ->
 get_last_info(LUser, LServer) ->
    Username = ejabberd_odbc:escape(LUser),
    case catch odbc_queries:get_last(LServer, Username) of
-	{'EXIT', _Reason} ->
-	    not_found;
 	{selected, ["seconds","state"], []} ->
 	    not_found;
 	{selected, ["seconds","state"], [{STimeStamp, Status}]} ->
@@ -162,7 +160,9 @@ get_last_info(LUser, LServer) ->
 		    {ok, TimeStamp, Status};
 		_ ->
 		    not_found
-	    end
+	    end;
+	_ ->
+	    not_found
    end.

 remove_user(User, Server) ->
@@ -5,7 +5,7 @@
 %%% Created : 19 Mar 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created : 12 Mar 2006 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -120,9 +120,11 @@ init([Host, Opts]) ->
    NoFollow = gen_mod:get_opt(spam_prevention, Opts, true),
    Lang = case ejabberd_config:get_local_option({language, Host}) of
 	       undefined ->
-		   "";
-	       L ->
-		   L
+		   case ejabberd_config:get_global_option(language) of
+		       undefined -> "en";
+		       L -> L
+		   end;
+	       L -> L
 	   end,
    {ok, #state{host = Host,
 		out_dir = OutDir,
@@ -286,9 +288,10 @@ add_message_to_log(Nick1, Message, RoomJID, Opts, State) ->
 	   top_link = TopLink} = State,
    Room = get_room_info(RoomJID, Opts),

+    Now = now(),
    TimeStamp = case Timezone of
-		    local -> calendar:now_to_local_time(now());
-		    universal -> calendar:now_to_universal_time(now())
+		    local -> calendar:now_to_local_time(Now);
+		    universal -> calendar:now_to_universal_time(Now)
 		end,
    {Fd, Fn, _Dir} = build_filename_string(TimeStamp, OutDir, Room#room.jid, DirType),
    {Date, Time} = TimeStamp,
@@ -382,10 +385,12 @@ add_message_to_log(Nick1, Message, RoomJID, Opts, State) ->
    {Hour, Minute, Second} = Time,
    STime = lists:flatten(
 	      io_lib:format("~2..0w:~2..0w:~2..0w", [Hour, Minute, Second])),
+    {_, _, Microsecs} = Now,
+    STimeUnique = io_lib:format("~s.~w", [STime, Microsecs]),

    % Write message
-    file:write(F, io_lib:format("<a name=\"~s\" href=\"#~s\" class=\"ts\">[~s]</a> ~s~n", 
-				[STime, STime, STime, Text])),
+    file:write(F, io_lib:format("<a id=\"~s\" name=\"~s\" href=\"#~s\" class=\"ts\">[~s]</a> ~s~n",
+				[STimeUnique, STimeUnique, STimeUnique, STime, Text])),

    % Close file
    file:close(F),
@@ -5,7 +5,7 @@
 %%% Created : 19 Mar 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -59,9 +59,12 @@
 -record(lqueue, {queue, len, max}).

 -record(config, {title = "",
+		 description = "",
 		 allow_change_subj = true,
 		 allow_query_users = true,
 		 allow_private_messages = true,
+                 allow_visitor_status = true,
+                 allow_visitor_nickchange = true,
 		 public = true,
 		 public_list = true,
 		 persistent = false,
@@ -478,9 +481,9 @@ normal_state({route, From, ToNick,
 	forget_message ->
 	    {next_state, normal_state, StateData};
 	continue_delivery ->
-	    case (StateData#state.config)#config.allow_private_messages
-		andalso is_user_online(From, StateData) of
-		true ->
+	    case {(StateData#state.config)#config.allow_private_messages,
+		is_user_online(From, StateData)} of
+		{true, true} ->
 		    case Type of
 			"groupchat" ->
 			    ErrText = "It is not allowed to send private "
@@ -514,10 +517,19 @@ normal_state({route, From, ToNick,
 				      ToJID, Packet)
 			    end
 		    end;
-		_ ->
+		{true, false} ->
 		    ErrText = "Only occupants are allowed to send messages to the conference",
 		    Err = jlib:make_error_reply(
 			    Packet, ?ERRT_NOT_ACCEPTABLE(Lang, ErrText)),
+		    ejabberd_router:route(
+		      jlib:jid_replace_resource(
+			StateData#state.jid,
+			ToNick),
+		      From, Err);
+		{false, _} ->
+		    ErrText = "It is not allowed to send private messages",
+		    Err = jlib:make_error_reply(
+			    Packet, ?ERRT_FORBIDDEN(Lang, ErrText)),
 		    ejabberd_router:route(
 		      jlib:jid_replace_resource(
 			StateData#state.jid,
@@ -902,8 +914,22 @@ process_presence(From, Nick, {xmlelement, "presence", Attrs, _Els} = Packet,
 			    true ->
 				case {is_nick_exists(Nick, StateData),
 				      mod_muc:can_use_nick(
-					StateData#state.host, From, Nick)} of
-				    {true, _} ->
+					StateData#state.host, From, Nick),
+                                      {(StateData#state.config)#config.allow_visitor_nickchange,
+                                       is_visitor(From, StateData)}} of
+                                    {_, _, {false, true}} ->
+					ErrText = "Visitors are not allowed to change their nicknames in this room",
+					Err = jlib:make_error_reply(
+						Packet,
+						?ERRT_NOT_ALLOWED(Lang, ErrText)),
+					ejabberd_router:route(
+					  % TODO: s/Nick/""/
+					  jlib:jid_replace_resource(
+					    StateData#state.jid,
+					    Nick),
+					  From, Err),
+					StateData;
+				    {true, _, _} ->
 					Lang = xml:get_attr_s("xml:lang", Attrs),
 					ErrText = "Nickname is already in use by another occupant",
 					Err = jlib:make_error_reply(
@@ -915,7 +941,7 @@ process_presence(From, Nick, {xmlelement, "presence", Attrs, _Els} = Packet,
 					    Nick), % TODO: s/Nick/""/
 					  From, Err),
 					StateData;
-				    {_, false} ->
+				    {_, false, _} ->
 					ErrText = "Nickname is registered by another person",
 					Err = jlib:make_error_reply(
 						Packet,
@@ -930,11 +956,17 @@ process_presence(From, Nick, {xmlelement, "presence", Attrs, _Els} = Packet,
 				    _ ->
 					change_nick(From, Nick, StateData)
 				end;
-			    _ ->
-				NewState =
-				    add_user_presence(From, Packet, StateData),
-				send_new_presence(From, NewState),
-				NewState
+			    _NotNickChange ->
+                                Stanza = case {(StateData#state.config)#config.allow_visitor_status,
+                                               is_visitor(From, StateData)} of
+                                             {false, true} ->
+                                                 strip_status(Packet);
+                                             _Allowed ->
+                                                 Packet
+                                         end,
+                                NewState = add_user_presence(From, Stanza, StateData),
+                                send_new_presence(From, NewState),
+                                NewState
 			end;
 		    _ ->
 			add_new_user(From, Nick, Packet, StateData)
@@ -1204,6 +1236,9 @@ get_default_role(Affiliation, StateData) ->
 	    end
    end.

+is_visitor(Jid, StateData) ->
+    get_role(Jid, StateData) =:= visitor.
+
 get_max_users(StateData) ->
    MaxUsers = (StateData#state.config)#config.max_users,
    ServiceMaxUsers = get_service_max_users(StateData),
@@ -1308,6 +1343,13 @@ filter_presence({xmlelement, "presence", Attrs, Els}) ->
 	     end, Els),
    {xmlelement, "presence", Attrs, FEls}.

+strip_status({xmlelement, "presence", Attrs, Els}) ->
+    FEls = lists:filter(
+	     fun({xmlelement, "status", _Attrs1, _Els1}) ->
+                     false;
+                (_) -> true
+	     end, Els),
+    {xmlelement, "presence", Attrs, FEls}.

 add_user_presence(JID, Presence, StateData) ->
    LJID = jlib:jid_tolower(JID),
@@ -1623,6 +1665,9 @@ extract_history([_ | Els], Type) ->


 send_update_presence(JID, StateData) ->
+    send_update_presence(JID, "", StateData).
+
+send_update_presence(JID, Reason, StateData) ->
    LJID = jlib:jid_tolower(JID),
    LJIDs = case LJID of
 		{U, S, ""} ->
@@ -1644,10 +1689,13 @@ send_update_presence(JID, StateData) ->
 		    end
 	    end,
    lists:foreach(fun(J) ->
-			  send_new_presence(J, StateData)
+			  send_new_presence(J, Reason, StateData)
 		  end, LJIDs).

 send_new_presence(NJID, StateData) ->
+    send_new_presence(NJID, "", StateData).
+
+send_new_presence(NJID, Reason, StateData) ->
    {ok, #user{jid = RealJID,
 	       nick = Nick,
 	       role = Role,
@@ -1669,6 +1717,13 @@ send_new_presence(NJID, StateData) ->
 			  [{"affiliation", SAffiliation},
 			   {"role", SRole}]
 		  end,
+	      ItemEls = case Reason of
+			    "" ->
+				[];
+			    _ ->
+				[{xmlelement, "reason", [],
+				  [{xmlcdata, Reason}]}]
+			end,
 	      Status = case StateData#state.just_created of
 			   true ->
 			       [{xmlelement, "status", [{"code", "201"}], []}];
@@ -1678,7 +1733,7 @@ send_new_presence(NJID, StateData) ->
 	      Packet = append_subtags(
 			 Presence,
 			 [{xmlelement, "x", [{"xmlns", ?NS_MUC_USER}],
-			   [{xmlelement, "item", ItemAttrs, []} | Status]}]),
+			   [{xmlelement, "item", ItemAttrs, ItemEls} | Status]}]),
 	      ejabberd_router:route(
 		jlib:jid_replace_resource(StateData#state.jid, Nick),
 		Info#user.jid,
@@ -2046,21 +2101,21 @@ process_admin_items_set(UJID, Items, Lang, StateData) ->
 					 set_affiliation_and_reason(
 					   JID, outcast, Reason,
 					   set_role(JID, none, SD));
-				     {JID, affiliation, A, _Reason} when
+				     {JID, affiliation, A, Reason} when
 					   (A == admin) or (A == owner) ->
-					 SD1 = set_affiliation(JID, A, SD),
+					 SD1 = set_affiliation_and_reason(JID, A, Reason, SD),
 					 SD2 = set_role(JID, moderator, SD1),
-					 send_update_presence(JID, SD2),
+					 send_update_presence(JID, Reason, SD2),
 					 SD2;
-				     {JID, affiliation, member, _Reason} ->
-					 SD1 = set_affiliation(
-						 JID, member, SD),
+				     {JID, affiliation, member, Reason} ->
+					 SD1 = set_affiliation_and_reason(
+						 JID, member, Reason, SD),
 					 SD2 = set_role(JID, participant, SD1),
-					 send_update_presence(JID, SD2),
+					 send_update_presence(JID, Reason, SD2),
 					 SD2;
-				     {JID, role, R, _Reason} ->
-					 SD1 = set_role(JID, R, SD),
-					 catch send_new_presence(JID, SD1),
+				     {JID, role, Role, Reason} ->
+					 SD1 = set_role(JID, Role, SD),
+					 catch send_new_presence(JID, Reason, SD1),
 					 SD1;
 				     {JID, affiliation, A, _Reason} ->
 					 SD1 = set_affiliation(JID, A, SD),
@@ -2148,11 +2203,13 @@ find_changed_items(UJID, UAffiliation, URole,
 					    [StrAffiliation]),
 				    {error, ?ERRT_NOT_ACCEPTABLE(Lang, ErrText1)};
 				SAffiliation ->
+				    ServiceAf = get_service_affiliation(JID, StateData),
 				    CanChangeRA =
 					case can_change_ra(
 					       UAffiliation, URole,
 					       TAffiliation, TRole,
-					       affiliation, SAffiliation) of
+					       affiliation, SAffiliation,
+						   ServiceAf) of
 					    nothing ->
 						nothing;
 					    true ->
@@ -2203,11 +2260,13 @@ find_changed_items(UJID, UAffiliation, URole,
 				  [StrRole]),
 			    {error, ?ERRT_BAD_REQUEST(Lang, ErrText1)};
 			SRole ->
+			    ServiceAf = get_service_affiliation(JID, StateData),
 			    CanChangeRA =
 				case can_change_ra(
 				       UAffiliation, URole,
 				       TAffiliation, TRole,
-				       role, SRole) of
+				       role, SRole,
+					   ServiceAf) of
 				    nothing ->
 					nothing;
 				    true ->
@@ -2253,143 +2312,149 @@ find_changed_items(_UJID, _UAffiliation, _URole, _Items,
    {error, ?ERR_BAD_REQUEST}.


+can_change_ra(_FAffiliation, _FRole,
+	      owner, _TRole,
+	      affiliation, owner, owner) ->
+    %% A room owner tries to add as persistent owner a
+    %% participant that is already owner because he is MUC admin
+    true;
 can_change_ra(_FAffiliation, _FRole,
 	      TAffiliation, _TRole,
-	      affiliation, Value)
+	      affiliation, Value, _ServiceAf)
  when (TAffiliation == Value) ->
    nothing;
 can_change_ra(_FAffiliation, _FRole,
 	      _TAffiliation, TRole,
-	      role, Value)
+	      role, Value, _ServiceAf)
  when (TRole == Value) ->
    nothing;
 can_change_ra(FAffiliation, _FRole,
 	      outcast, _TRole,
-	      affiliation, none)
+	      affiliation, none, _ServiceAf)
  when (FAffiliation == owner) or (FAffiliation == admin) ->
    true;
 can_change_ra(FAffiliation, _FRole,
 	      outcast, _TRole,
-	      affiliation, member)
+	      affiliation, member, _ServiceAf)
  when (FAffiliation == owner) or (FAffiliation == admin) ->
    true;
 can_change_ra(owner, _FRole,
 	      outcast, _TRole,
-	      affiliation, admin) ->
+	      affiliation, admin, _ServiceAf) ->
    true;
 can_change_ra(owner, _FRole,
 	      outcast, _TRole,
-	      affiliation, owner) ->
+	      affiliation, owner, _ServiceAf) ->
    true;
 can_change_ra(FAffiliation, _FRole,
 	      none, _TRole,
-	      affiliation, outcast)
+	      affiliation, outcast, _ServiceAf)
  when (FAffiliation == owner) or (FAffiliation == admin) ->
    true;
 can_change_ra(FAffiliation, _FRole,
 	      none, _TRole,
-	      affiliation, member)
+	      affiliation, member, _ServiceAf)
  when (FAffiliation == owner) or (FAffiliation == admin) ->
    true;
 can_change_ra(owner, _FRole,
 	      none, _TRole,
-	      affiliation, admin) ->
+	      affiliation, admin, _ServiceAf) ->
    true;
 can_change_ra(owner, _FRole,
 	      none, _TRole,
-	      affiliation, owner) ->
+	      affiliation, owner, _ServiceAf) ->
    true;
 can_change_ra(FAffiliation, _FRole,
 	      member, _TRole,
-	      affiliation, outcast)
+	      affiliation, outcast, _ServiceAf)
  when (FAffiliation == owner) or (FAffiliation == admin) ->
    true;
 can_change_ra(FAffiliation, _FRole,
 	      member, _TRole,
-	      affiliation, none)
+	      affiliation, none, _ServiceAf)
  when (FAffiliation == owner) or (FAffiliation == admin) ->
    true;
 can_change_ra(owner, _FRole,
 	      member, _TRole,
-	      affiliation, admin) ->
+	      affiliation, admin, _ServiceAf) ->
    true;
 can_change_ra(owner, _FRole,
 	      member, _TRole,
-	      affiliation, owner) ->
+	      affiliation, owner, _ServiceAf) ->
    true;
 can_change_ra(owner, _FRole,
 	      admin, _TRole,
-	      affiliation, _Affiliation) ->
+	      affiliation, _Affiliation, _ServiceAf) ->
    true;
 can_change_ra(owner, _FRole,
 	      owner, _TRole,
-	      affiliation, _Affiliation) ->
+	      affiliation, _Affiliation, _ServiceAf) ->
    check_owner;
 can_change_ra(_FAffiliation, _FRole,
 	      _TAffiliation, _TRole,
-	      affiliation, _Value) ->
+	      affiliation, _Value, _ServiceAf) ->
    false;
 can_change_ra(_FAffiliation, moderator,
 	      _TAffiliation, visitor,
-	      role, none) ->
+	      role, none, _ServiceAf) ->
    true;
 can_change_ra(_FAffiliation, moderator,
 	      _TAffiliation, visitor,
-	      role, participant) ->
+	      role, participant, _ServiceAf) ->
    true;
 can_change_ra(FAffiliation, _FRole,
 	      _TAffiliation, visitor,
-	      role, moderator)
+	      role, moderator, _ServiceAf)
  when (FAffiliation == owner) or (FAffiliation == admin) ->
    true;
 can_change_ra(_FAffiliation, moderator,
 	      _TAffiliation, participant,
-	      role, none) ->
+	      role, none, _ServiceAf) ->
    true;
 can_change_ra(_FAffiliation, moderator,
 	      _TAffiliation, participant,
-	      role, visitor) ->
+	      role, visitor, _ServiceAf) ->
    true;
 can_change_ra(FAffiliation, _FRole,
 	      _TAffiliation, participant,
-	      role, moderator)
+	      role, moderator, _ServiceAf)
  when (FAffiliation == owner) or (FAffiliation == admin) ->
    true;
 can_change_ra(_FAffiliation, _FRole,
 	      owner, moderator,
-	      role, visitor) ->
+	      role, visitor, _ServiceAf) ->
    false;
 can_change_ra(owner, _FRole,
 	      _TAffiliation, moderator,
-	      role, visitor) ->
+	      role, visitor, _ServiceAf) ->
    true;
 can_change_ra(_FAffiliation, _FRole,
 	      admin, moderator,
-	      role, visitor) ->
+	      role, visitor, _ServiceAf) ->
    false;
 can_change_ra(admin, _FRole,
 	      _TAffiliation, moderator,
-	      role, visitor) ->
+	      role, visitor, _ServiceAf) ->
    true;
 can_change_ra(_FAffiliation, _FRole,
 	      owner, moderator,
-	      role, participant) ->
+	      role, participant, _ServiceAf) ->
    false;
 can_change_ra(owner, _FRole,
 	      _TAffiliation, moderator,
-	      role, participant) ->
+	      role, participant, _ServiceAf) ->
    true;
 can_change_ra(_FAffiliation, _FRole,
 	      admin, moderator,
-	      role, participant) ->
+	      role, participant, _ServiceAf) ->
    false;
 can_change_ra(admin, _FRole,
 	      _TAffiliation, moderator,
-	      role, participant) ->
+	      role, participant, _ServiceAf) ->
    true;
 can_change_ra(_FAffiliation, _FRole,
 	      _TAffiliation, _TRole,
-	      role, _Value) ->
+	      role, _Value, _ServiceAf) ->
    false.


@@ -2658,7 +2723,13 @@ get_config(Lang, StateData, From) ->
 		     Config#config.allow_query_users),
 	 ?BOOLXFIELD("Allow users to send invites",
 		     "muc#roomconfig_allowinvites",
-		     Config#config.allow_user_invites)
+		     Config#config.allow_user_invites),
+	 ?BOOLXFIELD("Allow visitors to send status text in presence updates",
+		     "muc#roomconfig_allowvisitorstatus",
+		     Config#config.allow_visitor_status),
+	 ?BOOLXFIELD("Allow visitors to change nickname",
+		     "muc#roomconfig_allowvisitornickchange",
+		     Config#config.allow_visitor_nickchange)
 	] ++
 	case mod_muc_log:check_access_log(
 	       StateData#state.server_host, From) of
@@ -2729,6 +2800,10 @@ set_xoption([{"allow_query_users", [Val]} | Opts], Config) ->
    ?SET_BOOL_XOPT(allow_query_users, Val);
 set_xoption([{"allow_private_messages", [Val]} | Opts], Config) ->
    ?SET_BOOL_XOPT(allow_private_messages, Val);
+set_xoption([{"muc#roomconfig_allowvisitorstatus", [Val]} | Opts], Config) ->
+    ?SET_BOOL_XOPT(allow_visitor_status, Val);
+set_xoption([{"muc#roomconfig_allowvisitornickchange", [Val]} | Opts], Config) ->
+    ?SET_BOOL_XOPT(allow_visitor_nickchange, Val);
 set_xoption([{"muc#roomconfig_publicroom", [Val]} | Opts], Config) ->
    ?SET_BOOL_XOPT(public, Val);
 set_xoption([{"public_list", [Val]} | Opts], Config) ->
@@ -2821,6 +2896,8 @@ set_opts([{Opt, Val} | Opts], StateData) ->
 	      ?CASE_CONFIG_OPT(allow_change_subj);
 	      ?CASE_CONFIG_OPT(allow_query_users);
 	      ?CASE_CONFIG_OPT(allow_private_messages);
+	      ?CASE_CONFIG_OPT(allow_visitor_status);
+	      ?CASE_CONFIG_OPT(allow_visitor_nickchange);
 	      ?CASE_CONFIG_OPT(public);
 	      ?CASE_CONFIG_OPT(public_list);
 	      ?CASE_CONFIG_OPT(persistent);
@@ -2860,6 +2937,8 @@ make_opts(StateData) ->
     ?MAKE_CONFIG_OPT(allow_change_subj),
     ?MAKE_CONFIG_OPT(allow_query_users),
     ?MAKE_CONFIG_OPT(allow_private_messages),
+     ?MAKE_CONFIG_OPT(allow_visitor_status),
+     ?MAKE_CONFIG_OPT(allow_visitor_nickchange),
     ?MAKE_CONFIG_OPT(public),
     ?MAKE_CONFIG_OPT(public_list),
     ?MAKE_CONFIG_OPT(persistent),
@@ -5,7 +5,7 @@
 %%% Created :  5 Jan 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -5,7 +5,7 @@
 %%% Created :  5 Jan 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   Process-one
+%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -116,6 +116,8 @@ loop(Host, MaxOfflineMsgs) ->
 		    case catch odbc_queries:add_spool(Host, Query) of
 			{'EXIT', Reason} ->
 			    ?ERROR_MSG("~p~n", [Reason]);
+			{error, Reason} ->
+			    ?ERROR_MSG("~p~n", [Reason]);
 			_ ->
 			    ok
 		    end
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Badlop	2feb929c55	Fix release date of ejabberd 2.0.2 to 28 August 2008 SVN Revision: 1557	2008-08-30 11:17:03 +00:00
Badlop	b193ada44d	* src/ejabberd.app: Fix version number to 2.0.2 SVN Revision: 1556	2008-08-30 11:13:06 +00:00
Christophe Romain	2cdb70556b	fix 2.0.2 version SVN Revision: 1555	2008-08-27 16:35:26 +00:00
Christophe Romain	adaa3ffd2b	tag for ejabberd-2.0.2 release SVN Revision: 1554	2008-08-27 16:33:06 +00:00
Christophe Romain	55b586e51c	send last published events now supports PEP events from unavailable users nodes (EJAB-698) SVN Revision: 1549	2008-08-27 09:25:24 +00:00
Badlop	0b217097dd	* doc/release_notes_2.0.2.txt: Update for final release * doc/guide.tex: Windows binary installer requires MSVC++ 5 * doc/guide.html: Likewise SVN Revision: 1548	2008-08-26 14:26:56 +00:00
Christophe Romain	d5df314295	get_items bugfix (EJAB-716) SVN Revision: 1541	2008-08-25 22:51:17 +00:00
Christophe Romain	28c34a844a	Prevent case_clause error when ejabber_odbc:sql_query returns {error, Reason} SVN Revision: 1539	2008-08-25 13:34:53 +00:00
Christophe Romain	3c88ab49f0	Prevent case_clause error when ejabber_odbc:sql_query returns {error, Reason} SVN Revision: 1537	2008-08-25 13:11:25 +00:00
Badlop	b338dd671f	* src/ejabberd_check.erl: Detect correctly MSSQL and ODBC configuration (EJAB-710) SVN Revision: 1536	2008-08-25 12:08:22 +00:00
Geoff Cant	2cda62dceb	EJAB-624: fixes mod_muc_room:is_visitor/2 to use get_role not get_affiliation SVN Revision: 1535	2008-08-23 23:23:51 +00:00
Badlop	5d6fe1a055	* src/ejabberd_router.erl: Fix call to mnesia match_object SVN Revision: 1533	2008-08-22 11:35:32 +00:00
Badlop	7ecbc0cd89	* doc/guide.tex: Fix names of chatroom to room, user to occupant * doc/guide.html: Likewise SVN Revision: 1532	2008-08-21 15:13:25 +00:00
Badlop	2f4db862f4	* src/mod_register.erl: Change password using mod_register always returns success regardless of real result (EJAB-723) * src/ejabberd_auth.erl: Likewise * src/ejabberd_auth_external.erl: Likewise * src/ejabberd_auth_internal.erl: Likewise * src/ejabberd_auth_odbc.erl: Likewise SVN Revision: 1530	2008-08-18 18:21:10 +00:00
Badlop	11f68cf7fd	* src/msgs/sv.msg: Fixed formatting typos SVN Revision: 1526	2008-08-16 12:06:13 +00:00
Badlop	5a05eb8d62	* src/gen_mod.erl: Export stop_module_keep_config/2 (EJAB-706) SVN Revision: 1525	2008-08-16 12:03:21 +00:00
Badlop	79a0a44505	* doc/guide.tex: Explain that LDAP is read-only storage (thanks to Evgeniy Khramtsov) * doc/guide.html: Likewise SVN Revision: 1521	2008-08-13 11:00:21 +00:00
Badlop	54842e7585	* src/msgs/sk.msg: Updated (thanks to Marek Becka) SVN Revision: 1519	2008-08-11 00:48:57 +00:00
Badlop	76b19660e3	* src/msgs/eo.msg: Updated (thanks to Andreas van Cranenburgh) * src/msgs/nl.msg: Updated (thanks to Andreas van Cranenburgh) * src/msgs/sv.msg: Updated (thanks to Thore Alstromer and Heysan) SVN Revision: 1518	2008-08-10 11:40:41 +00:00
Badlop	68ecc1f082	Retract from previous commit the code that checked the connection is attempted to a known served component (EJAB-717) SVN Revision: 1517	2008-08-09 20:09:37 +00:00
Badlop	9147a1d2dd	* src/ejabberd_service.erl: Fix XEP-0114 compliance: define xmlns in header of error response; check the connection is attempted to a served component; include in response the JID of served component not server (thanks to Sergei Golovan) SVN Revision: 1516	2008-08-09 18:08:00 +00:00
Badlop	469f1c43a6	* doc/release_notes_2.0.2.txt: Added for ejabberd 2.0.2-beta1 SVN Revision: 1503	2008-08-01 10:31:39 +00:00
Badlop	9dd66c241c	* src/web/ejabberd_http.erl: Temporary solution for check of packet size when HTTPS (EJAB-611)(EJAB-507)(EJAB-574) SVN Revision: 1502	2008-08-01 08:50:19 +00:00
Badlop	f5e489c764	* doc/guide.tex: Update Process-one name to ProcessOne (EJAB-708) * doc/guide.html: Likewise * doc/api/overview.edoc: Likewise * src//.erl: Likewise * src//.hrl: Likewise * src//.c: Likewise * src/odbc/*.sql: Likewise SVN Revision: 1499	2008-07-31 11:18:49 +00:00
Badlop	31b00c25c8	* src/mod_muc/mod_muc_room.erl: Support Reasons for all affiliation and role changes (EJAB-306) SVN Revision: 1498	2008-07-30 18:24:08 +00:00
Badlop	4f1fe31627	* src/gen_mod.erl: When ejabberd is kindly stopped, don't forget modules configuration (EJAB-706) * src/ejabberd_app.erl: Likewise SVN Revision: 1497	2008-07-30 18:11:14 +00:00
Badlop	d22154a2d4	* src/msgs/uk.msg: Fix: each string in a single line * src/msgs/wa.msg: Likewise * src/msgs/es.msg: Fix typo * src/msgs/gl.msg: Likewise * src/msgs/pt-br.msg: Likewise * src/msgs/zh.msg: Fix some strings (thanks to Zhan Caibao) SVN Revision: 1496	2008-07-30 14:09:36 +00:00
Badlop	751a8fbd37	* src/msgs/ca.msg: Updated (thanks to Badlop) * src/msgs/cs.msg: Updated (thanks to Lukas Poliuvk) * src/msgs/de.msg: Updated (thanks to Nikolaus Polak) * src/msgs/es.msg: Updated (thanks to Badlop) * src/msgs/fr.msg: Updated (thanks to Christophe Romain) * src/msgs/it.msg: Updated (thanks to Luca Brivio) * src/msgs/ja.msg: Updated (thanks to Tsukasa Hamano) * src/msgs/no.msg: Updated (thanks to Stian B. Barmen) * src/msgs/pl.msg: Updated (thanks to Zbyszek Zolkiewski) * src/msgs/pt-br.msg: Updated (thanks to Otavio Fernandes) * src/msgs/ru.msg: Updated (thanks to Evgeniy Khramtsov) * src/msgs/tr.msg: Updated (thanks to Doruk Fisek) * src/msgs/uk.msg: Updated (thanks to Ruslan Rakhmanin) * src/msgs/wa.msg: Updated (thanks to Pablo Saratxaga) * src/msgs/zh.msg: Updated (thanks to Shelley Shyan) SVN Revision: 1495	2008-07-29 11:21:53 +00:00
Badlop	971165cb88	* doc/guide.tex: Document how to get error message when ejabberd crash dumps at start (EJAB-660) * doc/guide.html: Likewise SVN Revision: 1494	2008-07-28 16:55:01 +00:00
Badlop	6ea15171f7	* src/mod_muc/mod_muc_room.erl: Add 'description' to the mod_muc_room config record; it will be used in ejabberd 2.1.x branch (EJAB-670) SVN Revision: 1493	2008-07-28 16:15:51 +00:00
Christophe Romain	782ee63266	Speedup startup with many pubsub nodes (EJAB-669) SVN Revision: 1490	2008-07-25 09:06:09 +00:00
Badlop	d9f3c87899	* doc/guide.tex: Include example PAM configuration file ejabberd.pam (thanks to Evgeniy Khramtsov)(EJAB-704) * doc/guide.html: Likewise SVN Revision: 1489	2008-07-24 18:21:40 +00:00
Badlop	2d5fdbab64	* src/mod_proxy65/mod_proxy65_lib.erl: Send protocol compliant SOCKS5 reply; this breaks support of uncompliant Psi<0.10 (thanks to Felix Geyer)(EJAB-632) * src/mod_proxy65/mod_proxy65_stream.erl: Likewise SVN Revision: 1488	2008-07-24 18:03:28 +00:00
Badlop	f841acb21f	* src/mod_register.erl: When a registration is blocked due to IP limitation, return description in error stanza (EJAB-692) SVN Revision: 1487	2008-07-24 17:49:37 +00:00
Christophe Romain	71e87aef6e	allow owner to subscribe/get its one node (EJAB-705) SVN Revision: 1485	2008-07-24 14:06:28 +00:00
Badlop	df21b2d48c	* src/Makefile.in: Support for parallel compilation with 'make -j' in multi core CPUs: fix compilation dependencies; compile behaviors before other source code (EJAB-697)(thanks to Jonathan Schleifer) * src/mod_pubsub/Makefile.in: Likewise * src/eldap/Makefile.in: Likewise SVN Revision: 1484	2008-07-24 11:53:00 +00:00
Badlop	35f520e3d9	* doc/guide.tex: Document room options allow_visitor_nickchange and allow_visitor_status (EJAB-624) * doc/guide.html: Likewise SVN Revision: 1483	2008-07-24 11:22:43 +00:00
Geoff Cant	318823fe68	Altering XForms text for allow_visitor_status mod_muc_room option. (EJAB-624) SVN Revision: 1481	2008-07-23 17:45:39 +00:00
Geoff Cant	102281194f	Remove allow_visitor_presence, add allow_visitor_status [merge from trunk@1477-1478] (EJAB-624) SVN Revision: 1479	2008-07-23 16:58:52 +00:00
Geoff Cant	6768a21d36	Implementing muc_room visitor presence restrictions. [merge from trunk@1475] (EJAB-624) SVN Revision: 1476	2008-07-23 13:03:30 +00:00
Christophe Romain	895e104b6a	subscribing to a node sends only last items (EJAB-700), send_last_items bugfix SVN Revision: 1473	2008-07-23 01:13:36 +00:00
Christophe Romain	c6090dd8ca	pubsub improvement, fixes EJAB-684 EJAB-675 EJAB-663 SVN Revision: 1471	2008-07-22 23:41:40 +00:00
Badlop	293676d2a6	* src/ejabberd_config.erl: If syntax mistake in config file, show specific error message (EJAB-616) SVN Revision: 1470	2008-07-22 16:08:57 +00:00
Badlop	4ebaf3efa0	* src/mod_muc/mod_muc_room.erl: Fix to allow a server admin to add himself as owner of a room (EJAB-687) SVN Revision: 1460	2008-07-17 17:32:11 +00:00
Badlop	82e8b16a39	* src/Makefile.in: ejabberctl doesn't use the erl found by the configure script (EJAB-676) * src/ejabberdctl.template: Likewise SVN Revision: 1459	2008-07-17 17:13:01 +00:00
Christophe Romain	fc2ea76a45	use -DSSL39 if compiling with R12 SVN Revision: 1455	2008-07-16 22:23:58 +00:00
Badlop	ae939c5f80	* src/ejabberd_c2s.erl: Put auth_module in Info always (EJAB-549) SVN Revision: 1454	2008-07-16 18:05:46 +00:00
Christophe Romain	745106c83d	Rolled back the previous IP getting patch, and Report connection's IP address SVN Revision: 1452	2008-07-16 13:30:37 +00:00
Christophe Romain	546bb02153	Rolled back the previous IP getting patch, and Report connection's IP address SVN Revision: 1451	2008-07-16 13:29:57 +00:00
Badlop	663f6f76a7	* doc/guide.tex: Improve explanation of option 'hosts' in ejabberd_service * doc/guide.html: Likewise SVN Revision: 1448	2008-07-16 10:21:45 +00:00
Badlop	b1ca88a5eb	* src/configure.ac: Improve legibility * src/aclocal.m4: Likewise * src/configure: Likewise * src/ejabberdctl.template: Remove garbage variable. Document node option * doc/guide.tex: Add references to sections. * doc/guide.html: Likewise SVN Revision: 1438	2008-07-12 21:32:45 +00:00
Badlop	cdcc3a2520	* doc/guide.tex: Document how to insert a newline character in welcome_message (EJAB-501) * src/ejabberd.cfg.example: Likewise SVN Revision: 1437	2008-07-11 13:47:15 +00:00
Christophe Romain	3c90d7c2b9	change needed to support previous blacklist support SVN Revision: 1432	2008-07-11 07:13:41 +00:00
Christophe Romain	bc18e89d61	Backport C2S blacklist support from trunk SVN Revision: 1431	2008-07-11 06:59:45 +00:00
Badlop	e956ca4fe3	* src/configure.ac: Don't check for erlang header file (EJAB-232) * src/configure: Likewise SVN Revision: 1430	2008-07-10 18:09:18 +00:00
Badlop	53c994825c	* src/configure.ac: Check for erlang header files (EJAB-232) * src/configure: Likewise SVN Revision: 1429	2008-07-09 21:33:34 +00:00
Badlop	085d979037	* src/mod_pubsub/mod_pubsub.erl: Fix compilation warnings * src/mod_pubsub/node_zoo.erl: Likewise * src/mod_shared_roster.erl: Likewise SVN Revision: 1428	2008-07-09 21:26:25 +00:00
Badlop	49b02c0a9f	* src/mod_muc/mod_muc_log.erl: Fix XHTML compliance: ensure some language is set, include ID attribute in each message, add microseconds to ensure unique value (EJAB-497) SVN Revision: 1426	2008-07-09 18:39:41 +00:00
Badlop	d8405b694e	* src/ejabberd_config.erl (load_file): error message on sasl.log is not flattened (EJAB-616) SVN Revision: 1424	2008-07-09 16:08:32 +00:00
Badlop	95bd9068f7	* doc/guide.tex: mod_muc_log XMPP URI supports the updated version RFC 5122 (EJAB-631) * doc/guide.html: Likewise SVN Revision: 1423	2008-07-09 14:07:27 +00:00
Badlop	407d3b77b7	* tools/ejabberdctl: Work also when 'which' is unavailable SVN Revision: 1419	2008-07-08 11:07:45 +00:00
Christophe Romain	3dfcc4c4d3	typo fix SVN Revision: 1417	2008-07-08 10:31:29 +00:00
Christophe Romain	1de6329c41	typo on date fix SVN Revision: 1415	2008-07-08 10:18:54 +00:00
Christophe Romain	8047ff0617	improve ip fetching patch SVN Revision: 1414	2008-07-08 10:17:50 +00:00
Badlop	8032533f26	* src/Makefile.in: Spool, config and log dirs: writtable by owner, readable by group, nothing by others (EJAB-686) * doc/guide.tex: New section Securing sensible files * doc/guide.html: Likewise SVN Revision: 1413	2008-07-07 14:52:47 +00:00
Badlop	00c3bc2450	* doc/guide.tex: Solaris Makefile install: use ginstall (thanks to Jonathan Auer)(EJAB-649) * doc/guide.html: Likewise SVN Revision: 1412	2008-07-07 08:47:47 +00:00
Jérôme Sautret	c76a009238	Removed non ascii characters in changelog SVN Revision: 1411	2008-07-04 08:35:11 +00:00
Jérôme Sautret	8012133539	* src/mod_privacy_odbc.erl: Support for privacy lists in MySQL (thanks to Igor Goryachev)(EJAB-538)(merge r1409 from trunk) SVN Revision: 1410	2008-07-03 16:20:47 +00:00
Christophe Romain	1e56a614f9	PubSub improvements, and solves (EJAB-453) (EJAB-608) SVN Revision: 1407	2008-07-03 09:56:21 +00:00
Badlop	971c9ce5a5	* src/ejabberd_ctl.erl: Web Admin and Ad-hoc admin: dump only persistent tables (EJAB-678) SVN Revision: 1387	2008-06-29 11:59:06 +00:00
Badlop	7abfd51534	* src/mod_pubsub/node_pep.erl: Complain if mod_caps disabled and mod_pubsub has PEP plugin enabled (EJAB-677) SVN Revision: 1386	2008-06-29 11:34:30 +00:00
Badlop	7e86698606	* src/web/ejabberd_http.erl: Support PUT and DELETE methods in ejabberd_http (thanks to Eric Cestari)(EJAB-662) SVN Revision: 1373	2008-06-21 00:19:57 +00:00
Badlop	45ccda9961	* doc/guide.tex: Explain that S2S outgoing first tries IPv4 and if that fails then tries IPv6 * doc/guide.html: Likewise SVN Revision: 1372	2008-06-21 00:12:06 +00:00
Christophe Romain	2c9d424330	allow get_default on PEP nodes (EJAB-656) SVN Revision: 1363	2008-06-19 09:08:30 +00:00
Badlop	541f381145	* src/ejabberd.app: The ejabberd version number is defined in the OTP application resource file, in the key 'vsn' (EJAB-657) * src/ejabberd.hrl: The macro VERSION now consults the ejabberd application key vsn * src/configure.erl: Load the ejabberd application description * doc/Makefile: Read ejabberd version from ejabberd.app vsn * doc/api/Makefile: Likewise SVN Revision: 1361	2008-06-18 21:33:48 +00:00
Christophe Romain	a7cd412a76	temporary roster_groups_allowed fix (EJAB-655) SVN Revision: 1360	2008-06-18 16:35:17 +00:00
Christophe Romain	ab310255d7	pubsub get_default bugfix (EJAB-656) SVN Revision: 1357	2008-06-18 16:19:15 +00:00
Badlop	d9241c9e75	* src/ejabberd.cfg.example: Add registration_timeout (EJAB-653) SVN Revision: 1355	2008-06-13 17:51:01 +00:00
Badlop	bc8294990a	* doc/guide.tex: Title in HTML is shorter. Update several external URIs. SVN Revision: 1354	2008-06-13 15:25:57 +00:00
Badlop	25d8e53735	* doc/guide.tex: Document ldap_local_filter (EJAB-179) SVN Revision: 1353	2008-06-13 10:13:44 +00:00
Badlop	f59c0c9eb2	* doc/guide.tex: Table of listener modules converted to description. Table of modules overview simplified, and module names link to their sections. * doc/guide.html: Regenerated with all the latest changes SVN Revision: 1352	2008-06-12 23:52:13 +00:00
Badlop	aaae1339e1	* doc/guide.tex: Fix indentation of verbatim text SVN Revision: 1351	2008-06-12 23:01:09 +00:00
Badlop	38d218c129	* doc/guide.tex: Changes in CSS: verbatim text is indented and has grey background; descriptions are indented; table borders are softer. SVN Revision: 1350	2008-06-12 22:00:51 +00:00
Badlop	c67eaeb534	* doc/guide.tex: Permanent reference URL for sections (EJAB-651) SVN Revision: 1349	2008-06-12 21:54:30 +00:00
Badlop	8a140dd509	* doc/guide.tex: Small fixes (thanks to Christoph Anton Mitterer) * doc/introduction.tex: Likewise * doc/guide.html: Likewise SVN Revision: 1347	2008-06-08 16:52:25 +00:00
Badlop	6924b4c3e8	* doc/guide.tex: Document ejabberdctl status code (EJAB-633) * doc/guide.html: Likewise SVN Revision: 1346	2008-06-05 12:04:43 +00:00
Badlop	73f40db258	* src/msgs/pl.msg: Bugfix in arguments of translated string that could crash the room (thanks to Anastasia Gornostaeva) SVN Revision: 1345	2008-06-04 13:21:36 +00:00
Badlop	56740871f1	* src/web/ejabberd_web.erl (make_xhtml/2): Allow to include elements in the HTTP header SVN Revision: 1344	2008-05-31 18:21:43 +00:00
Badlop	6c9eb98792	* src/odbc/odbc_queries.erl (del_user_return_password): Return password (thanks to Oleg Palij) SVN Revision: 1343	2008-05-31 17:09:13 +00:00
Badlop	50b133f6a2	* README: R12 support: remove compilation warning (EJAB-630) SVN Revision: 1340	2008-05-22 00:01:18 +00:00
Badlop	fef60fe1d3	Retract the changes that SVN commit 1326 made in branches/ejabberd-2.0.x SVN Revision: 1339	2008-05-20 16:23:43 +00:00
Christophe Romain	31940f16c7	add release_notes_2.0.1 SVN Revision: 1338	2008-05-19 22:35:01 +00:00
Badlop	45c1bad6d8	* doc/guide.html: Updated * doc/dev.html: Likewise * doc/features.html: Likewise * doc/version.tex: Likewise * src/ejabberd.hrl: Version is 2.0.x SVN Revision: 1336	2008-05-19 09:46:42 +00:00
Badlop	6916d7b552	* src/configure.ac: R12 support: remove compilation warning (EJAB-630) * src/configure: Likewise * doc/guide.tex: Likewise SVN Revision: 1334	2008-05-19 09:20:35 +00:00
Badlop	39e93fcbbf	* doc/guide.tex: Describe how to disable registration limitation (EJAB-614) SVN Revision: 1333	2008-05-19 09:13:19 +00:00
Christophe Romain	7461cb5f72	Change FSMTIMEOUT to 30s SVN Revision: 1327	2008-05-16 15:28:23 +00:00
Christophe Romain	8e069daa61	fixing 1324 commit issue on tagged versions SVN Revision: 1326	2008-05-16 14:23:37 +00:00
Christophe Romain	8041c033a9	Don't activate a socket untill its receiver process is controlling it SVN Revision: 1325	2008-05-16 12:56:24 +00:00
Badlop	ca8c659804	* src/mod_muc/mod_muc_room.erl: Return Forbidden error message when user sends private message in a room that disallows it (EJAB-595) SVN Revision: 1323	2008-05-12 20:35:43 +00:00
Badlop	a96cf33df3	* src/web/ejabberd_http.erl (parse_auth): Allow password that include colon character (EJAB-522) SVN Revision: 1322	2008-05-12 17:56:27 +00:00
Christophe Romain	d75577fa34	change contribs to trunk SVN Revision: 1314	2008-05-01 22:37:56 +00:00