tag for 2.0.5

SVN Revision: 2003
* doc/release_notes_2.0.5.txt: Added file for new release
2009-04-01 15:05:29 +00:00 · 2009-04-01 10:37:18 +00:00 · 2009-03-24 23:09:46 +00:00 · 2009-03-24 18:02:13 +00:00 · 2009-03-11 18:36:27 +00:00 · 2009-03-10 21:10:42 +00:00
179 changed files with 4849 additions and 2952 deletions
@@ -1,3 +1,514 @@
+2009-04-01  Badlop  <badlop@process-one.net>
+
+	* doc/release_notes_2.0.5.txt: Added file for new release
+
+2009-03-25  Badlop  <badlop@process-one.net>
+
+	* src/expat_erl.c: Fix implicit declaration of function
+	x_fix_buff (thanks to Dennis Schridde)(EJAB-900)
+
+2009-03-24  Badlop  <badlop@process-one.net>
+
+	* src/ejabberd_sm.erl: Partially retract SVN r1976
+	EJAB-300 (EJAB-890). Check default privacy list when account, not
+	a specific session, receives a presence subscription
+	stanza (EJAB-300).
+	* src/ejabberd_c2s.erl: Likewise
+
+2009-03-10  Badlop  <badlop@process-one.net>
+
+	* doc/release_notes_2.0.4.txt: Added file for new release
+
+	* src/tls/tls_drv.c: Fix encryption problem for ejabberd_http
+	after timeout (thanks to Alexey Shchepin)(EJAB-880)
+
+2009-03-10  Christophe Romain <christophe.romain@process-one.net>
+
+	* src/mod_pubsub/mod_pubsub.erl: Fix PEP with other domains and s2s
+	(EJAB-825). Also fixes send last published items in subscription.
+
+2009-03-09  Badlop  <badlop@process-one.net>
+
+	* src/tls/tls_drv.c: Fix to support OpenSSL older than
+	0.9.8f (EJAB-877)(thanks to Jonathan Schleifer)
+	* doc/guide.tex: It is again supported OpenSSL older than 0.9.8f
+	* doc/guide.html: Likewise
+
+	* src/mod_proxy65/mod_proxy65_service.erl: if an ip option is not
+	defined, the module takes an IP address of a local
+	hostname (thanks to Evgeniy Khramtsov)
+
+2009-03-07  Badlop  <badlop@process-one.net>
+
+	* src/ejabberd_c2s.erl: Enforce privacy rules also for
+	subscription requests (EJAB-300)
+	* src/ejabberd_sm.erl: Likewise
+
+2009-03-06  Badlop  <badlop@process-one.net>
+
+	* src/eldap/eldap.erl: moves waiting for response queries to
+	pending queue on an LDAP connection failure (thanks to Evgeniy
+	Khramtsov)
+
+	* src/eldap/eldap.erl: implemented queue for pending
+	queries (thanks to Evgeniy Khramtsov)
+
+	* src/eldap/eldap.erl: Close a connection on tcp_error (thanks to
+	Evgeniy Khramtsov)
+
+	* src/eldap/Makefile.in: added +optimize and +driver compilation
+	options (thanks to Evgeniy Khramtsov)
+	* src/eldap/Makefile.win32: Likewise
+
+2009-03-05  Badlop  <badlop@process-one.net>
+
+	* src/ejabberd_app.erl: In a Windows machine, explicitly add the
+	nameservers, as it seems Erlang does not do itself (EJAB-860)
+	* src/win32_dns.erl: Get name servers from Windows registy (thanks
+	to Geoff Cant)
+
+	* doc/guide.tex: Require OpenSSL 0.9.8f or higher (EJAB-877)
+	* doc/guide.html: Likewise
+
+2009-03-04  Badlop  <badlop@process-one.net>
+
+	* src/ejabberd_auth.erl: If anonymous auth is enabled, when
+	checking if the account already exists in other auth methods, take
+	into account if the auth method failed (EJAB-882)
+	* src/ejabberd_auth_anonymous.erl: Likewise
+	* src/ejabberd_auth_external.erl: Likewise
+	* src/ejabberd_auth_internal.erl: Likewise
+	* src/ejabberd_auth_ldap.erl: Likewise
+	* src/ejabberd_auth_odbc.erl: Likewise
+	* src/ejabberd_auth_pam.erl: Likewise
+
+2009-03-04  Christophe Romain <christophe.romain@process-one.net>
+
+	* src/mod_pubsub/mod_pubsub.erl: Allow node creation without configure
+	item
+
+2009-03-03  Christophe Romain <christophe.romain@process-one.net>
+
+	* src/mod_pubsub/mod_pubsub.erl: Add roster subscriptions handling
+	so on_sub_and_presence if fully supported.
+
+	* src/mod_pubsub/mod_pubsub.erl: Allow to send PEP events to all
+	connected ressources, even via s2s.
+	* src/mod_caps.erl: Likewise
+
+2009-02-27  Badlop  <badlop@process-one.net>
+
+	* src/web/ejabberd_http.erl: Added a workaround for inet:peername
+	returning 'ebadf'
+
+	* src/cyrsasl_digest.erl: Unquote backslash in DIGEST-MD5 quoted
+	strings (EJAB-304)
+
+	* src/tls/tls_drv.c: S2S connection with STARTTLS fails to Gtalk
+	and recent Openfire (thanks to Philipp Hancke)(EJAB-877)
+
+	* doc/guide.tex: No mention to the release date in ejabberd Guide
+	or release notes. The date of an ejabberd release is determined by
+	the date of the corresponding release announcement.
+
+2009-02-23  Christophe Romain <christophe.romain@process-one.net>
+
+	* src/ejabberd_c2s.erl: Do not call mod_caps:clear_caps, this previous
+	optimization is too agressive and breaks PubSub/PEP standard behavior
+	(EJAB-854)
+
+2009-02-21  Badlop  <badlop@process-one.net>
+
+ 	* src/mod_muc/mod_muc_room.erl: Owner of a password protected room
+ 	must provide the password, like other participants (EJAB-867)
+
+ 	* src/mod_muc/mod_muc_log.erl: Prevent XSS in MUC logs by
+ 	linkifying only a few known protocols (EJAB-850)
+
+ 	* src/mod_roster.erl: When account is deleted, cancel presence
+ 	subscription for all roster items (EJAB-790)
+ 	* src/mod_roster_odbc.erl: Likewise
+
+ 	* src/mod_shared_roster.erl: Fix bug: a pending subscription
+ 	request, and later the requester added to the roster due to a
+ 	shared roster group, that request could neither be accepted or
+ 	rejected (thanks to Brian Cully)(EJAB-869)
+
+ 	* src/mod_pubsub/mod_pubsub.erl: The table pubsub_node in ejabberd
+ 	older than 2.0.2 had indexes for parentid and type. This is not
+ 	required since ejabberd 2.0.2, so those indexes can be
+ 	deleted. (EJAB-669)
+
+ 	* doc/Makefile: In Clean do not remove html. In new Distclean,
+	remove also html.
+
+ 	* doc/Makefile: When cleaning, remove contributed_modules.tex
+
+ 	* doc/guide.tex: Provide only an example of language option
+ 	* doc/guide.html: Likewise
+
+ 	* doc/guide.tex: mod_muc can run in several nodes of cluster
+ 	* doc/guide.html: Likewise
+
+ 	* src/odbc/mysql.sql: Fix complain about comment syntax
+ 	* src/odbc/pg.sql: Likewise
+
+ 	* doc/guide.tex: Explain that account creation is only supported
+ 	by internal and odbc authentication methods
+ 	* doc/guide.html: Likewise
+
+ 	* src/mod_privacy.erl: Privacy list items must be processed in the
+ 	specified order (EJAB-848)
+ 	* src/mod_privacy_odbc.erl: Likewise
+
+ 	* src/ejabberd_c2s.erl: Ensure unique ID in roster push (EJAB-721)
+ 	* src/mod_roster.erl: Likewise
+ 	* src/mod_roster_odbc.erl: Likewise
+ 	* src/mod_shared_roster.erl: Likewise
+
+2009-02-19  Christophe Romain <christophe.romain@process-one.net>
+
+	* src/mod_pubsub/mod_pubsub.erl: fix nodetree plugin resolver
+
+2009-02-13  Christophe Romain <christophe.romain@process-one.net>
+
+	* src/ejabberd_auth.erl: prevent from calling
+	get_vh_registered_users/2 when not available
+
+2009-01-13  Badlop  <badlop@process-one.net>
+
+	* doc/release_notes_2.0.3.txt: Minor changes
+
+2009-01-13  Mickael Remond  <mremond@process-one.net>
+
+	* src/tls/Makefile.win32: Windows compilation support.
+	* src/tls/tls_drv.c: Likewise.
+	* src/tls/stdint.h: Likewise.
+
+	* doc/guide.tex: Update Erlang version in Windows compilation
+	documentation.
+
+2009-01-13  Badlop  <badlop@process-one.net>
+
+	* src/msgs/pl.po: Fix typo (thanks to Apag0r)(EJAB-844)
+
+2009-01-12  Badlop  <badlop@process-one.net>
+
+	* doc/guide.tex: Update copyright date 2008 to 2009 (EJAB-842)
+	* doc/guide.html: Likewise
+	* src/*/*.erl: Likewise
+	* src/*/*.erl: Remove unneeded blankspaces in license text
+
+2009-01-11  Christophe Romain <christophe.romain@process-one.net>
+
+	* src/mod_pubsub/mod_pubsub.erl: fix owners cache and fix unsubscribe
+	permissions (thanks to Andy Skelton)(EJAB-840)
+	* src/mod_pubsub/node_default.erl: Likewise
+
+	* src/mod_pubsub/node_default.erl: prevent unauthorized entity to gain
+	none-affiliation for given entity (EJAB-840)
+
+2009-01-10  Christophe Romain <christophe.romain@process-one.net>
+
+	* src/mod_pubsub/node_default.erl: fix unsubscription of full jid
+	subscribed node (thanks to Andy Skelton)(EJAB-839)
+
+2009-01-09  Badlop  <badlop@process-one.net>
+
+	* doc/release_notes_2.0.3.txt: New file for new release
+
+	* doc/guide.tex: Improve explanation of backup commands (EJAB-832)
+	* doc/guide.html: Likewise
+
+	* src/web/ejabberd_web_admin.erl: New appearance of WebAdmin logo,
+	fixed logo-fill.
+
+	* src/mod_configure.erl: Fix access check for vhost configuration
+
+2009-01-08  Christophe Romain <christophe.romain@process-one.net>
+
+	* src/mod_pubsub/mod_pubsub.erl: completely support subscription using
+	full JID (EJAB-701)
+	* src/mod_pubsub/node_default.erl: Likewise
+
+	* src/mod_pubsub/node_default.erl: any entity can retrieve item when
+	node access model is "open" (thanks to Myers Carpenter)(EJAB-836)
+
+2009-01-08  Mickael Remond  <mremond@process-one.net>
+
+	* src/ejabberd_listener.erl: Define send timeout option to avoid
+	blocking on socket send (EJAB-746).
+	* src/ejabberd_s2s_out.erl: Likewise.
+
+2009-01-06  Badlop  <badlop@process-one.net>
+
+	* src/msgs/ru.msg: Fix typo (thanks to Dominges)
+
+2009-01-05  Alexey Shchepin  <alexey@process-one.net>
+
+	* src/tls/tls_drv.c: Added a flag to avoid certificate validation
+	* src/tls/tls.erl: Likewise
+	* src/ejabberd_c2s.erl: Likewise
+
+2009-01-03  Badlop  <badlop@process-one.net>
+
+	* src/*.erl: Fix EDoc comments
+
+2009-01-03  Christophe Romain <christophe.romain@process-one.net>
+
+	* src/mod_pubsub/mod_pubsub.erl: deliver notification depending on
+	presence-based-delivery configuration (EJAB-827). notification code
+	rewrite.
+
+	* src/mod_pubsub/mod_pubsub.erl: code cleanning, minor bugfixes
+	* src/mod_pubsub/node_default.erl: Likewise
+	* src/mod_pubsub/node_pep.erl: Likewise
+	* src/mod_pubsub/pubsub.hrl: Likewise
+
+	* src/mod_pubsub/mod_pubsub.erl: prevent subscribing with full jid,
+	waiting for full jid support (EJAB-701)
+
+2008-12-29  Alexey Shchepin  <alexey@process-one.net>
+
+	* src/ejabberd_c2s.erl: Bugfix in "from" attribute checking
+
+2008-12-28  Mickael Remond  <mremond@process-one.net>
+
+	* src/ejabberd_c2s.erl: Add resource to the from packet attribute
+	if missing (EJAB-812).
+
+2008-12-24  Badlop  <badlop@process-one.net>
+
+	* src/aclocal.m4: Fixes in configure script: fix
+	disable-ejabberd_zlib and disable-pam; in case of problems, PAM
+	verification aborts with error instead of warning. (EJAB-787)
+	* src/configure.ac: Likewise
+	* src/configure: Likewise
+
+2008-12-23  Badlop  <badlop@process-one.net>
+
+	* src/acl.erl: New ACL: shared_group (thanks to Maxim Ryazanov)
+	* doc/guide.tex: Likewise
+
+	* src/mod_shared_roster.erl: Push new group members when
+	registered or manually added to group: EJAB-730 EJAB-731 EJAB-732
+	EJAB-767 EJAB-794. When user is added to group, push it to other
+	members, and other members to it. When user is removed from group,
+	push deletion to other members, and other members to it. When user
+	is registered, push him to members of group @all@. When user is
+	deleted, push deletion to members of group @all@. Document several
+	functions in mod_shared_roster.
+
+	* src/ejabberd_auth.erl: Rename hook user_registered to
+	register_user, for name consistency with the widely used hook
+	remove_user. Run hook register_user in ejabberd_auth, so it's run
+	when account is created with any method. Run hook remove_user in
+	ejabberd_auth, so it's run when account is deleted with any
+	method.
+	* src/ejabberd_auth_internal.erl: Likewise
+	* src/ejabberd_auth_ldap.erl: Likewise
+	* src/ejabberd_auth_odbc.erl: Likewise
+	* src/ejabberd_auth_pam.erl: Likewise
+	* src/mod_register.erl: Likewise
+
+2008-12-23  Christophe Romain <christophe.romain@process-one.net>
+
+	* src/mod_pubsub/mod_pubsub.erl: Improve handling of PEP sent to
+	external contacts (EJAB-825)
+	* src/mod_caps.erl: Likewise
+
+2008-12-23  Badlop  <badlop@process-one.net>
+
+	* src/cyrsasl_digest.erl: Check digest-uri in SASL digest
+	authentication (thanks to Paul Guyot)(EJAB-569)
+
+	* src/odbc/odbc_queries.erl: Fix removal of private_storage of an
+	account when the account is removed
+
+	* src/mod_privacy.erl: Remove privacy lists of an account when the
+	account is removed (EJAB-720)
+	* src/mod_privacy_odbc.erl: Likewise
+
+2008-12-19  Christophe Romain <christophe.romain@process-one.net>
+
+	* src/mod_pubsub/mod_pubsub.erl: Fix send_last_published_item issue
+	when running on clustered table (thanks to Vincent Barat)(EJAB-793)
+
+2008-12-16  Badlop  <badlop@process-one.net>
+
+	* src/mod_pubsub/mod_pubsub.erl: Fix update pubsub tables from
+	ejabberd 1.x to 2.x (EJAB-817)
+
+	* doc/guide.tex: Fix capitalization of some section titles
+
+	* doc/guide.tex: Mention as optional Requirements: mysql, pgsql
+	and pam
+
+	* src/ejabberd_ctl.erl: Command reopen-log must also rotate
+	sasl.log (thanks to Alexander Tsvyashchenko)(EJAB-711)
+	* src/ejabberd_logger_h.erl: Export the function rotate_log/1
+	* doc/guide.tex: Improve explanation of log files rotation
+
+	* doc/guide.tex: Improve explanation of watchdog admins
+	option: only useful for developers (EJAB-816)
+	* src/ejabberd.cfg.example: Likewise
+
+	* doc/guide.tex: Say 'higher' instead of 'newer' in requirements
+	* README: Likewise
+
+	* doc/guide.tex: Simplify example mod_muc configuration
+
+2008-12-08  Christophe Romain <christophe.romain@process-one.net>
+
+	* src/ejabberd_c2s.erl: Reduce memory consumption due to caps handling
+	* src/mod_pubsub/mod_pubsub.erl: Likewise
+	* src/mod_caps.erl: Likewise
+
+	* src/mod_pubsub/mod_pubsub.erl: ignore unknown configuration fields
+	(EJAB-762) (thanks to Jack Moffitt)
+
+	* src/mod_pubsub/mod_pubsub.erl: fix node authorization bug (EJAB-798)
+	(thanks to Brian Cully)
+
+	* src/mod_pubsub/pubsub.hrl: remove unused pubsub_presence record
+
+	* src/mod_pubsub/node_default.erl: remove pubsub_state record when
+	unsubscribing node without affiliation (EJAB-776)
+
+2008-12-08  Mickael Remond  <mremond@process-one.net>
+
+	* src/ejabberd_c2s.erl: Enforce client stanza from attribute
+	(EJAB-812).
+	* src/jlib.erl: Likewise.
+
+2008-12-01  Badlop  <badlop@process-one.net>
+
+	* doc/guide.tex: New subsection Database Connection
+	* doc/guide.html: Likewise
+
+2008-12-01  Christophe Romain <christophe.romain@process-one.net>
+
+	* src/ejabberd_frontend_socket.erl: Hibernate ejabberd_receiver and
+	ejabberd_frontend_socket processes after timeout. Backported from
+	Aleksey's patch (r1680)
+	* src/ejabberd_frontend_socket.erl: Likewise
+
+	* src/tls/tls_drv.c: Don't create a SSL context on every connection
+	and disable SSLv2 on outgoing connections (EJAB-781). Backported from
+	Aleksey's patch (r1675)
+
+2008-11-26  Badlop  <badlop@process-one.net>
+
+	* src/mod_irc/mod_irc.erl: Announce disco#info (thanks to Spike)
+	* src/mod_muc/mod_muc.erl: Announce disco#info disco#items
+	* src/mod_proxy65/mod_proxy65_service.erl: No announce disco#items
+	* src/mod_pubsub/mod_pubsub.erl: Announce disco#info disco#items
+	* src/mod_vcard.erl: Announce disco#info
+
+	* src/gen_mod.erl: First store module options in ETS and Mnesia,
+	then start the module. In case of failure, remove options from
+	ETS. Until now the module was started before the options were
+	stored in database, and some modules started incorrectly because
+	they couldn't access the options from database; for instance
+	mod_muc_room required this for reading max_users option.
+
+	* src/mod_muc/mod_muc_room.erl: Include the value of max_users
+	service option and the current max_users room option in the list
+	of allowed room limit values.
+
+2008-10-17  Christophe Romain <christophe.romain@process-one.net>
+
+	* src/mod_pubsub/node_pep.erl: Fix get_node_affiliations resultset to
+	owner (Thanks to Michal Schmidt)
+
+2008-11-12  Badlop  <badlop@process-one.net>
+
+	* doc/guide.tex: Improve legibility of mod_irc example config
+
+2008-11-08  Mickael Remond  <mremond@process-one.net>
+
+	* src/ejabberd_s2s_out.erl: exports the DNS resolution
+	function.
+
+2008-10-27  Badlop  <badlop@process-one.net>
+
+	* src/ejabberd_app.erl: Open ejabberd.log before parsing
+	ejabberd.cfg and translation files (EJAB-777)
+
+2008-10-17  Christophe Romain <christophe.romain@process-one.net>
+
+	* src/mod_pubsub/mod_pubsub.erl: fix badarg issue on get_roster_info
+	when allowed roster groups is not defined
+
+	* src/mod_pubsub/mod_pubsub.erl: fix remove_user not unsubscribing
+	user (EJAB-684)
+
+	* src/mod_pubsub/node_default.erl: does not write item when max_items
+	set to 0 (solves EJAB-768)
+
+2008-10-13  Jerome Sautret  <jerome.sautret@process-one.net>
+
+	* src/odbc/ejabberd_odbc.erl: log MySQL driver messages.
+
+2008-10-07  Jerome Sautret  <jerome.sautret@process-one.net>
+
+	* src/mod_roster_odbc.erl: fix MySQL multiple requests issue.
+
+2008-10-06  Badlop  <badlop@process-one.net>
+
+	* doc/guide.html: Regenerated
+
+	* doc/guide.tex: Fix a problem in SVN merge from trunk
+
+2008-10-06  Jerome Sautret  <jerome.sautret@process-one.net>
+
+	* src/ejabberd_rdbms.erl: fix SQL database reconnection
+	issues (EJAB-764) and add odbc_start_interval configuration
+	directive (default to 30 seconds).
+	* src/odbc/ejabberd_odbc.erl: likewise.
+	* src/odbc/ejabberd_odbc_sup.erl: likewise.
+	* doc/guide.tex: likewise.
+
+2008-10-03  Jerome Sautret  <jerome.sautret@process-one.net>
+
+	* src/odbc/odbc_queries.erl: Fix syntax error on update_roster_sql query.
+
+2008-10-03  Jerome Sautret  <jerome.sautret@process-one.net>
+
+	* src/odbc/odbc_queries.erl: Fix empty query that fails on MySQL (merged from trunk).
+
+2008-10-01  Mickael Remond  <mremond@process-one.net>
+
+	* src/mod_shared_roster.erl: Correct roster push when changing
+	a shared roster entry name (EJAB-738).
+
+2008-09-30  Badlop  <badlop@process-one.net>
+
+	* src/*/Makefile.win32: Provide explicit beam filenames because
+	nmake does not accept wildcards (thanks to Attila
+	Vangel)(EJAB-543)
+
+2008-09-29  Badlop  <badlop@process-one.net>
+
+	* contrib/ejabberd-modules.repo: Include 2.0.x branches
+
+2008-09-22  Mickael Remond  <mremond@process-one.net>
+
+	* src/mod_configure.erl: Fix adhoc commands reply types for
+	"get-online-users-num" and "get-registered-users-num" (EJAB-756).
+
+2008-09-15  Badlop  <badlop@process-one.net>
+
+	* doc/guide.tex: Fix explanation of mod_muc's anonymous
+	option. Make clear that an ejabberd_service can only serve a
+	single external component. Provide Mnesia directory when setting
+	clustering (thanks to Matthew Reilly)
+
+2008-09-02  Badlop  <badlop@process-one.net>
+
+	* doc/guide.tex: Fix mod_proxy configuration example
+	* doc/guide.html: Likewise
+
 2008-08-27  Christophe Romain  <christophe.romain@process-one.net>

 	* src/mod_pubsub/mod_pubsub.erl: send last published events now supports
@@ -158,7 +669,7 @@

 	* 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
@@ -196,7 +707,7 @@
 	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 
+	* src/mod_pubsub/node_default.erl: fix node creation permission
 	issue for service

 2008-07-22  Badlop  <badlop@process-one.net>
@@ -215,7 +726,7 @@

 2008-07-17  Christophe Romain  <christophe.romain@process-one.net>

-	* src/web/Makefile.in: use -DSSL39 if compiling with R12 
+	* src/web/Makefile.in: use -DSSL39 if compiling with R12

 2008-07-16  Badlop  <badlop@process-one.net>

@@ -223,7 +734,7 @@

 2008-07-16  Alexey Shchepin  <alexey@process-one.net>

-	* src/web/ejabberd_http_poll.erl: Report connection's IP address 
+	* 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
@@ -9,7 +9,7 @@ To compile ejabberd you need:
 - GNU Make
 - GCC
 - libexpat 1.95 or higher
- - Erlang/OTP R10B-9 or newer
+ - Erlang/OTP R10B-9 or higher
 - 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/trunk
-https://svn.process-one.net/ejabberd-modules/mod_http_fileserver/trunk
+https://svn.process-one.net/ejabberd-modules/http_bind/tags/ejabberd-2.0.5
+https://svn.process-one.net/ejabberd-modules/mod_http_fileserver/tags/ejabberd-2.0.4
@@ -32,7 +32,6 @@ pdf:	guide.pdf features.pdf
 clean:
 	rm -f *.aux
 	rm -f *.haux
-	rm -f *.html
 	rm -f *.htoc
 	rm -f *.idx
 	rm -f *.ilg
@@ -41,6 +40,10 @@ clean:
 	rm -f *.out
 	rm -f *.pdf
 	rm -f *.toc
+	[ ! -f contributed_modules.tex ] || rm contributed_modules.tex
+
+distclean: clean
+	rm -f *.html

 guide.html:	guide.tex
 		hevea -fix -pedantic guide.tex
@@ -2,7 +2,7 @@
            "http://www.w3.org/TR/REC-html40/loose.dtd">
 <HTML>
 <HEAD>
-<TITLE>Ejabberd 2.0.x Developers Guide
+<TITLE>Ejabberd 2.0.5 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.x Developers Guide</H1><H3 CLASS="titlerest">Alexey Shchepin<BR>
+</P><TABLE CLASS="title"><TR><TD><H1 CLASS="titlemain">Ejabberd 2.0.5 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">
@@ -2,7 +2,7 @@
            "http://www.w3.org/TR/REC-html40/loose.dtd">
 <HTML>
 <HEAD>
-<TITLE>Ejabberd 2.0.x Feature Sheet
+<TITLE>Ejabberd 2.0.5 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.x Feature Sheet</H1><H3 CLASS="titlerest">Sander Devrieze<BR>
+</P><TABLE CLASS="title"><TR><TD><H1 CLASS="titlemain">Ejabberd 2.0.5 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">
@@ -1,7 +1,7 @@

                              Release Notes
                             ejabberd 2.0.2
-                             27 August 2008
+                             28 August 2008

  ejabberd 2.0.2 is the second bug fix release for ejabberd 2.0.x branch.

@@ -0,0 +1,35 @@
+
+                              Release Notes
+                             ejabberd 2.0.3
+                             14 January 2009
+
+  ejabberd 2.0.3 is the third bugfix release for ejabberd 2.0.x branch.
+
+  ejabberd 2.0.3 includes several bugfixes and a few improvements.
+  A complete list of changes can be retrieved from:
+     http://redir.process-one.net/ejabberd-2.0.3
+
+  The new code can be downloaded from ejabberd download page:
+     http://www.process-one.net/en/ejabberd/
+
+
+  Recent changes include:
+
+- Do not ask certificate for client (c2s)
+- Check digest-uri in SASL digest authentication
+- Use send timeout to avoid locking on gen_tcp:send
+- Fix ejabberd reconnection to database
+- HTTP-Bind: handle wrong order of packets
+- MUC: Improve traffic regulation management
+- PubSub: Several bugfixes and improvements for best coverage of XEP-0060 v1.12
+- Shared Roster Groups: push immediately membership changes
+- Rotate also sasl.log on "reopen-log" command
+- Binary Windows installer: better detect "Error running Post Install Script"
+
+
+  Bug reports
+
+  You can officially report bugs on ProcessOne support site:
+  http://support.process-one.net/
+
+END
@@ -0,0 +1,44 @@
+
+                              Release Notes
+                             ejabberd 2.0.4
+
+  ejabberd 2.0.4 is the fourth bugfix release for ejabberd 2.0.x branch.
+
+  ejabberd 2.0.4 includes several bugfixes.
+  A detailed list of changes can be retrieved from:
+     http://redir.process-one.net/ejabberd-2.0.4
+
+  The new code can be downloaded from ejabberd download page:
+     http://www.process-one.net/en/ejabberd/
+
+
+  The changes are:
+
+- Ensure ID attribute in roster push is unique
+- Authentication: Fix Anonymous auth when enabled with broken ODBC
+- Authentication: Unquote correctly backslash in DIGEST-MD5 SASL responses
+- Authentication: Cancel presence subscriptions on account deletion
+- LDAP: Close a connection on tcp_error
+- LDAP: Implemented queue for pending queries
+- LDAP: On failure of LDAP connection, waiting is done on pending queue
+- MUC: Owner of a password protected room must also provide the password
+- MUC: Prevent XSS in MUC logs by linkifying only a few known protocols
+- Privacy rules: Items are now processed in the specified order
+- Privacy rules: Fix to correctly block subscription requests
+- Proxy65: If ip option is not defined, take an IP address of a local hostname
+- PubSub: Add roster subscription handling; send PEP events to all resources
+- PubSub: Allow node creation without configure item
+- PubSub: Requesting items on a node which exists, but empty returns an error
+- PEP: Fix sending notifications to other domains and s2s
+- S2S: Fix problem with encrypted connection to Gtalk and recent Openfire
+- S2S: Workaround to get DNS SRV lookup to work on Windows machine
+- Shared Roster Groups: Fix to not resend authorization request
+- WebAdmin: Fix encryption problem for ejabberd_http after timeout
+
+
+  Bug reports
+
+  You can officially report bugs on ProcessOne support site:
+  http://support.process-one.net/
+
+END
@@ -0,0 +1,33 @@
+
+                              Release Notes
+                             ejabberd 2.0.5
+
+  ejabberd 2.0.5 is the fifth bugfix release in ejabberd 2.0.x branch.
+
+  ejabberd 2.0.5 includes three bugfixes.
+  More details of those fixes can be retrieved from:
+     http://redir.process-one.net/ejabberd-2.0.5
+
+  The new code can be downloaded from ejabberd download page:
+     http://www.process-one.net/en/ejabberd/
+
+
+  The changes are:
+
+- Fix two problems introduced in ejabberd 2.0.4: subscription request
+  produced many authorization requests with some clients and
+  transports; and subscription requests were not stored for later
+  delivery when receiver was offline.
+
+- Fix warning in expat_erl.c about implicit declaration of x_fix_buff
+
+- HTTP-Bind (BOSH): Fix a missing stream:error in the returned
+  remote-stream-error stanza
+
+
+  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.x}
+\newcommand{\version}{2.0.5}
@@ -5,7 +5,7 @@
 %%% Created : 18 Jan 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -178,6 +178,10 @@ match_acl(ACL, JID, Host) ->
 				       ((Host == global) andalso
 					lists:member(Server, ?MYHOSTS)))
 					  andalso is_regexp_match(User, UR);
+				  {shared_group, G} ->
+				      mod_shared_roster:is_user_in_group({User, Server}, G, Host);
+				  {shared_group, G, H} ->
+				      mod_shared_roster:is_user_in_group({User, Server}, G, H);
 				  {user_regexp, UR, S} ->
 				      (S == Server) andalso
 					  is_regexp_match(User, UR);
@@ -15,7 +15,7 @@ AC_DEFUN(AM_WITH_EXPAT,
 		     [ expat_found=no ],
 		     "$EXPAT_LIBS")
 	if test $expat_found = no; then
-		AC_MSG_ERROR([Could not find the Expat library])
+		AC_MSG_ERROR([Could not find development files of Expat library])
 	fi
 	expat_save_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS $EXPAT_CFLAGS"
@@ -36,6 +36,7 @@ AC_DEFUN(AM_WITH_ZLIB,
 [ AC_ARG_WITH(zlib,
 	      [AC_HELP_STRING([--with-zlib=PREFIX], [prefix where zlib is installed])])

+if test x"$ejabberd_zlib" != x; then
  ZLIB_CFLAGS=
  ZLIB_LIBS=
 	if test x"$with_zlib" != x; then
@@ -49,7 +50,7 @@ AC_DEFUN(AM_WITH_ZLIB,
 		     [ zlib_found=no ],
 		     "$ZLIB_LIBS")
 	if test $zlib_found = no; then
-		AC_MSG_ERROR([Could not find the zlib library])
+		AC_MSG_ERROR([Could not find development files of zlib library. Install them or disable `ejabberd_zlib' with: --disable-ejabberd_zlib])
 	fi
 	zlib_save_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS $ZLIB_CFLAGS"
@@ -57,19 +58,20 @@ AC_DEFUN(AM_WITH_ZLIB,
       CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS"
 	AC_CHECK_HEADERS(zlib.h, , zlib_found=no)
 	if test $zlib_found = no; then
-		AC_MSG_ERROR([Could not find zlib.h])
+		AC_MSG_ERROR([Could not find zlib.h. Install it or disable `ejabberd_zlib' with: --disable-ejabberd_zlib])
 	fi
 	CFLAGS="$zlib_save_CFLAGS"
       CPPFLAGS="$zlib_save_CPPFLAGS"

  AC_SUBST(ZLIB_CFLAGS)
  AC_SUBST(ZLIB_LIBS)
+fi
 ])

 AC_DEFUN(AM_WITH_PAM,
 [ AC_ARG_WITH(pam,
 	      [AC_HELP_STRING([--with-pam=PREFIX], [prefix where PAM is installed])])
-
+if test x"$pam" != x; then
  PAM_CFLAGS=
  PAM_LIBS=
 	if test x"$with_pam" != x; then
@@ -83,7 +85,7 @@ AC_DEFUN(AM_WITH_PAM,
 		     [ pam_found=no ],
 		     "$PAM_LIBS")
 	if test $pam_found = no; then
-		AC_MSG_WARN([Could not find the PAM library])
+		AC_MSG_ERROR([Could not find development files of PAM library. Install them or disable `pam' with: --disable-pam])
 	fi
 	pam_save_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS $PAM_CFLAGS"
@@ -91,13 +93,14 @@ AC_DEFUN(AM_WITH_PAM,
       CPPFLAGS="$CPPFLAGS $PAM_CFLAGS"
 	AC_CHECK_HEADERS(security/pam_appl.h, , pam_found=no)
 	if test $pam_found = no; then
-		AC_MSG_WARN([Could not find security/pam_appl.h])
+		AC_MSG_ERROR([Could not find security/pam_appl.h. Install it or disable `pam' with: --disable-pam])
 	fi
 	CFLAGS="$pam_save_CFLAGS"
       CPPFLAGS="$pam_save_CPPFLAGS"

  AC_SUBST(PAM_CFLAGS)
  AC_SUBST(PAM_LIBS)
+fi
 ])

 AC_DEFUN(AM_WITH_ERLANG,
@@ -337,7 +340,7 @@ if test x"$tls" != x; then
        fi
    done
 if test x${have_openssl} != xyes; then
-    AC_MSG_ERROR([openssl library cannot be found. Install openssl or disable `tls' module (--disable-tls).])
+    AC_MSG_ERROR([Could not find development files of OpenSSL library. Install them or disable `tls' with: --disable-tls])
 fi
 AC_SUBST(SSL_LIBS)
 AC_SUBST(SSL_CFLAGS)
@@ -5,7 +5,7 @@
 %%% Created : 31 Oct 2005 by Magnus Henoch <henoch@dtek.chalmers.se>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   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,7 +11,7 @@
 %%% 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
@@ -18,10 +18,6 @@ AM_WITH_ERLANG
 AM_ICONV
 #locating libexpat
 AM_WITH_EXPAT
-#locating zlib
-AM_WITH_ZLIB
-#locating PAM
-AM_WITH_PAM

 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -36,16 +32,22 @@ AC_PREFIX_DEFAULT(/)
 AC_FUNC_MALLOC
 AC_HEADER_STDC

-AC_MOD_ENABLE(mod_pubsub, yes)
 AC_MOD_ENABLE(mod_irc, yes)
 AC_MOD_ENABLE(mod_muc, yes)
 AC_MOD_ENABLE(mod_proxy65, yes)
+AC_MOD_ENABLE(mod_pubsub, yes)
 AC_MOD_ENABLE(eldap, yes)
-AC_MOD_ENABLE(pam, no)
-AC_MOD_ENABLE(web, yes)
-AC_MOD_ENABLE(tls, yes)
 AC_MOD_ENABLE(odbc, no)
+AC_MOD_ENABLE(tls, yes)
+AC_MOD_ENABLE(web, yes)
+
 AC_MOD_ENABLE(ejabberd_zlib, yes)
+#locating zlib
+AM_WITH_ZLIB
+
+AC_MOD_ENABLE(pam, no)
+#locating PAM
+AM_WITH_PAM

 AC_ARG_ENABLE(hipe,
 [AC_HELP_STRING([--enable-hipe], [compile natively with HiPE, not recommended (default: no)])],
@@ -5,7 +5,7 @@
 %%% Created : 27 Jan 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -5,7 +5,7 @@
 %%% Created :  8 Mar 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -6,7 +6,7 @@
 %%% Created : 23 Aug 2005 by Magnus Henoch <henoch@dtek.chalmers.se>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -17,7 +17,7 @@
 %%% 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
@@ -18,7 +18,8 @@

 -behaviour(cyrsasl).

-record(state, {step, nonce, username, authzid, get_password, auth_module}).
+-record(state, {step, nonce, username, authzid, get_password, auth_module,
+		host}).

 start(_Opts) ->
    cyrsasl:register_mechanism("DIGEST-MD5", ?MODULE, true).
@@ -26,9 +27,10 @@ start(_Opts) ->
 stop() ->
    ok.

-mech_new(_Host, GetPassword, _CheckPassword) ->
+mech_new(Host, GetPassword, _CheckPassword) ->
    {ok, #state{step = 1,
 		nonce = randoms:get_string(),
+		host = Host,
 		get_password = GetPassword}}.

 mech_step(#state{step = 1, nonce = Nonce} = State, _) ->
@@ -41,27 +43,35 @@ mech_step(#state{step = 3, nonce = Nonce} = State, ClientIn) ->
 	bad ->
 	    {error, "bad-protocol"};
 	KeyVals ->
+	    DigestURI = xml:get_attr_s("digest-uri", KeyVals),
 	    UserName = xml:get_attr_s("username", KeyVals),
-	    AuthzId = xml:get_attr_s("authzid", KeyVals),
-	    case (State#state.get_password)(UserName) of
-		{false, _} ->
+	    case is_digesturi_valid(DigestURI, State#state.host) of
+		false ->
+		    ?DEBUG("User login not authorized because digest-uri "
+			   "seems invalid: ~p", [DigestURI]),
 		    {error, "not-authorized", UserName};
-		{Passwd, AuthModule} ->
-		    Response = response(KeyVals, UserName, Passwd,
-					Nonce, AuthzId, "AUTHENTICATE"),
-		    case xml:get_attr_s("response", KeyVals) of
-			Response ->
-			    RspAuth = response(KeyVals,
-					       UserName, Passwd,
-					       Nonce, AuthzId, ""),
-			    {continue,
-			     "rspauth=" ++ RspAuth,
-			     State#state{step = 5,
-					 auth_module = AuthModule,
-					 username = UserName,
-					 authzid = AuthzId}};
-			_ ->
-			    {error, "not-authorized", UserName}
+		true ->
+		    AuthzId = xml:get_attr_s("authzid", KeyVals),
+		    case (State#state.get_password)(UserName) of
+			{false, _} ->
+			    {error, "not-authorized", UserName};
+			{Passwd, AuthModule} ->
+			    Response = response(KeyVals, UserName, Passwd,
+						Nonce, AuthzId, "AUTHENTICATE"),
+			    case xml:get_attr_s("response", KeyVals) of
+				Response ->
+				    RspAuth = response(KeyVals,
+						       UserName, Passwd,
+						       Nonce, AuthzId, ""),
+				    {continue,
+				     "rspauth=" ++ RspAuth,
+				     State#state{step = 5,
+						 auth_module = AuthModule,
+						 username = UserName,
+						 authzid = AuthzId}};
+				_ ->
+				    {error, "not-authorized", UserName}
+			    end
 		    end
 	    end
    end;
@@ -75,7 +85,6 @@ mech_step(A, B) ->
    ?DEBUG("SASL DIGEST: A ~p B ~p", [A,B]),
    {error, "bad-protocol"}.

-
 parse(S) ->
    parse1(S, "", []).

@@ -92,15 +101,17 @@ parse1([], [], T) ->
 parse1([], _S, _T) ->
    bad.

-parse2([$" | Cs], Key, Val, Ts) ->
+parse2([$\" | Cs], Key, Val, Ts) ->
    parse3(Cs, Key, Val, Ts);
 parse2([C | Cs], Key, Val, Ts) ->
    parse4(Cs, Key, [C | Val], Ts);
 parse2([], _, _, _) ->
    bad.

-parse3([$" | Cs], Key, Val, Ts) ->
+parse3([$\" | Cs], Key, Val, Ts) ->
    parse4(Cs, Key, Val, Ts);
+parse3([$\\, C | Cs], Key, Val, Ts) ->
+    parse3(Cs, Key, [C | Val], Ts);
 parse3([C | Cs], Key, Val, Ts) ->
    parse3(Cs, Key, [C | Val], Ts);
 parse3([], _, _, _) ->
@@ -116,6 +127,23 @@ parse4([], Key, Val, Ts) ->
    parse1([], "", [{Key, lists:reverse(Val)} | Ts]).


+%% @doc Check if the digest-uri is valid.
+%% RFC-2831 allows to provide the IP address in Host,
+%% however ejabberd doesn't allow that.
+%% If the service (for example jabber.example.org)
+%% is provided by several hosts (being one of them server3.example.org),
+%% then digest-uri can be like xmpp/server3.example.org/jabber.example.org
+%% In that case, ejabberd only checks the service name, not the host.
+is_digesturi_valid(DigestURICase, JabberHost) ->
+    DigestURI = stringprep:tolower(DigestURICase),
+    case catch string:tokens(DigestURI, "/") of
+	["xmpp", Host] when Host == JabberHost ->
+	    true;
+	["xmpp", _Host, ServName] when ServName == JabberHost ->
+	    true;
+	_ ->
+	    false
+    end.



@@ -5,7 +5,7 @@
 %%% Created :  8 Mar 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -2,7 +2,7 @@

 {application, ejabberd,
 [{description, "ejabberd"},
-  {vsn, "2.0.x"},
+  {vsn, "2.0.5"},
  {modules, [acl,
 	     adhoc,
 	     configure,
@@ -72,8 +72,9 @@
 {loglevel, 4}.

 %%
-%% watchdog_admins: If an ejabberd process consumes too much memory, 
-%% send live notifications to those Jabber accounts.
+%% watchdog_admins: Only useful for developers: if an ejabberd process
+%% consumes a lot of memory, send live notifications to these Jabber
+%% accounts.
 %%
 %%{watchdog_admins, ["bob@example.com"]}.

@@ -5,7 +5,7 @@
 %%% Created : 16 Nov 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   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,7 +11,7 @@
 %%% 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
@@ -9,7 +9,7 @@
 %%% Created :  7 May 2006 by Mickael Remond <mremond@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -20,7 +20,7 @@
 %%% 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
@@ -5,7 +5,7 @@
 %%% Created : 31 Jan 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -46,13 +46,13 @@ start(normal, _Args) ->
    sha:start(),
    catch ssl:start(),
    stringprep_sup:start_link(),
+    start(),
    translate:start(),
    acl:start(),
    ejabberd_ctl:init(),
    gen_mod:start(),
    ejabberd_config:start(),
    ejabberd_check:config(),
-    start(),
    connect_nodes(),
    Sup = ejabberd_sup:start_link(),
    ejabberd_rdbms:start(),
@@ -62,6 +62,7 @@ start(normal, _Args) ->
    %eprof:start(),
    %eprof:profile([self()]),
    %fprof:trace(start, "/tmp/fprof"),
+    maybe_add_nameservers(),
    start_modules(),
    Sup;
 start(_, _) ->
@@ -168,3 +169,15 @@ connect_nodes() ->
 			  end, Nodes)
    end.

+
+%% If ejabberd is running on some Windows machine, get nameservers and add to Erlang
+maybe_add_nameservers() ->
+    case os:type() of
+	{win32, _} -> add_windows_nameservers();
+	_ -> ok
+    end.
+
+add_windows_nameservers() ->
+    IPTs = win32_dns:get_nameservers(),
+    ?INFO_MSG("Adding machine's DNS IPs to Erlang system:~n~p", [IPTs]),
+    lists:foreach(fun(IPT) -> inet_db:add_ns(IPT) end, IPTs).
@@ -5,7 +5,7 @@
 %%% Created : 23 Nov 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -80,20 +80,21 @@ plain_password_required(Server) ->
 %% @spec (User::string(), Server::string(), Password::string()) ->
 %%     true | false
 check_password(User, Server, Password) ->
-    lists:any(
-      fun(M) ->
-	      M:check_password(User, Server, Password)
-      end, auth_modules(Server)).
+    case check_password_with_authmodule(User, Server, Password) of
+	{true, _AuthModule} -> true;
+	false -> false
+    end.

 %% @doc Check if the user and password can login in server.
 %% @spec (User::string(), Server::string(), Password::string(),
 %%        StreamID::string(), Digest::string()) ->
 %%     true | false
 check_password(User, Server, Password, StreamID, Digest) ->
-    lists:any(
-      fun(M) ->
-	      M:check_password(User, Server, Password, StreamID, Digest)
-      end, auth_modules(Server)).
+    case check_password_with_authmodule(User, Server, Password,
+					StreamID, Digest) of
+	{true, _AuthModule} -> true;
+	false -> false
+    end.

 %% @doc Check if the user and password can login in server.
 %% The user can login if at least an authentication method accepts the user
@@ -106,27 +107,23 @@ check_password(User, Server, Password, StreamID, Digest) ->
 %%                 | ejabberd_auth_internal | ejabberd_auth_ldap
 %%                 | ejabberd_auth_odbc | ejabberd_auth_pam
 check_password_with_authmodule(User, Server, Password) ->
-    Res = lists:dropwhile(
-	    fun(M) ->
-		    not apply(M, check_password,
-			      [User, Server, Password])
-	    end, auth_modules(Server)),
-    case Res of
-	[] -> false;
-	[AuthMod | _] -> {true, AuthMod}
-    end.
+    check_password_loop(auth_modules(Server), [User, Server, Password]).

 check_password_with_authmodule(User, Server, Password, StreamID, Digest) ->
-    Res = lists:dropwhile(
-	    fun(M) ->
-		    not apply(M, check_password,
-			      [User, Server, Password, StreamID, Digest])
-	    end, auth_modules(Server)),
-    case Res of
-	[] -> false;
-	[AuthMod | _] -> {true, AuthMod}
+    check_password_loop(auth_modules(Server), [User, Server, Password,
+					       StreamID, Digest]).
+
+check_password_loop([], _Args) ->
+    false;
+check_password_loop([AuthModule | AuthModules], Args) ->
+    case apply(AuthModule, check_password, Args) of
+	true ->
+	    {true, AuthModule};
+	false ->
+	    check_password_loop(AuthModules, Args)
    end.

+
 %% @spec (User::string(), Server::string(), Password::string()) ->
 %%       ok | {error, ErrorType}
 %% where ErrorType = empty_password | not_allowed | invalid_jid
@@ -141,6 +138,7 @@ set_password(User, Server, Password) ->
 	      Res
      end, {error, not_allowed}, auth_modules(Server)).

+%% @spec (User, Server, Password) -> {atomic, ok} | {atomic, exists} | {error, not_allowed}
 try_register(_User, _Server, "") ->
    %% We do not allow empty password
    {error, not_allowed};    
@@ -151,12 +149,19 @@ try_register(User, Server, Password) ->
 	false ->
 	    case lists:member(jlib:nameprep(Server), ?MYHOSTS) of
 		true ->
-		    lists:foldl(
+		    Res = lists:foldl(
 		      fun(_M, {atomic, ok} = Res) ->
 			      Res;
 			 (M, _) ->
 			      M:try_register(User, Server, Password)
-		      end, {error, not_allowed}, auth_modules(Server));
+		      end, {error, not_allowed}, auth_modules(Server)),
+		    case Res of
+			{atomic, ok} ->
+			    ejabberd_hooks:run(register_user, Server,
+					       [User, Server]),
+			    {atomic, ok};
+			_ -> Res
+		    end;
 		false ->
 		    {error, not_allowed}
 	    end
@@ -179,7 +184,13 @@ get_vh_registered_users(Server) ->
 get_vh_registered_users(Server, Opts) ->
    lists:flatmap(
      fun(M) ->
-	      M:get_vh_registered_users(Server, Opts)
+		case erlang:function_exported(
+		       M, get_vh_registered_users, 2) of
+		    true ->
+			M:get_vh_registered_users(Server, Opts);
+		    false ->
+			M:get_vh_registered_users(Server)
+		end
      end, auth_modules(Server)).

 get_vh_registered_users_number(Server) ->
@@ -247,23 +258,58 @@ is_user_exists(User, Server) ->

 %% Check if the user exists in all authentications module except the module
 %% passed as parameter
+%% @spec (Module::atom(), User, Server) -> true | false | maybe
 is_user_exists_in_other_modules(Module, User, Server) ->
-    lists:any(
-      fun(M) ->
-	      M:is_user_exists(User, Server)
-      end, auth_modules(Server)--[Module]).
+    is_user_exists_in_other_modules_loop(
+      auth_modules(Server)--[Module],
+      User, Server).
+is_user_exists_in_other_modules_loop([], _User, _Server) ->
+    false;
+is_user_exists_in_other_modules_loop([AuthModule|AuthModules], User, Server) ->
+    case AuthModule:is_user_exists(User, Server) of
+	true ->
+	    true;
+	false ->
+	    is_user_exists_in_other_modules_loop(AuthModules, User, Server);
+	{error, Error} ->
+	    ?DEBUG("The authentication module ~p returned an error~nwhen "
+		   "checking user ~p in server ~p~nError message: ~p",
+		   [AuthModule, User, Server, Error]),
+	    maybe
+    end.

+
+%% @spec (User, Server) -> ok | error | {error, not_allowed}
+%% @doc Remove user.
+%% Note: it may return ok even if there was some problem removing the user.
 remove_user(User, Server) ->
-    lists:foreach(
+    R = lists:foreach(
      fun(M) ->
 	      M:remove_user(User, Server)
-      end, auth_modules(Server)).
+      end, auth_modules(Server)),
+    case R of
+		ok -> ejabberd_hooks:run(remove_user, jlib:nameprep(Server), [User, Server]);
+		_ -> none
+    end,
+    R.

+%% @spec (User, Server, Password) -> ok | not_exists | not_allowed | bad_request | error
+%% @doc Try to remove user if the provided password is correct.
+%% The removal is attempted in each auth method provided:
+%% when one returns 'ok' the loop stops;
+%% if no method returns 'ok' then it returns the error message indicated by the last method attempted.
 remove_user(User, Server, Password) ->
-    lists:foreach(
-      fun(M) ->
+    R = lists:foldl(
+      fun(_M, ok = Res) ->
+	      Res;
+	 (M, _) ->
 	      M:remove_user(User, Server, Password)
-      end, auth_modules(Server)).
+      end, error, auth_modules(Server)),
+    case R of
+		ok -> ejabberd_hooks:run(remove_user, jlib:nameprep(Server), [User, Server]);
+		_ -> none
+    end,
+    R.

 ctl_process_get_registered(_Val, Host, ["registered-users"]) ->
    Users = ejabberd_auth:get_vh_registered_users(Host),
@@ -5,7 +5,7 @@
 %%% Created : 17 Feb 2006 by Mickael Remond <mremond@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -178,7 +178,10 @@ check_password(User, Server, _Password, _StreamID, _Digest) ->
    %% they however are "reserved")
    case ejabberd_auth:is_user_exists_in_other_modules(?MODULE, 
 						       User, Server) of
+	%% If user exists in other module, reject anonnymous authentication
 	true  -> false;
+	%% If we are not sure whether the user exists in other module, reject anon auth
+	maybe  -> false;
 	false -> login(User, Server)
    end.

@@ -5,7 +5,7 @@
 %%% Created : 12 Dec 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -83,8 +83,13 @@ get_password(_User, _Server) ->
 get_password_s(_User, _Server) ->
    "".

+%% @spec (User, Server) -> true | false | {error, Error}
 is_user_exists(User, Server) ->
-    extauth:is_user_exists(User, Server).
+    try extauth:is_user_exists(User, Server) of
+	Res -> Res
+    catch
+	_:Error -> {error, Error}
+    end.

 remove_user(_User, _Server) ->
    {error, not_allowed}.
@@ -5,7 +5,7 @@
 %%% Created : 12 Dec 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -117,6 +117,7 @@ set_password(User, Server, Password) ->
    end.


+%% @spec (User, Server, Password) -> {atomic, ok} | {atomic, exists} | {error, invalid_jid} | {aborted, Reason}
 try_register(User, Server, Password) ->
    LUser = jlib:nodeprep(User),
    LServer = jlib:nameprep(Server),
@@ -229,6 +230,7 @@ get_password_s(User, Server) ->
 	    []
    end.

+%% @spec (User, Server) -> true | false | {error, Error}
 is_user_exists(User, Server) ->
    LUser = jlib:nodeprep(User),
    LServer = jlib:nameprep(Server),
@@ -238,10 +240,13 @@ is_user_exists(User, Server) ->
 	    false;
 	[_] ->
 	    true;
-	_ ->
-	    false
+	Other ->
+	    {error, Other}
    end.

+%% @spec (User, Server) -> ok
+%% @doc Remove user.
+%% Note: it returns ok even if there was some problem removing the user.
 remove_user(User, Server) ->
    LUser = jlib:nodeprep(User),
    LServer = jlib:nameprep(Server),
@@ -250,8 +255,10 @@ remove_user(User, Server) ->
 		mnesia:delete({passwd, US})
        end,
    mnesia:transaction(F),
-    ejabberd_hooks:run(remove_user, LServer, [User, Server]).
+	ok.

+%% @spec (User, Server, Password) -> ok | not_exists | not_allowed | bad_request
+%% @doc Remove user if the provided password is correct.
 remove_user(User, Server, Password) ->
    LUser = jlib:nodeprep(User),
    LServer = jlib:nameprep(Server),
@@ -269,7 +276,6 @@ remove_user(User, Server, Password) ->
        end,
    case mnesia:transaction(F) of
 	{atomic, ok} ->
-	    ejabberd_hooks:run(remove_user, LServer, [User, Server]),
 	    ok;
 	{atomic, Res} ->
 	    Res;
@@ -5,7 +5,7 @@
 %%% Created : 12 Dec 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -160,6 +160,7 @@ check_password(User, Server, Password, _StreamID, _Digest) ->
 set_password(_User, _Server, _Password) ->
    {error, not_allowed}.

+%% @spec (User, Server, Password) -> {error, not_allowed}
 try_register(_User, _Server, _Password) ->
    {error, not_allowed}.

@@ -185,10 +186,11 @@ get_password(_User, _Server) ->
 get_password_s(_User, _Server) ->
    "".

+%% @spec (User, Server) -> true | false | {error, Error}
 is_user_exists(User, Server) ->
    case catch is_user_exists_ldap(User, Server) of
-	{'EXIT', _} ->
-	    false;
+	{'EXIT', Error} ->
+	    {error, Error};
 	Result ->
 	    Result
    end.
@@ -5,7 +5,7 @@
 %%% Created : 12 Dec 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -61,6 +61,7 @@ start(Host) ->
 plain_password_required() ->
    false.

+%% @spec (User, Server, Password) -> true | false | {error, Error}
 check_password(User, Server, Password) ->
    case jlib:nodeprep(User) of
 	error ->
@@ -68,14 +69,22 @@ check_password(User, Server, Password) ->
 	LUser ->
 	    Username = ejabberd_odbc:escape(LUser),
 	    LServer = jlib:nameprep(Server),
-	    case catch odbc_queries:get_password(LServer, Username) of
+	    try odbc_queries:get_password(LServer, Username) of
 		{selected, ["password"], [{Password}]} ->
-		    true;
-		_ ->
-		    false
+		    true; %% Password is correct
+		{selected, ["password"], [{_Password2}]} ->
+		    false; %% Password is not correct
+		{selected, ["password"], []} ->
+		    false; %% Account does not exist
+		{error, _Error} ->
+		    false %% Typical error is that table doesn't exist
+	    catch
+		_:_ ->
+		    false %% Typical error is database not accessible
 	    end
    end.

+%% @spec (User, Server, Password, StreamID, Digest) -> true | false | {error, Error}
 check_password(User, Server, Password, StreamID, Digest) ->
    case jlib:nodeprep(User) of
 	error ->
@@ -83,7 +92,8 @@ check_password(User, Server, Password, StreamID, Digest) ->
 	LUser ->
 	    Username = ejabberd_odbc:escape(LUser),
 	    LServer = jlib:nameprep(Server),
-	    case catch odbc_queries:get_password(LServer, Username) of
+	    try odbc_queries:get_password(LServer, Username) of
+		%% Account exists, check if password is valid
 		{selected, ["password"], [{Passwd}]} ->
 		    DigRes = if
 				 Digest /= "" ->
@@ -96,8 +106,13 @@ check_password(User, Server, Password, StreamID, Digest) ->
 		       true ->
 			    (Passwd == Password) and (Password /= "")
 		    end;
-		_ ->
-		    false
+		{selected, ["password"], []} ->
+		    false; %% Account does not exist
+		{error, _Error} ->
+		    false %% Typical error is that table doesn't exist
+	    catch
+		_:_ ->
+		    false %% Typical error is database not accessible
 	    end
    end.

@@ -118,6 +133,7 @@ set_password(User, Server, Password) ->
    end.


+%% @spec (User, Server, Password) -> {atomic, ok} | {atomic, exists} | {error, invalid_jid}
 try_register(User, Server, Password) ->
    case jlib:nodeprep(User) of
 	error ->
@@ -207,6 +223,7 @@ get_password_s(User, Server) ->
 	    end
    end.

+%% @spec (User, Server) -> true | false | {error, Error}
 is_user_exists(User, Server) ->
    case jlib:nodeprep(User) of
 	error ->
@@ -214,14 +231,22 @@ is_user_exists(User, Server) ->
 	LUser ->
 	    Username = ejabberd_odbc:escape(LUser),
 	    LServer = jlib:nameprep(Server),
-	    case catch odbc_queries:get_password(LServer, Username) of
+	    try odbc_queries:get_password(LServer, Username) of
 		{selected, ["password"], [{_Password}]} ->
-		    true;
-		_ ->
-		    false
+		    true; %% Account exists
+		{selected, ["password"], []} ->
+		    false; %% Account does not exist
+		{error, Error} ->
+		    {error, Error} %% Typical error is that table doesn't exist
+	    catch
+		_:B ->
+		    {error, B} %% Typical error is database not accessible
 	    end
    end.

+%% @spec (User, Server) -> ok | error
+%% @doc Remove user.
+%% Note: it may return ok even if there was some problem removing the user.
 remove_user(User, Server) ->
    case jlib:nodeprep(User) of
 	error ->
@@ -230,10 +255,11 @@ remove_user(User, Server) ->
 	    Username = ejabberd_odbc:escape(LUser),
 	    LServer = jlib:nameprep(Server),
 	    catch odbc_queries:del_user(LServer, Username),
-	    ejabberd_hooks:run(remove_user, jlib:nameprep(Server),
-			       [User, Server])
+		ok
    end.

+%% @spec (User, Server, Password) -> ok | error | not_exists | not_allowed
+%% @doc Remove user if the provided password is correct.
 remove_user(User, Server, Password) ->
    case jlib:nodeprep(User) of
 	error ->
@@ -247,8 +273,6 @@ remove_user(User, Server, Password) ->
 				   LServer, Username, Pass),
 			case Result of
 			    {selected, ["password"], [{Password}]} ->
-				ejabberd_hooks:run(remove_user, jlib:nameprep(Server),
-						   [User, Server]),
 				ok;
 			    {selected, ["password"], []} ->
 				not_exists;
@@ -5,7 +5,7 @@
 %%% Created : 5 Jul 2007 by Evgeniy Khramtsov <xram@jabber.ru>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -80,6 +80,8 @@ get_password(_User, _Server) ->
 get_password_s(_User, _Server) ->
    "".

+%% @spec (User, Server) -> true | false | {error, Error}
+%% TODO: Improve this function to return an error instead of 'false' when connection to PAM failed
 is_user_exists(User, Host) ->
    Service = get_pam_service(Host),
    case catch epam:acct_mgmt(Service, User) of
@@ -91,7 +93,7 @@ remove_user(_User, _Server) ->
    {error, not_allowed}.

 remove_user(_User, _Server, _Password) ->
-    {error, not_allowed}.
+    not_allowed.

 plain_password_required() ->
    true.
@@ -5,7 +5,7 @@
 %%% Created : 16 Nov 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -37,8 +37,7 @@
 	 send_element/2,
 	 socket_type/0,
 	 get_presence/1,
-	 get_subscribed/1,
-	 get_subscribed_and_online/1]).
+	 get_subscribed/1]).

 %% gen_fsm callbacks
 -export([init/1,
@@ -62,6 +61,8 @@
 -define(SETS, gb_sets).
 -define(DICT, dict).

+%% pres_a contains all the presence available send (either through roster mechanism or directed).
+%% Directed presence unavailable remove user from pres_a.
 -record(state, {socket,
 		sockmod,
 		socket_monitor,
@@ -82,7 +83,6 @@
 		pres_f = ?SETS:new(),
 		pres_a = ?SETS:new(),
 		pres_i = ?SETS:new(),
-		pres_available = ?DICT:new(),
 		pres_last, pres_pri,
 		pres_timestamp,
 		pres_invis = false,
@@ -131,6 +131,9 @@
 	xml:element_to_string(?SERR_HOST_UNKNOWN)).
 -define(POLICY_VIOLATION_ERR(Lang, Text),
 	xml:element_to_string(?SERRT_POLICY_VIOLATION(Lang, Text))).
+-define(INVALID_FROM,
+	xml:element_to_string(?SERR_INVALID_FROM)).
+

 %%%----------------------------------------------------------------------
 %%% API
@@ -173,9 +176,11 @@ init([{SockMod, Socket}, Opts]) ->
    StartTLSRequired = lists:member(starttls_required, Opts),
    TLSEnabled = lists:member(tls, Opts),
    TLS = StartTLS orelse StartTLSRequired orelse TLSEnabled,
-    TLSOpts = lists:filter(fun({certfile, _}) -> true;
-			      (_) -> false
-			   end, Opts),
+    TLSOpts1 =
+	lists:filter(fun({certfile, _}) -> true;
+			(_) -> false
+		     end, Opts),
+    TLSOpts = [verify_none | TLSOpts1],
    IP = peerip(SockMod, Socket),
    %% Check if IP is blacklisted:
    case is_ip_blacklisted(IP) of
@@ -207,14 +212,8 @@ init([{SockMod, Socket}, Opts]) ->
    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).
-
+    gen_fsm:sync_send_all_state_event(FsmRef, get_subscribed, 1000).

 %%----------------------------------------------------------------------
 %% Func: StateName/2
@@ -861,13 +860,41 @@ wait_for_session(closed, StateData) ->
    {stop, normal, StateData}.


-
-
 session_established({xmlstreamelement, El}, StateData) ->
+    FromJID = StateData#state.jid,
+    % Check 'from' attribute in stanza RFC 3920 Section 9.1.2
+    case check_from(El, FromJID) of
+	'invalid-from' ->
+	    send_text(StateData, ?INVALID_FROM ++ ?STREAM_TRAILER),
+	    {stop, normal, StateData};
+	_NewEl ->
+	    session_established2(El, StateData)
+    end;
+
+%% We hibernate the process to reduce memory consumption after a
+%% configurable activity timeout
+session_established(timeout, StateData) ->
+    %% TODO: Options must be stored in state:
+    Options = [],
+    proc_lib:hibernate(gen_fsm, enter_loop,
+		       [?MODULE, Options, session_established, StateData]),
+    fsm_next_state(session_established, StateData);
+
+session_established({xmlstreamend, _Name}, StateData) ->
+    send_text(StateData, ?STREAM_TRAILER),
+    {stop, normal, StateData};
+
+session_established({xmlstreamerror, _}, StateData) ->
+    send_text(StateData, ?INVALID_XML_ERR ++ ?STREAM_TRAILER),
+    {stop, normal, StateData};
+
+session_established(closed, StateData) ->
+    {stop, normal, StateData}.
+
+session_established2(El, StateData) ->
    {xmlelement, Name, Attrs, _Els} = El,
    User = StateData#state.user,
    Server = StateData#state.server,
-    % TODO: check 'from' attribute in stanza
    FromJID = StateData#state.jid,
    To = xml:get_attr_s("to", Attrs),
    ToJID = case To of
@@ -943,27 +970,7 @@ session_established({xmlstreamelement, El}, StateData) ->
 		end
 	end,
    ejabberd_hooks:run(c2s_loop_debug, [{xmlstreamelement, El}]),
-    fsm_next_state(session_established, NewState);
-
-%% We hibernate the process to reduce memory consumption after a
-%% configurable activity timeout
-session_established(timeout, StateData) ->
-    %% TODO: Options must be stored in state:
-    Options = [],
-    proc_lib:hibernate(gen_fsm, enter_loop,
-		       [?MODULE, Options, session_established, StateData]),
-    fsm_next_state(session_established, StateData);
-
-session_established({xmlstreamend, _Name}, StateData) ->
-    send_text(StateData, ?STREAM_TRAILER),
-    {stop, normal, StateData};
-
-session_established({xmlstreamerror, _}, StateData) ->
-    send_text(StateData, ?INVALID_XML_ERR ++ ?STREAM_TRAILER),
-    {stop, normal, StateData};
-
-session_established(closed, StateData) ->
-    {stop, normal, StateData}.
+    fsm_next_state(session_established, NewState).



@@ -1010,29 +1017,8 @@ handle_sync_event({get_presence}, _From, StateName, StateData) ->
    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,
-    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),
-    {reply, ?DICT:to_list(SubscribedAndOnline), StateName, StateData};
+    Subscribed = ?SETS:to_list(StateData#state.pres_f),
+    {reply, Subscribed, StateName, StateData};

 handle_sync_event(_Event, _From, StateName, StateData) ->
    Reply = ok,
@@ -1105,13 +1091,17 @@ handle_info({route, From, To, Packet}, StateName, StateData) ->
 			Attrs1 = lists:keydelete("type", 1, Attrs),
 			{true, [{"type", "unavailable"} | Attrs1], StateData};
 		    "subscribe" ->
-			{true, Attrs, StateData};
+			SRes = is_privacy_allow(From, To, Packet, StateData#state.privacy_list),
+			{SRes, Attrs, StateData};
 		    "subscribed" ->
-			{true, Attrs, StateData};
+			SRes = is_privacy_allow(From, To, Packet, StateData#state.privacy_list),
+			{SRes, Attrs, StateData};
 		    "unsubscribe" ->
-			{true, Attrs, StateData};
+			SRes = is_privacy_allow(From, To, Packet, StateData#state.privacy_list),
+			{SRes, Attrs, StateData};
 		    "unsubscribed" ->
-			{true, Attrs, StateData};
+			SRes = is_privacy_allow(From, To, Packet, StateData#state.privacy_list),
+			{SRes, Attrs, StateData};
 		    _ ->
 			case ejabberd_hooks:run_fold(
 			       privacy_check_packet, StateData#state.server,
@@ -1125,41 +1115,41 @@ handle_info({route, From, To, Packet}, StateName, StateData) ->
 				LFrom = jlib:jid_tolower(From),
 				LBFrom = jlib:jid_remove_resource(LFrom),
 				%% Note contact availability
-				Caps = mod_caps:read_caps(Els),
-				mod_caps:note_caps(StateData#state.server, From, Caps),
-				NewAvailable = case xml:get_attr_s("type", Attrs) of
-						   "unavailable" ->
-						       ?DICT:erase(LFrom, StateData#state.pres_available);
-						   _ ->
-						       ?DICT:store(LFrom, Caps, StateData#state.pres_available)
-					       end,
-				NewStateData = StateData#state{pres_available = NewAvailable},
+				case xml:get_attr_s("type", Attrs) of
+				    "unavailable" -> 
+					%mod_caps:clear_caps(From);
+					% caps clear disabled cause it breaks things
+					ok;
+				    _ -> 
+					Caps = mod_caps:read_caps(Els),
+					mod_caps:note_caps(StateData#state.server, From, Caps)
+				end,
 				case ?SETS:is_element(
-					LFrom, NewStateData#state.pres_a) orelse
+					LFrom, StateData#state.pres_a) orelse
 				    ?SETS:is_element(
-				       LBFrom, NewStateData#state.pres_a) of
+				       LBFrom, StateData#state.pres_a) of
 				    true ->
-					{true, Attrs, NewStateData};
+					{true, Attrs, StateData};
 				    false ->
 					case ?SETS:is_element(
-						LFrom, NewStateData#state.pres_f) of
+						LFrom, StateData#state.pres_f) of
 					    true ->
 						A = ?SETS:add_element(
 						       LFrom,
-						       NewStateData#state.pres_a),
+						       StateData#state.pres_a),
 						{true, Attrs,
-						 NewStateData#state{pres_a = A}};
+						 StateData#state{pres_a = A}};
 					    false ->
 						case ?SETS:is_element(
-							LBFrom, NewStateData#state.pres_f) of
+							LBFrom, StateData#state.pres_f) of
 						    true ->
 							A = ?SETS:add_element(
 							       LBFrom,
-							       NewStateData#state.pres_a),
+							       StateData#state.pres_a),
 							{true, Attrs,
-							 NewStateData#state{pres_a = A}};
+							 StateData#state{pres_a = A}};
 						    false ->
-							{true, Attrs, NewStateData}
+							{true, Attrs, StateData}
 						end
 					end
 				end;
@@ -1187,7 +1177,7 @@ handle_info({route, From, To, Packet}, StateName, StateData) ->
 			    NewPL ->
 				PrivPushIQ =
 				    #iq{type = set, xmlns = ?NS_PRIVACY,
-					id = "push",
+					id = "push" ++ randoms:get_string(),
 					sub_el = [{xmlelement, "query",
 						   [{"xmlns", ?NS_PRIVACY}],
 						   [{xmlelement, "list",
@@ -1633,6 +1623,19 @@ presence_track(From, To, Packet, StateData) ->
 			    pres_a = A}
    end.

+%% Check if privacy rules allow this delivery
+is_privacy_allow(From, To, Packet, PrivacyList) ->
+    User = To#jid.user,
+    Server = To#jid.server,
+    allow == ejabberd_hooks:run_fold(
+	       privacy_check_packet, Server,
+	       allow,
+	       [User,
+		Server,
+		PrivacyList,
+		{From, To, Packet},
+		in]).
+
 presence_broadcast(StateData, From, JIDSet, Packet) ->
    lists:foreach(fun(JID) ->
 			  FJID = jlib:make_jid(JID),
@@ -1984,3 +1987,30 @@ fsm_reply(Reply, StateName, StateData) ->
 %% Used by c2s blacklist plugins
 is_ip_blacklisted({IP,_Port}) ->
    ejabberd_hooks:run_fold(check_bl_c2s, false, [IP]).
+
+%% Check from attributes
+%% returns invalid-from|NewElement
+check_from(El, FromJID) ->
+    case xml:get_tag_attr("from", El) of
+	false ->
+	    El;
+	{value, SJID} ->
+	    JID = jlib:string_to_jid(SJID),
+	    case JID of
+		error ->
+		    'invalid-from';
+		#jid{} ->
+		    if
+			(JID#jid.luser == FromJID#jid.luser) and
+			(JID#jid.lserver == FromJID#jid.lserver) and
+			(JID#jid.lresource == FromJID#jid.lresource) ->
+			    El;
+			(JID#jid.luser == FromJID#jid.luser) and
+			(JID#jid.lserver == FromJID#jid.lserver) and
+			(JID#jid.lresource == "") ->
+			    El;
+			true ->
+			    'invalid-from'
+		    end
+	    end
+    end.
@@ -6,7 +6,7 @@
 %%% Created :  2 Nov 2007 by Mickael Remond <mremond@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -17,7 +17,7 @@
 %%% 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
@@ -5,7 +5,7 @@
 %%% Created : 27 Feb 2008 by Mickael Remond <mremond@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -5,7 +5,7 @@
 %%% Created : 14 Dec 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   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,7 +11,7 @@
 %%% 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
@@ -5,7 +5,7 @@
 %%% Created : 11 Jan 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -99,6 +99,14 @@ process(["restart"]) ->

 process(["reopen-log"]) ->
    ejabberd_logger_h:reopen_log(),
+    case application:get_env(sasl,sasl_error_logger) of
+ 	{ok, {file, SASLfile}} ->
+ 	    error_logger:delete_report_handler(sasl_report_file_h),
+ 	    ejabberd_logger_h:rotate_log(SASLfile),
+ 	    error_logger:add_report_handler(sasl_report_file_h,
+					    {SASLfile, get_sasl_error_logger_type()});
+ 	_ -> false
+    end,
    ?STATUS_SUCCESS;

 process(["register", User, Server, Password]) ->
@@ -401,3 +409,13 @@ dump_tab(F, T) ->
 		     fun() -> mnesia:match_object(T, W, read) end),
    lists:foreach(
      fun(Term) -> io:format(F,"~p.~n", [setelement(1, Term, T)]) end, All).
+
+%% Function copied from Erlang/OTP lib/sasl/src/sasl.erl which doesn't export it
+get_sasl_error_logger_type () ->
+    case application:get_env (sasl, errlog_type) of
+	{ok, error} -> error;
+	{ok, progress} -> progress;
+	{ok, all} -> all;
+	{ok, Bad} -> exit ({bad_config, {sasl, {errlog_type, Bad}}});
+	_ -> all
+    end.
@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   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,7 +11,7 @@
 %%% 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
@@ -5,7 +5,7 @@
 %%% Created : 23 Aug 2006 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -53,6 +53,8 @@

 -record(state, {sockmod, socket, receiver}).

+-define(HIBERNATE_TIMEOUT, 90000).
+
 %%====================================================================
 %% API
 %%====================================================================
@@ -173,7 +175,8 @@ handle_call({starttls, TLSOpts}, _From, State) ->
    {ok, TLSSocket} = tls:tcp_to_tls(State#state.socket, TLSOpts),
    ejabberd_receiver:starttls(State#state.receiver, TLSSocket),
    Reply = ok,
-    {reply, Reply, State#state{socket = TLSSocket, sockmod = tls}};
+    {reply, Reply, State#state{socket = TLSSocket, sockmod = tls},
+     ?HIBERNATE_TIMEOUT};

 handle_call({starttls, TLSOpts, Data}, _From, State) ->
    {ok, TLSSocket} = tls:tcp_to_tls(State#state.socket, TLSOpts),
@@ -181,7 +184,8 @@ handle_call({starttls, TLSOpts, Data}, _From, State) ->
    catch (State#state.sockmod):send(
 	    State#state.socket, Data),
    Reply = ok,
-    {reply, Reply, State#state{socket = TLSSocket, sockmod = tls}};
+    {reply, Reply, State#state{socket = TLSSocket, sockmod = tls},
+     ?HIBERNATE_TIMEOUT};

 handle_call(compress, _From, State) ->
    {ok, ZlibSocket} = ejabberd_zlib:enable_zlib(
@@ -189,7 +193,8 @@ handle_call(compress, _From, State) ->
 			 State#state.socket),
    ejabberd_receiver:compress(State#state.receiver, ZlibSocket),
    Reply = ok,
-    {reply, Reply, State#state{socket = ZlibSocket, sockmod = ejabberd_zlib}};
+    {reply, Reply, State#state{socket = ZlibSocket, sockmod = ejabberd_zlib},
+     ?HIBERNATE_TIMEOUT};

 handle_call({compress, Data}, _From, State) ->
    {ok, ZlibSocket} = ejabberd_zlib:enable_zlib(
@@ -199,35 +204,36 @@ handle_call({compress, Data}, _From, State) ->
    catch (State#state.sockmod):send(
 	    State#state.socket, Data),
    Reply = ok,
-    {reply, Reply, State#state{socket = ZlibSocket, sockmod = ejabberd_zlib}};
+    {reply, Reply, State#state{socket = ZlibSocket, sockmod = ejabberd_zlib},
+     ?HIBERNATE_TIMEOUT};

 handle_call(reset_stream, _From, State) ->
    ejabberd_receiver:reset_stream(State#state.receiver),
    Reply = ok,
-    {reply, Reply, State};
+    {reply, Reply, State, ?HIBERNATE_TIMEOUT};

 handle_call({send, Data}, _From, State) ->
    catch (State#state.sockmod):send(
 	    State#state.socket, Data),
    Reply = ok,
-    {reply, Reply, State};
+    {reply, Reply, State, ?HIBERNATE_TIMEOUT};

 handle_call({change_shaper, Shaper}, _From, State) ->
    ejabberd_receiver:change_shaper(State#state.receiver, Shaper),
    Reply = ok,
-    {reply, Reply, State};
+    {reply, Reply, State, ?HIBERNATE_TIMEOUT};

 handle_call(get_sockmod, _From, State) ->
    Reply = State#state.sockmod,
-    {reply, Reply, State};
+    {reply, Reply, State, ?HIBERNATE_TIMEOUT};

 handle_call(get_peer_certificate, _From, State) ->
    Reply = tls:get_peer_certificate(State#state.socket),
-    {reply, Reply, State};
+    {reply, Reply, State, ?HIBERNATE_TIMEOUT};

 handle_call(get_verify_result, _From, State) ->
    Reply = tls:get_verify_result(State#state.socket),
-    {reply, Reply, State};
+    {reply, Reply, State, ?HIBERNATE_TIMEOUT};

 handle_call(close, _From, State) ->
    ejabberd_receiver:close(State#state.receiver),
@@ -243,7 +249,7 @@ handle_call(sockname, _From, State) ->
 	    _ ->
 		SockMod:sockname(Socket)
 	end,
-    {reply, Reply, State};
+    {reply, Reply, State, ?HIBERNATE_TIMEOUT};

 handle_call(peername, _From, State) ->
    #state{sockmod = SockMod, socket = Socket} = State,
@@ -254,11 +260,11 @@ handle_call(peername, _From, State) ->
 	    _ ->
 		SockMod:peername(Socket)
 	end,
-    {reply, Reply, State};
+    {reply, Reply, State, ?HIBERNATE_TIMEOUT};

 handle_call(_Request, _From, State) ->
    Reply = ok,
-    {reply, Reply, State}.
+    {reply, Reply, State, ?HIBERNATE_TIMEOUT}.

 %%--------------------------------------------------------------------
 %% Function: handle_cast(Msg, State) -> {noreply, State} |
@@ -267,7 +273,7 @@ handle_call(_Request, _From, State) ->
 %% Description: Handling cast messages
 %%--------------------------------------------------------------------
 handle_cast(_Msg, State) ->
-    {noreply, State}.
+    {noreply, State, ?HIBERNATE_TIMEOUT}.

 %%--------------------------------------------------------------------
 %% Function: handle_info(Info, State) -> {noreply, State} |
@@ -275,8 +281,11 @@ handle_cast(_Msg, State) ->
 %%                                       {stop, Reason, State}
 %% Description: Handling all non call/cast messages
 %%--------------------------------------------------------------------
+handle_info(timeout, State) ->
+    proc_lib:hibernate(gen_server, enter_loop, [?MODULE, [], State]),
+    {noreply, State, ?HIBERNATE_TIMEOUT};
 handle_info(_Info, State) ->
-    {noreply, State}.
+    {noreply, State, ?HIBERNATE_TIMEOUT}.

 %%--------------------------------------------------------------------
 %% Function: terminate(Reason, State) -> void()
@@ -5,7 +5,7 @@
 %%% Created :  8 Aug 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -5,7 +5,7 @@
 %%% Created : 16 Nov 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -38,6 +38,9 @@

 -include("ejabberd.hrl").

+%% We do not block on send anymore.
+-define(TCP_SEND_TIMEOUT, 15000).
+
 start_link() ->
    supervisor:start_link({local, ejabberd_listeners}, ?MODULE, []).

@@ -89,10 +92,11 @@ init(Port, Module, Opts) ->
 			    end, Opts),

    Res = gen_tcp:listen(Port, [binary,
-				{packet, 0}, 
+				{packet, 0},
 				{active, false},
 				{reuseaddr, true},
 				{nodelay, true},
+				{send_timeout, ?TCP_SEND_TIMEOUT},
 				{keepalive, true} |
 				SockOpts]),
    case Res of
@@ -5,7 +5,7 @@
 %%% Created : 30 Nov 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -5,7 +5,7 @@
 %%% Created : 23 Oct 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -31,7 +31,7 @@

 %% gen_event callbacks
 -export([init/1, handle_event/2, handle_call/2, handle_info/2, terminate/2,
-	 code_change/3, reopen_log/0]).
+	 code_change/3, reopen_log/0, rotate_log/1]).

 -record(state, {fd, file}).

@@ -206,10 +206,11 @@ write_time({{Y,Mo,D},{H,Mi,S}}, Type) ->
    io_lib:format("~n=~s==== ~w-~.2.0w-~.2.0w ~.2.0w:~.2.0w:~.2.0w ===~n",
 		  [Type, Y, Mo, D, H, Mi, S]).

-%% Rename the log file if it the filename exists
+%% @doc Rename the log file if exists, to "*-old.log".
 %% This is needed in systems when the file must be closed before rotation (Windows).
 %% On most Unix-like system, the file can be renamed from the command line and
-%%the log can directly be reopened.
+%% the log can directly be reopened.
+%% @spec (Filename::string()) -> ok
 rotate_log(Filename) ->
    case file:read_file_info(Filename) of
 	{ok, _FileInfo} ->
@@ -9,7 +9,7 @@
 %%% Created : 29 Nov 2006 by Mickael Remond <mremond@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -20,7 +20,7 @@
 %%% 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
@@ -5,7 +5,7 @@
 %%% Created :  1 Nov 2006 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -5,7 +5,7 @@
 %%% Created : 31 Jan 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -52,14 +52,21 @@ start_hosts() ->

 %% Start the ODBC module on the given host
 start_odbc(Host) ->
+    Supervisor_name = gen_mod:get_module_proc(Host, ejabberd_odbc_sup),
    ChildSpec =
-	{gen_mod:get_module_proc(Host, ejabberd_odbc_sup),
+	{Supervisor_name,
 	 {ejabberd_odbc_sup, start_link, [Host]},
-	 temporary,
+	 transient,
 	 infinity,
 	 supervisor,
 	 [ejabberd_odbc_sup]},
-    supervisor:start_child(ejabberd_sup, ChildSpec).
+    case supervisor:start_child(ejabberd_sup, ChildSpec) of
+	{ok, _PID} ->
+	    ok;
+	_Error ->
+	    ?ERROR_MSG("Start of supervisor ~p failed:~n~p~nRetrying...~n", [Supervisor_name, _Error]),
+	    start_odbc(Host)
+    end.

 %% Returns true if we have configured odbc_server for the given host
 needs_odbc(Host) ->
@@ -5,7 +5,7 @@
 %%% Created : 10 Nov 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -54,6 +54,8 @@
 		xml_stream_state,
 		timeout}).

+-define(HIBERNATE_TIMEOUT, 90000).
+
 %%====================================================================
 %% API
 %%====================================================================
@@ -146,7 +148,7 @@ handle_call({starttls, TLSSocket}, _From,
 			   xml_stream_state = NewXMLStreamState},
    case tls:recv_data(TLSSocket, "") of
 	{ok, TLSData} ->
-	    {reply, ok, process_data(TLSData, NewState)};
+	    {reply, ok, process_data(TLSData, NewState), ?HIBERNATE_TIMEOUT};
 	{error, _Reason} ->
 	    {stop, normal, ok, NewState}
    end;
@@ -161,7 +163,7 @@ handle_call({compress, ZlibSocket}, _From,
 			   xml_stream_state = NewXMLStreamState},
    case ejabberd_zlib:recv_data(ZlibSocket, "") of
 	{ok, ZlibData} ->
-	    {reply, ok, process_data(ZlibData, NewState)};
+	    {reply, ok, process_data(ZlibData, NewState), ?HIBERNATE_TIMEOUT};
 	{error, _Reason} ->
 	    {stop, normal, ok, NewState}
    end;
@@ -172,17 +174,18 @@ handle_call(reset_stream, _From,
    xml_stream:close(XMLStreamState),
    NewXMLStreamState = xml_stream:new(C2SPid, MaxStanzaSize),
    Reply = ok,
-    {reply, Reply, State#state{xml_stream_state = NewXMLStreamState}};
+    {reply, Reply, State#state{xml_stream_state = NewXMLStreamState},
+     ?HIBERNATE_TIMEOUT};
 handle_call({become_controller, C2SPid}, _From, State) ->
    XMLStreamState = xml_stream:new(C2SPid, State#state.max_stanza_size),
    NewState = State#state{c2s_pid = C2SPid,
 			   xml_stream_state = XMLStreamState},
    activate_socket(NewState),
    Reply = ok,
-    {reply, Reply, NewState};
+    {reply, Reply, NewState, ?HIBERNATE_TIMEOUT};
 handle_call(_Request, _From, State) ->
    Reply = ok,
-    {reply, Reply, State}.
+    {reply, Reply, State, ?HIBERNATE_TIMEOUT}.

 %%--------------------------------------------------------------------
 %% Function: handle_cast(Msg, State) -> {noreply, State} |
@@ -192,11 +195,11 @@ handle_call(_Request, _From, State) ->
 %%--------------------------------------------------------------------
 handle_cast({change_shaper, Shaper}, State) ->
    NewShaperState = shaper:new(Shaper),
-    {noreply, State#state{shaper_state = NewShaperState}};
+    {noreply, State#state{shaper_state = NewShaperState}, ?HIBERNATE_TIMEOUT};
 handle_cast(close, State) ->
    {stop, normal, State};
 handle_cast(_Msg, State) ->
-    {noreply, State}.
+    {noreply, State, ?HIBERNATE_TIMEOUT}.

 %%--------------------------------------------------------------------
 %% Function: handle_info(Info, State) -> {noreply, State} |
@@ -212,19 +215,21 @@ handle_info({Tag, _TCPSocket, Data},
 	tls ->
 	    case tls:recv_data(Socket, Data) of
 		{ok, TLSData} ->
-		    {noreply, process_data(TLSData, State)};
+		    {noreply, process_data(TLSData, State),
+		     ?HIBERNATE_TIMEOUT};
 		{error, _Reason} ->
 		    {stop, normal, State}
 	    end;
 	ejabberd_zlib ->
 	    case ejabberd_zlib:recv_data(Socket, Data) of
 		{ok, ZlibData} ->
-		    {noreply, process_data(ZlibData, State)};
+		    {noreply, process_data(ZlibData, State),
+		     ?HIBERNATE_TIMEOUT};
 		{error, _Reason} ->
 		    {stop, normal, State}
 	    end;
 	_ ->
-	    {noreply, process_data(Data, State)}
+	    {noreply, process_data(Data, State), ?HIBERNATE_TIMEOUT}
    end;
 handle_info({Tag, _TCPSocket}, State)
  when (Tag == tcp_closed) or (Tag == ssl_closed) ->
@@ -233,15 +238,18 @@ handle_info({Tag, _TCPSocket, Reason}, State)
  when (Tag == tcp_error) or (Tag == ssl_error) ->
    case Reason of
 	timeout ->
-	    {noreply, State};
+	    {noreply, State, ?HIBERNATE_TIMEOUT};
 	_ ->
 	    {stop, normal, State}
    end;
 handle_info({timeout, _Ref, activate}, State) ->
    activate_socket(State),
-    {noreply, State};
+    {noreply, State, ?HIBERNATE_TIMEOUT};
+handle_info(timeout, State) ->
+    proc_lib:hibernate(gen_server, enter_loop, [?MODULE, [], State]),
+    {noreply, State, ?HIBERNATE_TIMEOUT};
 handle_info(_Info, State) ->
-    {noreply, State}.
+    {noreply, State, ?HIBERNATE_TIMEOUT}.

 %%--------------------------------------------------------------------
 %% Function: terminate(Reason, State) -> void()
@@ -5,7 +5,7 @@
 %%% Created : 27 Nov 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -5,7 +5,7 @@
 %%% Created :  7 Dec 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -5,7 +5,7 @@
 %%% Created :  6 Dec 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -5,7 +5,7 @@
 %%% Created :  6 Dec 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -52,7 +52,8 @@
 	 handle_info/3,
 	 terminate/3,
 	 code_change/4,
-	 test_get_addr_port/1]).
+	 test_get_addr_port/1,
+	 get_addr_port/1]).

 -include("ejabberd.hrl").
 -include("jlib.hrl").
@@ -94,6 +95,9 @@
 %% -define(FSMLIMITS, [{max_queue, 2000}]).
 -define(FSMTIMEOUT, 30000).

+%% We do not block on send anymore.
+-define(TCP_SEND_TIMEOUT, 15000).
+
 %% Maximum delay to wait before retrying to connect after a failed attempt.
 %% Specified in miliseconds. Default value is 5 minutes.
 -define(MAX_RETRY_DELAY, 300000).
@@ -250,6 +254,7 @@ open_socket1(Addr, Port) ->
 		  catch ejabberd_socket:connect(
 			  Addr, Port,
 			  [binary, {packet, 0},
+			   {send_timeout, ?TCP_SEND_TIMEOUT},
 			   {active, false}, inet6]);
 	      {'EXIT', Reason1} ->
 		  ?DEBUG("s2s_out: connect crashed ~p~n", [Reason1]),
@@ -5,7 +5,7 @@
 %%% Created :  6 Dec 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -5,7 +5,7 @@
 %%% Created : 24 Nov 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -59,6 +59,7 @@
 -include("ejabberd.hrl").
 -include("jlib.hrl").
 -include("ejabberd_ctl.hrl").
+-include("mod_privacy.hrl").

 -record(session, {sid, usr, us, priority, info}).
 -record(state, {}).
@@ -384,28 +385,32 @@ do_route(From, To, Packet) ->
 				Reason = xml:get_path_s(
 					   Packet,
 					   [{elem, "status"}, cdata]),
-				{ejabberd_hooks:run_fold(
+				{is_privacy_allow(From, To, Packet) andalso
+				 ejabberd_hooks:run_fold(
 				   roster_in_subscription,
 				   LServer,
 				   false,
 				   [User, Server, From, subscribe, Reason]),
 				 true};
 			    "subscribed" ->
-				{ejabberd_hooks:run_fold(
+				{is_privacy_allow(From, To, Packet) andalso
+				 ejabberd_hooks:run_fold(
 				   roster_in_subscription,
 				   LServer,
 				   false,
 				   [User, Server, From, subscribed, ""]),
 				 true};
 			    "unsubscribe" ->
-				{ejabberd_hooks:run_fold(
+				{is_privacy_allow(From, To, Packet) andalso
+				 ejabberd_hooks:run_fold(
 				   roster_in_subscription,
 				   LServer,
 				   false,
 				   [User, Server, From, unsubscribe, ""]),
 				 true};
 			    "unsubscribed" ->
-				{ejabberd_hooks:run_fold(
+				{is_privacy_allow(From, To, Packet) andalso
+				 ejabberd_hooks:run_fold(
 				   roster_in_subscription,
 				   LServer,
 				   false,
@@ -469,6 +474,31 @@ do_route(From, To, Packet) ->
 	    end
    end.

+%% The default list applies to the user as a whole,
+%% and is processed if there is no active list set
+%% for the target session/resource to which a stanza is addressed,
+%% or if there are no current sessions for the user.
+is_privacy_allow(From, To, Packet) ->
+    User = To#jid.user,
+    Server = To#jid.server,
+    PrivacyList = ejabberd_hooks:run_fold(privacy_get_user_list, Server,
+					  #userlist{}, [User, Server]),
+    is_privacy_allow(From, To, Packet, PrivacyList).
+
+%% Check if privacy rules allow this delivery
+%% Function copied from ejabberd_c2s.erl
+is_privacy_allow(From, To, Packet, PrivacyList) ->
+    User = To#jid.user,
+    Server = To#jid.server,
+    allow == ejabberd_hooks:run_fold(
+	       privacy_check_packet, Server,
+	       allow,
+	       [User,
+		Server,
+		PrivacyList,
+		{From, To, Packet},
+		in]).
+
 route_message(From, To, Packet) ->
    LUser = To#jid.luser,
    LServer = To#jid.lserver,
@@ -5,7 +5,7 @@
 %%% Created : 23 Aug 2006 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -5,7 +5,7 @@
 %%% Created : 31 Jan 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -5,7 +5,7 @@
 %%% Created : 21 Mar 2007 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -5,7 +5,7 @@
 %%% Created : 18 Jul 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -5,7 +5,7 @@
 %%% Created : 27 Jan 2006 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -4,8 +4,7 @@ include ..\Makefile.inc
 EFLAGS = -I .. -pz ..

 OUTDIR = ..
-SOURCES = $(wildcard *.erl)
-BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
+BEAMS = ..\ejabberd_zlib.beam

 SOURCE = ejabberd_zlib_drv.c
 OBJECT = ejabberd_zlib_drv.o
@@ -5,7 +5,7 @@
 %%% Created : 19 Jan 2006 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -1,5 +1,5 @@
 /*
- * ejabberd, Copyright (C) 2002-2008   ProcessOne
+ * ejabberd, Copyright (C) 2002-2009   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 Aug 2005 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -6,6 +6,8 @@ CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@

+ASN_FLAGS = -bber_bin +optimize +driver
+
 ERLANG_CFLAGS = @ERLANG_CFLAGS@
 ERLANG_LIBS = @ERLANG_LIBS@

@@ -25,7 +27,7 @@ all:    $(BEAMS) ELDAPv3.beam
 ELDAPv3.beam: ELDAPv3.erl

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

 $(OUTDIR)/%.beam:	%.erl ELDAPv3.erl
 	@ERLC@ -W $(EFLAGS) -o $(OUTDIR) $<
@@ -4,8 +4,9 @@ include ..\Makefile.inc
 EFLAGS = -I .. -pz ..

 OUTDIR = ..
-SOURCES = $(wildcard *.erl)
-BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
+BEAMS = ..\eldap.beam ..\eldap_filter.beam ..\eldap_pool.beam ..\eldap_utils.beam
+
+ASN_FLAGS = -bber_bin +optimize +driver

 ALL : $(BEAMS)

@@ -17,7 +18,7 @@ Clean :
 	-@erase $(BEAMS)

 ELDAPv3.erl : ELDAPv3.asn
-	erlc -bber_bin -W $(EFLAGS) ELDAPv3.asn
+	erlc $(ASN_FLAGS) -W $(EFLAGS) ELDAPv3.asn

 $(OUTDIR)\eldap.beam : eldap.erl ELDAPv3.erl
 	erlc -W $(EFLAGS) -o $(OUTDIR) eldap.erl
@@ -85,6 +85,10 @@
 -define(RETRY_TIMEOUT, 500).
 -define(BIND_TIMEOUT, 10000).
 -define(CMD_TIMEOUT, 100000).
+%% Used in gen_fsm sync calls.
+-define(CALL_TIMEOUT, ?CMD_TIMEOUT + ?BIND_TIMEOUT + ?RETRY_TIMEOUT).
+%% Used as a timeout for gen_tcp:send/2
+-define(SEND_TIMEOUT, 30000).
 -define(MAX_TRANSACTION_ID, 65535).
 -define(MIN_TRANSACTION_ID, 0).

@@ -98,7 +102,7 @@
 		id = 0,        % LDAP Request ID 
 		bind_timer,    % Ref to bind timeout
 		dict,          % dict holding operation params and results
-		bind_q         % Queue for bind() requests
+		req_q          % Queue for requests
 	}).

 %%%----------------------------------------------------------------------
@@ -141,7 +145,8 @@ close(Handle) ->
 %%% --------------------------------------------------------------------
 add(Handle, Entry, Attributes) when list(Entry),list(Attributes) ->
    Handle1 = get_handle(Handle),
-    gen_fsm:sync_send_event(Handle1, {add, Entry, add_attrs(Attributes)}).
+    gen_fsm:sync_send_event(Handle1, {add, Entry, add_attrs(Attributes)},
+			    ?CALL_TIMEOUT).

 %%% Do sanity check !
 add_attrs(Attrs) ->
@@ -166,7 +171,7 @@ add_attrs(Attrs) ->
 %%% --------------------------------------------------------------------
 delete(Handle, Entry) when list(Entry) ->
    Handle1 = get_handle(Handle),
-    gen_fsm:sync_send_event(Handle1, {delete, Entry}).
+    gen_fsm:sync_send_event(Handle1, {delete, Entry}, ?CALL_TIMEOUT).

 %%% --------------------------------------------------------------------
 %%% Modify an entry. Given an entry a number of modification
@@ -181,7 +186,7 @@ delete(Handle, Entry) when list(Entry) ->
 %%% --------------------------------------------------------------------
 modify(Handle, Object, Mods) when list(Object), list(Mods) ->
    Handle1 = get_handle(Handle),
-    gen_fsm:sync_send_event(Handle1, {modify, Object, Mods}).
+    gen_fsm:sync_send_event(Handle1, {modify, Object, Mods}, ?CALL_TIMEOUT).

 %%%
 %%% Modification operations. 
@@ -214,7 +219,10 @@ m(Operation, Type, Values) ->
 modify_dn(Handle, Entry, NewRDN, DelOldRDN, NewSup) 
  when list(Entry),list(NewRDN),atom(DelOldRDN),list(NewSup) ->
    Handle1 = get_handle(Handle),
-    gen_fsm:sync_send_event(Handle1, {modify_dn, Entry, NewRDN, bool_p(DelOldRDN), optional(NewSup)}).
+    gen_fsm:sync_send_event(
+      Handle1,
+      {modify_dn, Entry, NewRDN, bool_p(DelOldRDN), optional(NewSup)},
+      ?CALL_TIMEOUT).


 %%% --------------------------------------------------------------------
@@ -228,7 +236,7 @@ modify_dn(Handle, Entry, NewRDN, DelOldRDN, NewSup)
 bind(Handle, RootDN, Passwd) 
  when list(RootDN),list(Passwd) ->
    Handle1 = get_handle(Handle),
-    gen_fsm:sync_send_event(Handle1, {bind, RootDN, Passwd}, infinity).
+    gen_fsm:sync_send_event(Handle1, {bind, RootDN, Passwd}, ?CALL_TIMEOUT).

 %%% Sanity checks !

@@ -273,7 +281,7 @@ search(Handle, L) when list(L) ->

 call_search(Handle, A) ->
    Handle1 = get_handle(Handle),
-    gen_fsm:sync_send_event(Handle1, {search, A}, infinity).
+    gen_fsm:sync_send_event(Handle1, {search, A}, ?CALL_TIMEOUT).

 parse_search_args(Args) ->
    parse_search_args(Args, #eldap_search{scope = wholeSubtree}).
@@ -382,7 +390,7 @@ init({Hosts, Port, Rootdn, Passwd}) ->
 			    passwd = Passwd,
 			    id = 0,
 			    dict = dict:new(),
-			    bind_q = queue:new()}, 0}.
+			    req_q = queue:new()}, 0}.

 %%----------------------------------------------------------------------
 %% Func: StateName/2
@@ -405,38 +413,20 @@ connecting(timeout, S) ->
 %%          {stop, Reason, NewStateData}                          |
 %%          {stop, Reason, Reply, NewStateData}                    
 %%----------------------------------------------------------------------
-connecting(_Event, _From, S) ->
-    Reply = {error, connecting},
-    {reply, Reply, connecting, S}.
+connecting(Event, From, S) ->
+    Q = queue:in({Event, From}, S#eldap.req_q),
+    {next_state, connecting, S#eldap{req_q=Q}}.

-wait_bind_response(_Event, _From, S) ->
-    Reply = {error, wait_bind_response},
-    {reply, Reply, wait_bind_response, S}.
+wait_bind_response(Event, From, S) ->
+    Q = queue:in({Event, From}, S#eldap.req_q),
+    {next_state, wait_bind_response, S#eldap{req_q=Q}}.
+
+active_bind(Event, From, S) ->
+    Q = queue:in({Event, From}, S#eldap.req_q),
+    {next_state, active_bind, S#eldap{req_q=Q}}.

 active(Event, From, S) ->
-    case catch send_command(Event, From, S) of
-	{ok, NewS} ->
-	    case Event of
-		{bind, _, _} ->
-		    {next_state, active_bind, NewS};
-		_ ->
-		    {next_state, active, NewS}
-	    end;
-	{error, Reason} ->
-	    {reply, {error, Reason}, active, S};
-	{'EXIT', Reason} ->
-	    {reply, {error, Reason}, active, S}
-    end.
-
-active_bind({bind, RootDN, Passwd}, From, #eldap{bind_q=Q} = S) ->
-    NewQ = queue:in({{bind, RootDN, Passwd}, From}, Q),
-    {next_state, active_bind, S#eldap{bind_q=NewQ}};
-active_bind(Event, From, S) ->
-    case catch send_command(Event, From, S) of
-	{ok, NewS}       -> {next_state, active_bind, NewS};
-	{error, Reason}  -> {reply, {error, Reason}, active_bind, S};
-	{'EXIT', Reason} -> {reply, {error, Reason}, active_bind, S}
-    end.
+    process_command(S, Event, From).

 %%----------------------------------------------------------------------
 %% Func: handle_event/3
@@ -446,21 +436,8 @@ active_bind(Event, From, S) ->
 %%          {stop, Reason, NewStateData}                         
 %%----------------------------------------------------------------------
 handle_event(close, _StateName, S) ->
-    gen_tcp:close(S#eldap.fd),
-    {stop, closed, S};
-
-handle_event(process_bind_q, active_bind, #eldap{bind_q=Q} = S) ->
-    case queue:out(Q) of
-	{{value, {BindEvent, To}}, NewQ} ->
-	    NewStateData = case catch send_command(BindEvent, To, S) of
-			       {ok, NewS}       -> NewS;
-			       {error, Reason}  -> gen_fsm:reply(To, {error, Reason}), S;
-			       {'EXIT', Reason} -> gen_fsm:reply(To, {error, Reason}), S
-			   end,
-	    {next_state, active_bind, NewStateData#eldap{bind_q=NewQ}};
-	{empty, Q} ->
-	    {next_state, active, S}
-    end;
+    catch gen_tcp:close(S#eldap.fd),
+    {stop, normal, S};

 handle_event(_Event, StateName, S) ->
    {next_state, StateName, S}.
@@ -489,59 +466,61 @@ handle_sync_event(_Event, _From, StateName, S) ->
 %% Packets arriving in various states
 %%
 handle_info({tcp, _Socket, Data}, connecting, S) ->
-    ?DEBUG("eldap. tcp packet received when disconnected!~n~p", [Data]),
+    ?DEBUG("tcp packet received when disconnected!~n~p", [Data]),
    {next_state, connecting, S};

 handle_info({tcp, _Socket, Data}, wait_bind_response, S) ->
    cancel_timer(S#eldap.bind_timer),
    case catch recvd_wait_bind_response(Data, S) of
-	bound                -> {next_state, active, S};
-	{fail_bind, _Reason}  -> close_and_retry(S),
-				{next_state, connecting, S#eldap{fd = null}};
-	{'EXIT', _Reason}     -> close_and_retry(S),
-				{next_state, connecting, S#eldap{fd = null}};
-	{error, _Reason}      -> close_and_retry(S),
-				{next_state, connecting, S#eldap{fd = null}}
+	bound ->
+	    dequeue_commands(S);
+	{fail_bind, _Reason} ->
+	    {next_state, connecting, close_and_retry(S)};
+	{'EXIT', _Reason} ->
+	    {next_state, connecting, close_and_retry(S)};
+	{error, _Reason} ->
+	    {next_state, connecting, close_and_retry(S)}
    end;

 handle_info({tcp, _Socket, Data}, StateName, S)
-  when StateName==active; StateName==active_bind ->
+  when StateName == active orelse StateName == active_bind ->
    case catch recvd_packet(Data, S) of
-	{reply, Reply, To, NewS} -> gen_fsm:reply(To, Reply),
-				    {next_state, StateName, NewS};
-	{ok, NewS}               -> {next_state, StateName, NewS};
-	{'EXIT', _Reason}         -> {next_state, StateName, S};
-	{error, _Reason}          -> {next_state, StateName, S}
+	{response, Response, RequestType} ->
+	    NewS = case Response of
+		       {reply, Reply, To, S1} ->
+			   gen_fsm:reply(To, Reply),
+			   S1;
+		       {ok, S1} ->
+			   S1
+		   end,
+	    if (StateName == active_bind andalso
+		RequestType == bindRequest) orelse
+	       (StateName == active) ->
+		    dequeue_commands(NewS);
+	       true ->
+		    {next_state, StateName, NewS}
+	    end;
+	_ ->
+	    {next_state, StateName, S}
    end;

 handle_info({tcp_closed, _Socket}, Fsm_state, S) ->
    ?WARNING_MSG("LDAP server closed the connection: ~s:~p~nIn State: ~p",
 	  [S#eldap.host, S#eldap.port ,Fsm_state]),
-    F = fun(_Id, [{Timer, From, _Name}|_]) ->
-		gen_fsm:reply(From, {error, tcp_closed}),
-		cancel_timer(Timer)
-	end,
-    dict:map(F, S#eldap.dict),
-    {ok, NextState, NewS} = connect_bind(S#eldap{fd = null,
-						 dict = dict:new(),
-						 bind_q=queue:new()}),
-    {next_state, NextState, NewS};
+    {next_state, connecting, close_and_retry(S)};

 handle_info({tcp_error, _Socket, Reason}, Fsm_state, S) ->
    ?DEBUG("eldap received tcp_error: ~p~nIn State: ~p", [Reason, Fsm_state]),
-    %% XXX wouldn't it be safer to try reconnect ?
-    %% if we were waiting a result, we may mait forever
-    %% cause request is probably lost....
-    {next_state, Fsm_state, S};
+    {next_state, connecting, close_and_retry(S)};

 %%
 %% Timers
 %%
-handle_info({timeout, Timer, {cmd_timeout, Id}}, active, S) ->
+handle_info({timeout, Timer, {cmd_timeout, Id}}, StateName, S) ->
    case cmd_timeout(Timer, Id, S) of
 	{reply, To, Reason, NewS} -> gen_fsm:reply(To, Reason),
-				     {next_state, active, NewS};
-	{error, _Reason}           -> {next_state, active, S}
+				     {next_state, StateName, NewS};
+	{error, _Reason}           -> {next_state, StateName, S}
    end;

 handle_info({timeout, retry_connect}, connecting, S) ->
@@ -549,8 +528,7 @@ handle_info({timeout, retry_connect}, connecting, S) ->
    {next_state, NextState, NewS};

 handle_info({timeout, _Timer, bind_timeout}, wait_bind_response, S) ->
-    close_and_retry(S),
-    {next_state, connecting, S#eldap{fd = null}};
+    {next_state, connecting, close_and_retry(S)};

 %%
 %% Make sure we don't fill the message queue with rubbish
@@ -579,6 +557,34 @@ code_change(_OldVsn, StateName, S, _Extra) ->
 %%%----------------------------------------------------------------------
 %%% Internal functions
 %%%----------------------------------------------------------------------
+dequeue_commands(S) ->
+    case queue:out(S#eldap.req_q) of
+	{{value, {Event, From}}, Q} ->
+	    case process_command(S#eldap{req_q=Q}, Event, From) of
+		{_, active, NewS} -> 
+		    dequeue_commands(NewS);
+		Res ->
+		    Res
+	    end;
+	{empty, _} ->
+	    {next_state, active, S}
+    end.
+
+process_command(S, Event, From) ->
+    case send_command(Event, From, S) of
+	{ok, NewS} ->
+	    case Event of
+		{bind, _, _} ->
+		    {next_state, active_bind, NewS};
+		_ ->
+		    {next_state, active, NewS}
+	    end;
+	{error, _Reason} ->
+	    Q = queue:in_r({Event, From}, S#eldap.req_q),
+	    NewS = close_and_retry(S#eldap{req_q=Q}),
+	    {next_state, connecting, NewS}
+    end.
+
 send_command(Command, From, S) ->
    Id = bump_id(S),
    {Name, Request} = gen_req(Command),
@@ -589,7 +595,7 @@ send_command(Command, From, S) ->
    case gen_tcp:send(S#eldap.fd, Bytes) of
    ok ->
 	Timer = erlang:start_timer(?CMD_TIMEOUT, self(), {cmd_timeout, Id}),
-	New_dict = dict:store(Id, [{Timer, From, Name}], S#eldap.dict),
+	New_dict = dict:store(Id, [{Timer, Command, From, Name}], S#eldap.dict),
 	{ok, S#eldap{id = Id, dict = New_dict}};
    Error ->
 	Error
@@ -649,6 +655,7 @@ recvd_packet(Pkt, S) ->
 	    Dict = S#eldap.dict,
 	    Id = Msg#'LDAPMessage'.messageID,
 	    {Timer, From, Name, Result_so_far} = get_op_rec(Id, Dict),
+	    Answer = 
 	    case {Name, Op} of
 		{searchRequest, {searchResEntry, R}} when
 		record(R,'SearchResultEntry') ->
@@ -696,14 +703,14 @@ recvd_packet(Pkt, S) ->
 		    New_dict = dict:erase(Id, Dict),
 		    cancel_timer(Timer),
 		    Reply = check_bind_reply(Result, From),
-		    gen_fsm:send_all_state_event(self(), process_bind_q),
 		    {reply, Reply, From, S#eldap{dict = New_dict}};
 		{OtherName, OtherResult} ->
 		    New_dict = dict:erase(Id, Dict),
 		    cancel_timer(Timer),
 		    {reply, {error, {invalid_result, OtherName, OtherResult}},
 		     From, S#eldap{dict = New_dict}}
-	    end;
+	    end,
+	    {response, Answer, Name};
 	Error -> Error
    end.

@@ -723,7 +730,7 @@ check_bind_reply(Other, _From) ->

 get_op_rec(Id, Dict) ->
    case dict:find(Id, Dict) of
-	{ok, [{Timer, From, Name}|Res]} ->
+	{ok, [{Timer, _Command, From, Name}|Res]} ->
 	    {Timer, From, Name, Res};
 	error ->
 	    throw({error, unkown_id})
@@ -784,13 +791,16 @@ check_tag(Data) ->
    end.

 close_and_retry(S) ->
-    gen_tcp:close(S#eldap.fd),
-    retry_connect().
-
-retry_connect() ->
-    erlang:send_after(?RETRY_TIMEOUT, self(),
-		      {timeout, retry_connect}).
-
+    catch gen_tcp:close(S#eldap.fd),
+    Queue = dict:fold(
+	      fun(_Id, [{Timer, Command, From, _Name}|_], Q) ->
+		      cancel_timer(Timer),
+		      queue:in_r({Command, From}, Q);
+		 (_, _, Q) ->
+		      Q
+	      end, S#eldap.req_q, S#eldap.dict),
+    erlang:send_after(?RETRY_TIMEOUT, self(), {timeout, retry_connect}),
+    S#eldap{fd=null, req_q=Queue, dict=dict:new()}.

 %%-----------------------------------------------------------------------
 %% Sort out timed out commands
@@ -798,7 +808,7 @@ retry_connect() ->
 cmd_timeout(Timer, Id, S) ->
    Dict = S#eldap.dict,
    case dict:find(Id, Dict) of
-	{ok, [{Timer, From, Name}|Res]} ->
+	{ok, [{Timer, _Command, From, Name}|Res]} ->
 	    case Name of
 		searchRequest ->
 		    {Res1, Ref1} = polish(Res),
@@ -841,7 +851,8 @@ polish([], Res, Ref) ->
 %%-----------------------------------------------------------------------
 connect_bind(S) ->
    Host = next_host(S#eldap.host, S#eldap.hosts),
-    TcpOpts = [{packet, asn1}, {active, true}, {keepalive, true}, binary],
+    TcpOpts = [{packet, asn1}, {active, true}, {keepalive, true},
+	       {send_timeout, ?SEND_TIMEOUT}, binary],
    ?INFO_MSG("LDAP connection on ~s:~p", [Host, S#eldap.port]),
    case gen_tcp:connect(Host, S#eldap.port, TcpOpts) of
 	{ok, Socket} ->
@@ -853,15 +864,16 @@ connect_bind(S) ->
 							host = Host,
 							bind_timer = Timer}};
 		{error, Reason} ->
-		    ?ERROR_MSG("LDAP bind failed on ~s:~p~nReason: ~p", [Host, S#eldap.port, Reason]),
-		    gen_tcp:close(Socket),
-		    retry_connect(),
-		    {ok, connecting, S#eldap{host = Host}}
+		    ?ERROR_MSG("LDAP bind failed on ~s:~p~nReason: ~p",
+			       [Host, S#eldap.port, Reason]),
+		    NewS = close_and_retry(S),
+		    {ok, connecting, NewS#eldap{host = Host}}
 	    end;
 	{error, Reason} ->
-	    ?ERROR_MSG("LDAP connection failed on ~s:~p~nReason: ~p", [Host, S#eldap.port, Reason]),
-	    retry_connect(),
-	    {ok, connecting, S#eldap{host = Host}}
+	    ?ERROR_MSG("LDAP connection failed on ~s:~p~nReason: ~p",
+		       [Host, S#eldap.port, Reason]),
+	    NewS = close_and_retry(S),
+	    {ok, connecting, NewS#eldap{host = Host}}
    end.

 bind_request(Socket, S) ->
@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   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,7 +11,7 @@
 %%% 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
@@ -6,7 +6,7 @@
 %%% Author:  Evgeniy Khramtsov <xramtsov@gmail.com>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -17,7 +17,7 @@
 %%% 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
@@ -5,7 +5,7 @@
 %%% Created : 12 Nov 2006 by Evgeniy Khramtsov <xram@jabber.ru>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -5,7 +5,7 @@
 %%% Created : 12 Oct 2006 by Mickael Remond <mremond@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -14,6 +14,8 @@
 * Workaround for EI encode_string bug
 */

+int x_fix_buff(ei_x_buff* x, int szneeded);
+
 #define put8(s,n) do { \
  (s)[0] = (char)((n) & 0xff); \
  (s) += 1; \
@@ -5,7 +5,7 @@
 %%% Created : 30 Jul 2004 by Leif Johansson <leifj@it.su.se>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -5,7 +5,7 @@
 %%% Created : 22 Jan 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -5,7 +5,7 @@
 %%% Created : 24 Jan 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -62,14 +62,16 @@ start() ->


 start_module(Host, Module, Opts) ->
+    set_module_opts_mnesia(Host, Module, Opts),
+    ets:insert(ejabberd_modules,
+	       #ejabberd_module{module_host = {Module, Host},
+				opts = Opts}),
    case catch Module:start(Host, Opts) of
 	{'EXIT', Reason} ->
+	    del_module_mnesia(Host, Module),
+	    ets:delete(ejabberd_modules, {Module, Host}),
 	    ?ERROR_MSG("~p", [Reason]);
 	_ ->
-	    set_module_opts_mnesia(Host, Module, Opts),
-	    ets:insert(ejabberd_modules,
-		       #ejabberd_module{module_host = {Module, Host},
-					opts = Opts}),
 	    ok
    end.

@@ -5,7 +5,7 @@
 %%% Created : 10 Apr 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -5,7 +5,7 @@
 %%% Created :  2 Feb 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -5,7 +5,7 @@
 %%% Created : 23 Nov 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -34,6 +34,8 @@
 	 make_correct_from_to_attrs/3,
 	 replace_from_to_attrs/3,
 	 replace_from_to/3,
+	 replace_from_attrs/2,
+	 replace_from/2,
 	 remove_attr/2,
 	 make_jid/3,
 	 make_jid/1,
@@ -153,6 +155,13 @@ replace_from_to(From, To, {xmlelement, Name, Attrs, Els}) ->
 				     Attrs),
    {xmlelement, Name, NewAttrs, Els}.

+replace_from_attrs(From, Attrs) ->
+    Attrs1 = lists:keydelete("from", 1, Attrs),
+    [{"from", From} | Attrs1].
+
+replace_from(From, {xmlelement, Name, Attrs, Els}) ->
+    NewAttrs = replace_from_attrs(jlib:jid_to_string(From), Attrs),
+    {xmlelement, Name, NewAttrs, Els}.

 remove_attr(Attr, {xmlelement, Name, Attrs, Els}) ->
    NewAttrs = lists:keydelete(Attr, 1, Attrs),
@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   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,7 +11,7 @@
 %%% 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
@@ -5,7 +5,7 @@
 %%% Created : 15 Nov 2005 by Magnus Henoch <henoch@dtek.chalmers.se>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -5,7 +5,7 @@
 %%% Created : 11 Aug 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -5,7 +5,7 @@
 %%% Created : 7 Oct 2006 by Magnus Henoch <henoch@dtek.chalmers.se>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -31,8 +31,11 @@
 -behaviour(gen_mod).

 -export([read_caps/1,
+	 get_caps/1,
 	 note_caps/3,
+	 clear_caps/1,
 	 get_features/2,
+	 get_user_resources/2,
 	 handle_disco_response/3]).

 %% gen_mod callbacks
@@ -57,6 +60,8 @@

 -record(caps, {node, version, exts}).
 -record(caps_features, {node_pair, features}).
+-record(user_caps, {jid, caps}).
+-record(user_caps_resources, {uid, resource}).
 -record(state, {host,
 		disco_requests = ?DICT:new(),
 		feature_queries = []}).
@@ -89,12 +94,41 @@ read_caps([_ | Tail], Result) ->
 read_caps([], Result) ->
    Result.

+%% get_caps reads user caps from database
+get_caps(JID) ->
+    case catch mnesia:dirty_read({user_caps, list_to_binary(jlib:jid_to_string(JID))}) of
+	[#user_caps{caps=Caps}] -> 
+	    Caps;
+	_ -> 
+	    nothing
+    end.
+
+%% clear_caps removes user caps from database
+clear_caps(JID) ->
+    {U, S, R} = jlib:jid_tolower(JID),
+    BJID = list_to_binary(jlib:jid_to_string(JID)),
+    BUID = list_to_binary(jlib:jid_to_string({U, S, []})),
+    catch mnesia:dirty_delete({user_caps, BJID}),
+    catch mnesia:dirty_delete_object(#user_caps_resources{uid = BUID, resource = list_to_binary(R)}),
+    ok.
+
+%% give default user resource
+get_user_resources(LUser, LServer) ->
+    BUID = list_to_binary(jlib:jid_to_string({LUser, LServer, []})),
+    case catch mnesia:dirty_read({user_caps_resources, BUID}) of
+	{'EXIT', _} ->
+	    [];
+	Resources ->
+	    lists:map(fun(#user_caps_resources{resource=R}) -> binary_to_list(R) end, Resources)
+    end.
+
 %% note_caps should be called to make the module request disco
 %% information.  Host is the host that asks, From is the full JID that
 %% sent the caps packet, and Caps is what read_caps returned.
 note_caps(Host, From, Caps) ->
    case Caps of
-	nothing -> ok;
+	nothing -> 
+	    ok;
 	_ ->
 	    Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
 	    gen_server:cast(Proc, {note_caps, From, Caps})
@@ -105,7 +139,8 @@ note_caps(Host, From, Caps) ->
 %% timeout error.
 get_features(Host, Caps) ->
    case Caps of
-	nothing -> [];
+	nothing -> 
+	    [];
 	#caps{} ->
 	    Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
 	    gen_server:call(Proc, {get_features, Caps})
@@ -138,7 +173,14 @@ init([Host, _Opts]) ->
    mnesia:create_table(caps_features,
 			[{ram_copies, [node()]},
 			 {attributes, record_info(fields, caps_features)}]),
-    mnesia:add_table_copy(caps_features, node(), ram_copies),
+    mnesia:create_table(user_caps,
+			[{disc_copies, [node()]},
+			 {attributes, record_info(fields, user_caps)}]),
+    mnesia:create_table(user_caps_resources,
+			[{disc_copies, [node()]},
+			 {type, bag},
+			 {attributes, record_info(fields, user_caps_resources)}]),
+    mnesia:delete_table(user_caps_default),
    {ok, #state{host = Host}}.

 maybe_get_features(#caps{node = Node, version = Version, exts = Exts}) ->
@@ -186,10 +228,21 @@ handle_call(stop, _From, State) ->
    {stop, normal, ok, State}.

 handle_cast({note_caps, From, 
-	     #caps{node = Node, version = Version, exts = Exts}}, 
+	     #caps{node = Node, version = Version, exts = Exts} = Caps}, 
 	    #state{host = Host, disco_requests = Requests} = State) ->
    %% XXX: this leads to race conditions where ejabberd will send
    %% lots of caps disco requests.
+    {U, S, R} = jlib:jid_tolower(From),
+    BJID = list_to_binary(jlib:jid_to_string(From)),
+    mnesia:dirty_write(#user_caps{jid = BJID, caps = Caps}),
+    case ejabberd_sm:get_user_resources(U, S) of
+	[] ->
+	    % only store resources of caps aware external contacts
+	    BUID = list_to_binary(jlib:jid_to_string(jlib:jid_remove_resource(From))),
+	    mnesia:dirty_write(#user_caps_resources{uid = BUID, resource = list_to_binary(R)});
+	_ ->
+	    ok
+    end,
    SubNodes = [Version | Exts],
    %% Now, find which of these are not already in the database.
    Fun = fun() ->
@@ -204,11 +257,9 @@ handle_cast({note_caps, From,
 	  end,
    case mnesia:transaction(Fun) of
 	{atomic, Missing} ->
-	    %% For each unknown caps "subnode", we send a disco
-	    %% request.
-	    NewRequests =
-		lists:foldl(
-		  fun(SubNode, Dict) ->
+	    %% For each unknown caps "subnode", we send a disco request.
+	    NewRequests = lists:foldl(
+		fun(SubNode, Dict) ->
 			  ID = randoms:get_string(),
 			  Stanza =
 			      {xmlelement, "iq",
@@ -5,7 +5,7 @@
 %%% Created : 19 Jan 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -307,8 +307,10 @@ adhoc_local_items(Acc, From, #jid{lserver = LServer, server = Server} = To,
 			{result, Its} -> Its;
 			empty -> []
 		    end,
+	    PermLev = get_permission_level(From),
 	    %% Recursively get all configure commands
-	    Nodes = recursively_get_local_items(LServer, "", Server, Lang),
+	    Nodes = recursively_get_local_items(PermLev, LServer, "", Server,
+						Lang),
 	    Nodes1 = lists:filter(
 		       fun(N) ->
 			       Nd = xml:get_tag_attr_s("node", N),
@@ -325,15 +327,15 @@ adhoc_local_items(Acc, From, #jid{lserver = LServer, server = Server} = To,
 	    Acc
    end.

-recursively_get_local_items(_LServer, "online users", _Server, _Lang) ->
+recursively_get_local_items(_PermLev, _LServer, "online users", _Server, _Lang) ->
    [];

-recursively_get_local_items(_LServer, "all users", _Server, _Lang) ->
+recursively_get_local_items(_PermLev, _LServer, "all users", _Server, _Lang) ->
    [];

-recursively_get_local_items(LServer, Node, Server, Lang) ->
+recursively_get_local_items(PermLev, LServer, Node, Server, Lang) ->
    LNode = tokenize(Node),
-    Items = case get_local_items(LServer, LNode, Server, Lang) of
+    Items = case get_local_items({PermLev, LServer}, LNode, Server, Lang) of
 		{result, Res} ->
 		    Res;
 		{error, _Error} ->
@@ -348,11 +350,17 @@ recursively_get_local_items(LServer, Node, Server, Lang) ->
 				[];
 			   true ->
 				[N, recursively_get_local_items(
-				      LServer, Nd, Server, Lang)]
+				      PermLev, LServer, Nd, Server, Lang)]
 			end
 		end, Items)),
    Nodes.

+get_permission_level(JID) ->
+    case acl:match_rule(global, configure, JID) of
+	allow -> global;
+	deny -> vhost
+    end.
+
 %%%-----------------------------------------------------------------------

 -define(ITEMS_RESULT(Allow, LNode, Fallback),
@@ -360,7 +368,8 @@ recursively_get_local_items(LServer, Node, Server, Lang) ->
 	    deny ->
 		Fallback;
 	    allow ->
-		case get_local_items(LServer, LNode,
+		PermLev = get_permission_level(From),
+		case get_local_items({PermLev, LServer}, LNode,
 				     jlib:jid_to_string(To), Lang) of
 		    {result, Res} ->
 			{result, Res};
@@ -383,7 +392,8 @@ get_local_items(Acc, From, #jid{lserver = LServer} = To, "", Lang) ->
 		deny ->
 		    {result, Items};
 		allow ->
-		    case get_local_items(LServer, [],
+		    PermLev = get_permission_level(From),
+		    case get_local_items({PermLev, LServer}, [],
 					 jlib:jid_to_string(To), Lang) of
 			{result, Res} ->
 			    {result, Items ++ Res};
@@ -448,6 +458,9 @@ get_local_items(Acc, From, #jid{lserver = LServer} = To, Node, Lang) ->

 %%%-----------------------------------------------------------------------

+%% @spec ({PermissionLevel, Host}, [string()], Server::string(), Lang)
+%%              -> {result, [xmlelement()]}
+%%       PermissionLevel = global | vhost
 get_local_items(_Host, [], Server, Lang) ->
    {result,
     [?NODE("Configuration",            "config"),
@@ -484,13 +497,13 @@ get_local_items(_Host, ["user"], Server, Lang) ->
 get_local_items(_Host, ["http:" | _], _Server, _Lang) ->
    {result, []};

-get_local_items(Host, ["online users"], _Server, _Lang) ->
+get_local_items({_, Host}, ["online users"], _Server, _Lang) ->
    {result, get_online_vh_users(Host)};

-get_local_items(Host, ["all users"], _Server, _Lang) ->
+get_local_items({_, Host}, ["all users"], _Server, _Lang) ->
    {result, get_all_vh_users(Host)};

-get_local_items(Host, ["all users", [$@ | Diap]], _Server, _Lang) ->
+get_local_items({_, Host}, ["all users", [$@ | Diap]], _Server, _Lang) ->
    case catch ejabberd_auth:get_vh_registered_users(Host) of
 	{'EXIT', _Reason} ->
 	    ?ERR_INTERNAL_SERVER_ERROR;
@@ -514,10 +527,10 @@ get_local_items(Host, ["all users", [$@ | Diap]], _Server, _Lang) ->
 		 end
    end;

-get_local_items(Host, ["outgoing s2s"], _Server, Lang) ->
+get_local_items({_, Host}, ["outgoing s2s"], _Server, Lang) ->
    {result, get_outgoing_s2s(Host, Lang)};

-get_local_items(Host, ["outgoing s2s", To], _Server, Lang) ->
+get_local_items({_, Host}, ["outgoing s2s", To], _Server, Lang) ->
    {result, get_outgoing_s2s(Host, Lang, To)};

 get_local_items(_Host, ["running nodes"], Server, Lang) ->
@@ -526,7 +539,7 @@ get_local_items(_Host, ["running nodes"], Server, Lang) ->
 get_local_items(_Host, ["stopped nodes"], _Server, Lang) ->
    {result, get_stopped_nodes(Lang)};

-get_local_items(_Host, ["running nodes", ENode], Server, Lang) ->
+get_local_items({global, _Host}, ["running nodes", ENode], Server, Lang) ->
    {result,
     [?NODE("Database", "running nodes/" ++ ENode ++ "/DB"),
      ?NODE("Modules", "running nodes/" ++ ENode ++ "/modules"),
@@ -537,6 +550,11 @@ get_local_items(_Host, ["running nodes", ENode], Server, Lang) ->
      ?NODE("Shut Down Service", "running nodes/" ++ ENode ++ "/shutdown")
     ]};

+get_local_items({vhost, _Host}, ["running nodes", ENode], Server, Lang) ->
+    {result,
+     [?NODE("Modules", "running nodes/" ++ ENode ++ "/modules")
+     ]};
+
 get_local_items(_Host, ["running nodes", _ENode, "DB"], _Server, _Lang) ->
    {result, []};

@@ -708,8 +726,8 @@ get_stopped_nodes(_Lang) ->

 %%-------------------------------------------------------------------------

-define(COMMANDS_RESULT(Allow, From, To, Request),
-	case Allow of
+-define(COMMANDS_RESULT(LServerOrGlobal, From, To, Request),
+	case acl:match_rule(LServerOrGlobal, configure, From) of
 	    deny ->
 		{error, ?ERR_FORBIDDEN};
 	    allow ->
@@ -719,24 +737,23 @@ get_stopped_nodes(_Lang) ->
 adhoc_local_commands(Acc, From, #jid{lserver = LServer} = To,
 		     #adhoc_request{node = Node} = Request) ->
    LNode = tokenize(Node),
-    Allow = acl:match_rule(LServer, configure, From),
    case LNode of
 	["running nodes", _ENode, "DB"] ->
-	    ?COMMANDS_RESULT(Allow, From, To, Request);
+	    ?COMMANDS_RESULT(global, From, To, Request);
 	["running nodes", _ENode, "modules", _] ->
-	    ?COMMANDS_RESULT(Allow, From, To, Request);
+	    ?COMMANDS_RESULT(LServer, From, To, Request);
 	["running nodes", _ENode, "backup", _] ->
-	    ?COMMANDS_RESULT(Allow, From, To, Request);
+	    ?COMMANDS_RESULT(global, From, To, Request);
 	["running nodes", _ENode, "import", _] ->
-	    ?COMMANDS_RESULT(Allow, From, To, Request);
+	    ?COMMANDS_RESULT(global, From, To, Request);
 	["running nodes", _ENode, "restart"] ->
-	    ?COMMANDS_RESULT(Allow, From, To, Request);
+	    ?COMMANDS_RESULT(global, From, To, Request);
 	["running nodes", _ENode, "shutdown"] ->
-	    ?COMMANDS_RESULT(Allow, From, To, Request);
+	    ?COMMANDS_RESULT(global, From, To, Request);
 	["config", _] ->
-	    ?COMMANDS_RESULT(Allow, From, To, Request);
+	    ?COMMANDS_RESULT(LServer, From, To, Request);
 	?NS_ADMINL(_) ->
-	    ?COMMANDS_RESULT(Allow, From, To, Request);
+	    ?COMMANDS_RESULT(LServer, From, To, Request);
 	_ ->
 	    Acc
    end.
@@ -1248,7 +1265,7 @@ get_form(Host, ?NS_ADMINL("get-registered-users-num"), Lang) ->
       [?HFIELD(),
 	{xmlelement, 
 	 "field", 
-	 [{"type", "jid-single"},
+	 [{"type", "text-single"},
 	  {"label", ?T(Lang, "Number of registered users")},
 	  {"var", "registeredusersnum"}],
 	 [{xmlelement, "value", [], [{xmlcdata, Num}]}]
@@ -1262,7 +1279,7 @@ get_form(Host, ?NS_ADMINL("get-online-users-num"), Lang) ->
       [?HFIELD(),
 	{xmlelement, 
 	 "field", 
-	 [{"type", "jid-single"},
+	 [{"type", "text-single"},
 	  {"label", ?T(Lang, "Number of online users")},
 	  {"var", "onlineusersnum"}],
 	 [{xmlelement, "value", [], [{xmlcdata, Num}]}]
@@ -1540,7 +1557,7 @@ set_form(_From, Host, ["config", "access"], _Lang, XData) ->
 	    {error, ?ERR_BAD_REQUEST}
    end;

-set_form(_From, _Host, ?NS_ADMINL("add-user"), _Lang, XData) ->
+set_form(From, Host, ?NS_ADMINL("add-user"), _Lang, XData) ->
    AccountString = get_value("accountjid", XData),
    Password = get_value("password", XData),
    Password = get_value("password-verify", XData),
@@ -1548,10 +1565,11 @@ set_form(_From, _Host, ?NS_ADMINL("add-user"), _Lang, XData) ->
    User = AccountJID#jid.luser,
    Server = AccountJID#jid.lserver,
    true = lists:member(Server, ?MYHOSTS),
+    true = (Server == Host) orelse (get_permission_level(From) == global),
    ejabberd_auth:try_register(User, Server, Password),
    {result, []};

-set_form(_From, _Host, ?NS_ADMINL("delete-user"), _Lang, XData) ->
+set_form(From, Host, ?NS_ADMINL("delete-user"), _Lang, XData) ->
    AccountStringList = get_values("accountjids", XData),
    [_|_] = AccountStringList,
    ASL2 = lists:map(
@@ -1559,7 +1577,8 @@ set_form(_From, _Host, ?NS_ADMINL("delete-user"), _Lang, XData) ->
 		     JID = jlib:string_to_jid(AccountString),
 		     [_|_] = JID#jid.luser,
 		     User = JID#jid.luser, 
-		     Server = JID#jid.lserver, 
+		     Server = JID#jid.lserver,
+		     true = (Server == Host) orelse (get_permission_level(From) == global),
 		     true = ejabberd_auth:is_user_exists(User, Server),
 		     {User, Server}
 	     end,
@@ -1567,12 +1586,13 @@ set_form(_From, _Host, ?NS_ADMINL("delete-user"), _Lang, XData) ->
    [ejabberd_auth:remove_user(User, Server) || {User, Server} <- ASL2],
    {result, []};

-set_form(_From, _Host, ?NS_ADMINL("end-user-session"), _Lang, XData) ->
+set_form(From, Host, ?NS_ADMINL("end-user-session"), _Lang, XData) ->
    AccountString = get_value("accountjid", XData),
    JID = jlib:string_to_jid(AccountString),
    [_|_] = JID#jid.luser,
    LUser = JID#jid.luser, 
    LServer = JID#jid.lserver, 
+    true = (LServer == Host) orelse (get_permission_level(From) == global),
    %% Code copied from ejabberd_sm.erl
    case JID#jid.lresource of
 	[] -> 
@@ -1586,12 +1606,13 @@ set_form(_From, _Host, ?NS_ADMINL("end-user-session"), _Lang, XData) ->
    end, 
    {result, []};

-set_form(_From, _Host, ?NS_ADMINL("get-user-password"), Lang, XData) ->
+set_form(From, Host, ?NS_ADMINL("get-user-password"), Lang, XData) ->
    AccountString = get_value("accountjid", XData),
    JID = jlib:string_to_jid(AccountString),
    [_|_] = JID#jid.luser,
    User = JID#jid.luser, 
    Server = JID#jid.lserver, 
+    true = (Server == Host) orelse (get_permission_level(From) == global),
    Password = ejabberd_auth:get_password(User, Server),
    true = is_list(Password),
    {result, [{xmlelement, "x", [{"xmlns", ?NS_XDATA}],
@@ -1600,23 +1621,25 @@ set_form(_From, _Host, ?NS_ADMINL("get-user-password"), Lang, XData) ->
 	        ?XFIELD("text-single", "Password", "password", Password)
 	       ]}]};

-set_form(_From, _Host, ?NS_ADMINL("change-user-password"), _Lang, XData) ->
+set_form(From, Host, ?NS_ADMINL("change-user-password"), _Lang, XData) ->
    AccountString = get_value("accountjid", XData),
    Password = get_value("password", XData),
    JID = jlib:string_to_jid(AccountString),
    [_|_] = JID#jid.luser,
    User = JID#jid.luser, 
    Server = JID#jid.lserver, 
+    true = (Server == Host) orelse (get_permission_level(From) == global),
    true = ejabberd_auth:is_user_exists(User, Server),
    ejabberd_auth:set_password(User, Server, Password),
    {result, []};

-set_form(_From, _Host, ?NS_ADMINL("get-user-lastlogin"), Lang, XData) ->
+set_form(From, Host, ?NS_ADMINL("get-user-lastlogin"), Lang, XData) ->
    AccountString = get_value("accountjid", XData),
    JID = jlib:string_to_jid(AccountString),
    [_|_] = JID#jid.luser,
    User = JID#jid.luser, 
    Server = JID#jid.lserver, 
+    true = (Server == Host) orelse (get_permission_level(From) == global),

    %% Code copied from web/ejabberd_web_admin.erl
    %% TODO: Update time format to XEP-0202: Entity Time
@@ -1648,12 +1671,13 @@ set_form(_From, _Host, ?NS_ADMINL("get-user-lastlogin"), Lang, XData) ->
 	        ?XFIELD("text-single", "Last login", "lastlogin", FLast)
 	       ]}]};

-set_form(_From, _Host, ?NS_ADMINL("user-stats"), Lang, XData) ->
+set_form(From, Host, ?NS_ADMINL("user-stats"), Lang, XData) ->
    AccountString = get_value("accountjid", XData),
    JID = jlib:string_to_jid(AccountString),
    [_|_] = JID#jid.luser,
    User = JID#jid.luser, 
    Server = JID#jid.lserver, 
+    true = (Server == Host) orelse (get_permission_level(From) == global),

    Resources = ejabberd_sm:get_user_resources(User, Server),
    IPs1 = [ejabberd_sm:get_user_ip(User, Server, Resource) || Resource <- Resources],
@@ -5,7 +5,7 @@
 %%% Created : 26 Oct 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -5,7 +5,7 @@
 %%% Created :  1 Jan 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -5,7 +5,7 @@
 %%% Created : 15 Jan 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -7,7 +7,7 @@
 %%%              {mod_ip_blacklist, []}
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -18,7 +18,7 @@
 %%% 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
@@ -4,8 +4,7 @@ include ..\Makefile.inc
 EFLAGS = -I .. -pz ..

 OUTDIR = ..
-SOURCES = $(wildcard *.erl)
-BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
+BEAMS = ..\iconv.beam ..\mod_irc.beam ..\mod_irc_connection.beam

 SOURCE = iconv_erl.c
 OBJECT = iconv_erl.o
@@ -5,7 +5,7 @@
 %%% Created : 16 Feb 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -1,5 +1,5 @@
 /*
- * ejabberd, Copyright (C) 2002-2008   ProcessOne
+ * ejabberd, Copyright (C) 2002-2009   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   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -309,12 +309,10 @@ iq_disco(Lang) ->
      [{"category", "conference"},
       {"type", "irc"},
       {"name", translate:translate(Lang, "IRC Transport")}], []},
-     {xmlelement, "feature",
-      [{"var", ?NS_MUC}], []},
-     {xmlelement, "feature",
-      [{"var", ?NS_REGISTER}], []},
-     {xmlelement, "feature",
-      [{"var", ?NS_VCARD}], []}].
+     {xmlelement, "feature", [{"var", ?NS_DISCO_INFO}], []},
+     {xmlelement, "feature", [{"var", ?NS_MUC}], []},
+     {xmlelement, "feature", [{"var", ?NS_REGISTER}], []},
+     {xmlelement, "feature", [{"var", ?NS_VCARD}], []}].

 iq_get_vcard(Lang) ->
    [{xmlelement, "FN", [],
@@ -323,7 +321,7 @@ iq_get_vcard(Lang) ->
      [{xmlcdata, ?EJABBERD_URI}]},
     {xmlelement, "DESC", [],
      [{xmlcdata, translate:translate(Lang, "ejabberd IRC module") ++
-        "\nCopyright (c) 2003-2008 Alexey Shchepin"}]}].
+        "\nCopyright (c) 2003-2009 Alexey Shchepin"}]}].

 process_register(Host, From, To, DefEnc, #iq{} = IQ) ->
    case catch process_irc_register(Host, From, To, DefEnc, IQ) of
@@ -5,7 +5,7 @@
 %%% Created : 15 Feb 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -5,7 +5,7 @@
 %%% Created : 24 Oct 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -5,7 +5,7 @@
 %%% Created : 24 Oct 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -4,8 +4,7 @@ include ..\Makefile.inc
 EFLAGS = -I .. -pz ..

 OUTDIR = ..
-SOURCES = $(wildcard *.erl)
-BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
+BEAMS = ..\mod_muc.beam ..\mod_muc_log.beam ..\mod_muc_room.beam

 ALL : $(BEAMS)

@@ -5,7 +5,7 @@
 %%% Created : 19 Mar 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2008   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2009   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 %%% 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
@@ -508,6 +508,8 @@ iq_disco_info(Lang) ->
      [{"category", "conference"},
       {"type", "text"},
       {"name", translate:translate(Lang, "Chatrooms")}], []},
+     {xmlelement, "feature", [{"var", ?NS_DISCO_INFO}], []},
+     {xmlelement, "feature", [{"var", ?NS_DISCO_ITEMS}], []},
     {xmlelement, "feature", [{"var", ?NS_MUC}], []},
     {xmlelement, "feature", [{"var", ?NS_REGISTER}], []},
     {xmlelement, "feature", [{"var", ?NS_VCARD}], []}].
@@ -655,7 +657,7 @@ iq_get_vcard(Lang) ->
      [{xmlcdata, ?EJABBERD_URI}]},
     {xmlelement, "DESC", [],
      [{xmlcdata, translate:translate(Lang, "ejabberd MUC module") ++
-	  "\nCopyright (c) 2003-2008 Alexey Shchepin"}]}].
+	  "\nCopyright (c) 2003-2009 Alexey Shchepin"}]}].


 broadcast_service_message(Host, Msg) ->
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Christophe Romain	a8e49ed5ee	tag for 2.0.5 SVN Revision: 2003	2009-04-01 15:05:29 +00:00
Badlop	3991450318	* doc/release_notes_2.0.5.txt: Added file for new release SVN Revision: 2002	2009-04-01 10:37:18 +00:00
Badlop	1f3acfc83f	* src/expat_erl.c: Fix implicit declaration of function x_fix_buff (thanks to Dennis Schridde)(EJAB-900) SVN Revision: 2000	2009-03-24 23:09:46 +00:00
Badlop	1e3faf8bd9	Merge 1998 from trunk. * src/ejabberd_sm.erl: Partially retract SVN r1976 EJAB-300 (EJAB-890). Check default privacy list when account, not a specific session, receives a presence subscription stanza (EJAB-300). * src/ejabberd_c2s.erl: Likewise SVN Revision: 1999	2009-03-24 18:02:13 +00:00
Badlop	3fce8ed570	Fix mistake when calling win32_dns. SVN Revision: 1990	2009-03-11 18:36:27 +00:00
Christophe Romain	b6abe1b926	fix typo in previous patch backport SVN Revision: 1988	2009-03-10 21:10:42 +00:00
Badlop	69b11b677d	* doc/release_notes_2.0.4.txt: Added file for new release SVN Revision: 1987	2009-03-10 16:25:20 +00:00
Badlop	8f41436cd8	* src/tls/tls_drv.c: Fix encryption problem for ejabberd_http after timeout (thanks to Alexey Shchepin)(EJAB-880) SVN Revision: 1986	2009-03-10 15:21:36 +00:00
Christophe Romain	b0864396ec	typo fix on roster access_model SVN Revision: 1983	2009-03-10 12:08:12 +00:00
Christophe Romain	dcac4ed8c8	Fix PEP with other domains and s2s (EJAB-825) SVN Revision: 1981	2009-03-10 10:46:19 +00:00
Badlop	74c202a714	* src/tls/tls_drv.c: Fix to support OpenSSL older than 0.9.8f (EJAB-877)(thanks to Jonathan Schleifer) * doc/guide.tex: It is again supported OpenSSL older than 0.9.8f * doc/guide.html: Likewise SVN Revision: 1979	2009-03-09 19:17:53 +00:00
Badlop	10b22b52ef	Merge 1925 from trunk. * src/mod_proxy65/mod_proxy65_service.erl: if an ip option is not defined, the module takes an IP address of a local hostname (thanks to Evgeniy Khramtsov) SVN Revision: 1978	2009-03-09 14:44:46 +00:00
Badlop	a6145084f1	* src/ejabberd_c2s.erl: Enforce privacy rules also for subscription requests (EJAB-300) * src/ejabberd_sm.erl: Likewise SVN Revision: 1976	2009-03-07 08:59:26 +00:00
Badlop	367002f89a	Merge 1856 from trunk. * src/eldap/eldap.erl: moves waiting for response queries to pending queue on an LDAP connection failure (thanks to Evgeniy Khramtsov) SVN Revision: 1974	2009-03-06 11:50:23 +00:00
Badlop	75a8ebf293	Merge 1855 from trunk. * src/eldap/eldap.erl: implemented queue for pending queries (thanks to Evgeniy Khramtsov) SVN Revision: 1973	2009-03-06 11:42:56 +00:00
Badlop	4e17b1463b	Merge 1851 from trunk. * src/eldap/eldap.erl: Close a connection on tcp_error (thanks to Evgeniy Khramtsov) SVN Revision: 1972	2009-03-06 11:39:12 +00:00
Badlop	5c73d160cc	Merge 1682 from trunk. * src/eldap/Makefile.in: added +optimize and +driver compilation options (thanks to Evgeniy Khramtsov) * src/eldap/Makefile.win32: Likewise SVN Revision: 1971	2009-03-06 11:34:27 +00:00
Badlop	ac69fbb24d	* src/ejabberd_app.erl: In a Windows machine, explicitly add the nameservers, as it seems Erlang does not do itself (EJAB-860) * src/win32_dns.erl: Get name servers from Windows registy (thanks to Geoff Cant) SVN Revision: 1968	2009-03-05 20:03:18 +00:00
Badlop	3454f2fe04	* doc/guide.tex: Require OpenSSL 0.9.8f or higher (EJAB-877) * doc/guide.html: Likewise SVN Revision: 1967	2009-03-05 19:48:24 +00:00
Badlop	5374c0b069	* src/ejabberd_auth.erl: If anonymous auth is enabled, when checking if the account already exists in other auth methods, take into account if the auth method failed (EJAB-882) * src/ejabberd_auth_anonymous.erl: Likewise * src/ejabberd_auth_external.erl: Likewise * src/ejabberd_auth_internal.erl: Likewise * src/ejabberd_auth_ldap.erl: Likewise * src/ejabberd_auth_odbc.erl: Likewise * src/ejabberd_auth_pam.erl: Likewise SVN Revision: 1966	2009-03-04 18:34:02 +00:00
Christophe Romain	e4db030f4e	Allow node creation without configure item SVN Revision: 1962	2009-03-04 01:10:44 +00:00
Christophe Romain	abbfa96fc4	backport typo fix from trunk SVN Revision: 1959	2009-03-04 00:01:19 +00:00
Christophe Romain	55942d1f4a	Add roster subscriptions handling and make PEP events sent to all resources SVN Revision: 1957	2009-03-03 22:42:52 +00:00
Badlop	06abf6331b	Merge fix from trunk r1910 * src/web/ejabberd_http.erl: Added a workaround for inet:peername returning 'ebadf' SVN Revision: 1928	2009-02-27 16:19:19 +00:00
Badlop	8be6b8df76	Merge fix from trunk r1190 * src/cyrsasl_digest.erl: Unquote backslash in DIGEST-MD5 quoted strings (EJAB-304) SVN Revision: 1927	2009-02-27 15:57:35 +00:00
Badlop	a1e7e737bf	* src/tls/tls_drv.c: S2S connection with STARTTLS fails to Gtalk and recent Openfire (thanks to Philipp Hancke)(EJAB-877) SVN Revision: 1926	2009-02-27 15:42:27 +00:00
Badlop	fa08801574	* doc/guide.tex: No mention to the release date in ejabberd Guide or release notes. The date of an ejabberd release is determined by the date of the corresponding release announcement. SVN Revision: 1922	2009-02-26 23:10:28 +00:00
Christophe Romain	dcb05c4061	Do not call mod_caps:clear_caps as it breaks PubSub/PEP (EJAB-854) SVN Revision: 1911	2009-02-23 15:51:01 +00:00
Badlop	6ea29663a3	Merge r1880 from trunk: * src/mod_muc/mod_muc_room.erl: Owner of a password protected room must provide the password, like other participants (EJAB-867) SVN Revision: 1906	2009-02-21 09:37:05 +00:00
Badlop	ad48607327	Merge r1879 from trunk: * src/mod_muc/mod_muc_log.erl: Prevent XSS in MUC logs by linkifying only a few known protocols (EJAB-850) SVN Revision: 1905	2009-02-21 09:30:23 +00:00
Badlop	fea7eac245	Merge r1877 from trunk: * src/mod_roster.erl: When account is deleted, cancel presence subscription for all roster items (EJAB-790) * src/mod_roster_odbc.erl: Likewise SVN Revision: 1904	2009-02-21 09:28:58 +00:00
Badlop	b1f3d56beb	Merge r1874 from trunk: * src/mod_shared_roster.erl: Fix bug: a pending subscription request, and later the requester added to the roster due to a shared roster group, that request could neither be accepted or rejected (thanks to Brian Cully)(EJAB-869) SVN Revision: 1903	2009-02-21 09:27:27 +00:00
Badlop	7c6ccbb744	Merge r1864 from trunk: * src/mod_pubsub/mod_pubsub.erl: The table pubsub_node in ejabberd older than 2.0.2 had indexes for parentid and type. This is not required since ejabberd 2.0.2, so those indexes can be deleted. (EJAB-669) SVN Revision: 1902	2009-02-21 09:26:12 +00:00
Badlop	02d7d0aa4c	Merge r1862 from trunk: * doc/Makefile: In Clean do not remove html. In new Distclean, remove also html. SVN Revision: 1901	2009-02-21 09:24:57 +00:00
Badlop	7b10b69031	Merge r1861 from trunk: * doc/Makefile: When cleaning, remove contributed_modules.tex SVN Revision: 1900	2009-02-21 09:23:42 +00:00
Badlop	606b1d1b52	Merge r1858 from trunk: * doc/guide.tex: Provide only an example of language option * doc/guide.html: Likewise SVN Revision: 1899	2009-02-21 09:22:51 +00:00
Badlop	2cd587bec5	Merge r1854 from trunk: * doc/guide.tex: mod_muc can run in several nodes of cluster * doc/guide.html: Likewise SVN Revision: 1898	2009-02-21 09:21:31 +00:00
Badlop	f6ee802960	Merge r1850 from trunk: * src/odbc/mysql.sql: Fix complain about comment syntax * src/odbc/pg.sql: Likewise SVN Revision: 1897	2009-02-21 09:19:56 +00:00
Badlop	e6ecb38ed9	Merge r1836 from trunk: * doc/guide.tex: Explain that account creation is only supported by internal and odbc authentication methods * doc/guide.html: Likewise SVN Revision: 1896	2009-02-21 09:19:11 +00:00
Badlop	cd29a77759	Merge r1822 and partial r1834 from trunk: * src/mod_privacy.erl: Privacy list items must be processed in the specified order (EJAB-848) * src/mod_privacy_odbc.erl: Likewise SVN Revision: 1895	2009-02-21 09:15:43 +00:00
Badlop	677387bc80	Merge r1666 from trunk: * src/ejabberd_c2s.erl: Ensure unique ID in roster push (EJAB-721) * src/mod_roster.erl: Likewise * src/mod_roster_odbc.erl: Likewise * src/mod_shared_roster.erl: Likewise SVN Revision: 1894	2009-02-21 09:12:59 +00:00
Christophe Romain	f362fe93ec	fix nodetree plugin resolver SVN Revision: 1888	2009-02-19 11:24:26 +00:00
Christophe Romain	9b6343faa4	prevent from calling get_vh_registered_users/2 when not available SVN Revision: 1870	2009-02-13 13:30:20 +00:00
Badlop	1b0ea74818	* doc/release_notes_2.0.3.txt: Minor changes SVN Revision: 1818	2009-01-13 18:05:06 +00:00
Mickaël Rémond	d87336e12e	* src/tls/Makefile.win32: Windows compilation support. * src/tls/tls_drv.c: Likewise. * src/tls/stdint.h: Likewise. * doc/guide.tex: Update Erlang version in Windows compilation documentation. SVN Revision: 1817	2009-01-13 16:36:10 +00:00
Badlop	32805c3ba1	* src/msgs/pl.po: Fix typo (thanks to Apag0r)(EJAB-844) SVN Revision: 1814	2009-01-12 23:47:07 +00:00
Badlop	19966a7353	* doc/guide.tex: Update copyright date 2008 to 2009 (EJAB-842) * doc/guide.html: Likewise * src//.erl: Likewise * src//.erl: Remove unneeded blankspaces in license text SVN Revision: 1805	2009-01-12 14:52:59 +00:00
Christophe Romain	be99c4b0eb	prevent unauthorized entity to gain none-affiliation for given entity SVN Revision: 1801	2009-01-11 04:07:39 +00:00
Christophe Romain	da893f4293	fix owners cache and fix unsubscribe permissions (EJAB-840) SVN Revision: 1798	2009-01-11 01:41:22 +00:00
Christophe Romain	6e04bcbbf8	fix unsubscription of full jid subscribed node (EJAB-839) SVN Revision: 1793	2009-01-10 13:35:34 +00:00
Badlop	053f45ab39	* doc/release_notes_2.0.3.txt: New file for new release SVN Revision: 1790	2009-01-09 14:10:14 +00:00
Badlop	3e12700e11	* doc/guide.tex: Improve explanation of backup commands * doc/guide.html: Likewise SVN Revision: 1789	2009-01-09 14:04:56 +00:00
Badlop	048b1a5db3	* src/web/ejabberd_web_admin.erl: New appearance of WebAdmin logo, fixed logo-fill. SVN Revision: 1788	2009-01-09 13:42:15 +00:00
Badlop	012a0529a8	* src/mod_configure.erl: Fix access check for vhost configuration SVN Revision: 1787	2009-01-09 00:39:57 +00:00
Christophe Romain	553b402d03	fix EJAB-701 and EJAB-836 SVN Revision: 1786	2009-01-08 21:53:23 +00:00
Mickaël Rémond	efaf182d54	* src/ejabberd_listener.erl: Define send timeout option to avoid blocking on socket send (EJAB-746). * src/ejabberd_s2s_out.erl: Likewise. SVN Revision: 1785	2009-01-08 21:01:27 +00:00
Badlop	2c5b0fb896	* src/msgs/ru.po: Fix typo (thanks to Dominges) * src/msgs/ru.msg: Likewise SVN Revision: 1776	2009-01-06 15:09:53 +00:00
Alexey Shchepin	04ff0c2f6f	* src/tls/tls_drv.c: Added a flag to avoid certificate validation * src/tls/tls.erl: Likewise * src/ejabberd_c2s.erl: Likewise SVN Revision: 1775	2009-01-05 17:27:30 +00:00
Badlop	b32793efcf	* src/*.erl: Fix EDoc comments SVN Revision: 1772	2009-01-03 21:31:36 +00:00
Christophe Romain	ee02b0b57f	PubSub cleanup, EJAB-827 fix, EJAB-701 partial fix SVN Revision: 1765	2009-01-03 00:23:58 +00:00
Mickaël Rémond	5141edd757	* src/ejabberd_c2s.erl: Remove useless comment and port Alexey fix to 2.0.x branch. SVN Revision: 1764	2008-12-29 12:06:34 +00:00
Mickaël Rémond	c0cc236196	* src/ejabberd_c2s.erl: Add resource to the from packet attribute if missing (EJAB-812). SVN Revision: 1760	2008-12-28 12:23:20 +00:00
Badlop	3a3a89007a	* src/aclocal.m4: Fixes in configure script: fix disable-disable_zlib and disable-pam; in case of problems, PAM verification aborts with error instead of warning. (EJAB-787) * src/configure.ac: Likewise * src/configure: Likewise SVN Revision: 1754	2008-12-24 12:03:13 +00:00
Badlop	919914d8ac	* src/acl.erl: New ACL: shared_group (thanks to Maxim Ryazanov) * doc/guide.tex: Likewise * src/mod_shared_roster.erl: Push new group members when registered or manually added to group: EJAB-730 EJAB-731 EJAB-732 EJAB-767 EJAB-794. When user is added to group, push it to other members, and other members to it. When user is removed from group, push deletion to other members, and other members to it. When user is registered, push him to members of group @all@. When user is deleted, push deletion to members of group @all@. Document several functions in mod_shared_roster. * src/ejabberd_auth.erl: Rename hook user_registered to register_user, for name consistency with the widely used hook remove_user. Run hook register_user in ejabberd_auth, so it's run when account is created with any method. Run hook remove_user in ejabberd_auth, so it's run when account is deleted with any method. * src/ejabberd_auth_internal.erl: Likewise * src/ejabberd_auth_ldap.erl: Likewise * src/ejabberd_auth_odbc.erl: Likewise * src/ejabberd_auth_pam.erl: Likewise * src/mod_register.erl: Likewise SVN Revision: 1753	2008-12-23 19:24:45 +00:00
Christophe Romain	d153b773a3	make caps store only required user_caps_default SVN Revision: 1749	2008-12-23 10:54:25 +00:00
Christophe Romain	252a08e037	Improve handling of PEP sent to external contacts (EJAB-825) SVN Revision: 1746	2008-12-23 10:25:00 +00:00
Badlop	9539a50c33	* src/cyrsasl_digest.erl: Check digest-uri in SASL digest authentication (thanks to Paul Guyot)(EJAB-569) SVN Revision: 1743	2008-12-23 01:02:44 +00:00
Badlop	2bcee1f85d	* src/odbc/odbc_queries.erl: Fix removal of private_storage of an account when the account is removed * src/mod_privacy.erl: Remove privacy lists of an account when the account is removed (EJAB-720) * src/mod_privacy_odbc.erl: Likewise SVN Revision: 1742	2008-12-23 00:48:09 +00:00
Christophe Romain	2890c01979	Fix send_last_published_item issue when running on clustered table (EJAB-793) SVN Revision: 1739	2008-12-19 23:21:26 +00:00
Badlop	cd1eddde1a	* src/mod_pubsub/mod_pubsub.erl: Fix update pubsub tables from ejabberd 1.x to 2.x (EJAB-817) SVN Revision: 1734	2008-12-16 17:44:48 +00:00
Badlop	a61b838ad9	* doc/guide.tex: Fix capitalization of some section titles * doc/guide.tex: Mention as optional Requirements: mysql, pgsql and pam * src/ejabberd_ctl.erl: Command reopen-log must also rotate sasl.log (thanks to Alexander Tsvyashchenko)(EJAB-711) * src/ejabberd_logger_h.erl: Export the function rotate_log/1 * doc/guide.tex: Improve explanation of log files rotation * doc/guide.tex: Improve explanation of watchdog admins option: only useful for developers (EJAB-816) * src/ejabberd.cfg.example: Likewise * doc/guide.tex: Say 'higher' instead of 'newer' in requirements * README: Likewise * doc/guide.tex: Simplify example mod_muc configuration SVN Revision: 1733	2008-12-16 17:39:05 +00:00
Christophe Romain	bba71d464e	remove pubsub_state record when unsubscribing node without affiliation (EJAB-776) SVN Revision: 1718	2008-12-08 21:49:40 +00:00
Christophe Romain	6f71558e18	typo fix SVN Revision: 1714	2008-12-08 19:47:23 +00:00
Christophe Romain	feb0bceb41	ignore unknown configuration fields (EJAB-762); fix node authorization bug (EJAB-798) SVN Revision: 1713	2008-12-08 19:38:59 +00:00
Christophe Romain	6349ff898f	Reduce memory consumption due to caps handling SVN Revision: 1711	2008-12-08 14:08:58 +00:00
Mickaël Rémond	197246bad8	* src/ejabberd_c2s.erl: Enforce client stanza from attribute (EJAB-812). * src/jlib.erl: Likewise. SVN Revision: 1707	2008-12-08 09:31:40 +00:00
Badlop	cc9990fcaa	Fix default value of default_room_options (thanks to Aleksey Shchepin) SVN Revision: 1702	2008-12-03 15:06:21 +00:00
Badlop	bd553be6cd	* doc/guide.tex: New subsection Database Connection * doc/guide.html: Likewise SVN Revision: 1697	2008-12-01 17:45:01 +00:00
Christophe Romain	84bc6844b9	Don't create a SSL context on every connection and disable SSLv2 on outgoing connections (EJAB-781) SVN Revision: 1694	2008-12-01 15:29:59 +00:00
Christophe Romain	efb6615cfd	Hibernate ejabberd_receiver and ejabberd_frontend_socket processes after timeout SVN Revision: 1693	2008-12-01 15:16:40 +00:00
Badlop	db8eeb78e5	Remove debug line from SVN r1685 SVN Revision: 1689	2008-11-28 19:51:30 +00:00
Badlop	693e32aecf	* src/mod_irc/mod_irc.erl: Announce disco#info (thanks to Spike) * src/mod_muc/mod_muc.erl: Announce disco#info disco#items * src/mod_proxy65/mod_proxy65_service.erl: No announce disco#items * src/mod_pubsub/mod_pubsub.erl: Announce disco#info disco#items * src/mod_vcard.erl: Announce disco#info SVN Revision: 1686	2008-11-26 16:04:27 +00:00
Badlop	34d93528ae	* src/gen_mod.erl: First store module options in ETS and Mnesia, then start the module. In case of failure, remove options from ETS. Until now the module was started before the options were stored in database, and some modules started incorrectly because they couldn't access the options from database; for instance mod_muc_room required this for reading max_users option. * src/mod_muc/mod_muc_room.erl: Include the value of max_users service option and the current max_users room option in the list of allowed room limit values. SVN Revision: 1685	2008-11-26 15:10:38 +00:00
Christophe Romain	8ef0fe6b56	pubsub/pep: get_node_affiliations resultset bugfix SVN Revision: 1683	2008-11-25 23:04:22 +00:00
Badlop	ba258b0a3e	* doc/guide.tex: Improve legibility of mod_irc example config SVN Revision: 1677	2008-11-12 00:21:47 +00:00
Mickaël Rémond	3dd58372fe	* src/ejabberd_s2s_out.erl: exports the DNS resolution function. SVN Revision: 1674	2008-11-08 17:50:54 +00:00
Badlop	2042a7ab27	* src/ejabberd_app.erl: Open ejabberd.log before parsing ejabberd.cfg and translation files (EJAB-777) SVN Revision: 1670	2008-10-27 10:56:46 +00:00
Christophe Romain	26cf780476	does not write item when max_items set to 0 (solves EJAB-768) SVN Revision: 1660	2008-10-17 00:42:20 +00:00
Christophe Romain	a2b8263a20	fix remove_user not unsubscribing user (EJAB-684) SVN Revision: 1658	2008-10-16 23:07:06 +00:00
Christophe Romain	e950adc0ef	fix badarg issue on get_roster_info when allowed roster groups is not defined SVN Revision: 1657	2008-10-16 22:14:04 +00:00
Jérôme Sautret	184251b162	* src/odbc/ejabberd_odbc.erl: log MySQL driver messages (merge 1652 from trunk). SVN Revision: 1653	2008-10-13 15:29:05 +00:00
Jérôme Sautret	1effe2be49	Merge commit 1612 from trunk: * src/mod_roster_odbc.erl: fix MySQL multiple requests issue. SVN Revision: 1613	2008-10-07 12:34:23 +00:00
Badlop	8a12914fd6	* doc/guide.html: Regenerated * doc/guide.tex: Fix a problem in SVN merge from trunk SVN Revision: 1605	2008-10-06 15:01:06 +00:00
Jérôme Sautret	a4ee23edfe	Merge from trunk r1600: * src/ejabberd_rdbms.erl: fix SQL database reconnection issues (EJAB-764) and add odbc_start_interval configuration directive (default to 30 seconds). * src/odbc/ejabberd_odbc.erl: likewise. * src/odbc/ejabberd_odbc_sup.erl: likewise. * doc/guide.tex: likewise. SVN Revision: 1601	2008-10-06 14:27:48 +00:00
Jérôme Sautret	7224ec8cb4	* src/odbc/odbc_queries.erl: Fix syntax error on update_roster_sql query. SVN Revision: 1599	2008-10-03 15:49:24 +00:00
Jérôme Sautret	096825fc55	* src/odbc/odbc_queries.erl: Fix empty query that fails on MySQL (merged from trunk). SVN Revision: 1598	2008-10-03 15:47:30 +00:00
Mickaël Rémond	c9aef303a2	* src/mod_shared_roster.erl: Correct roster push when changing a shared roster entry name (EJAB-738). SVN Revision: 1590	2008-10-01 14:52:25 +00:00
Badlop	3ced58c239	* src/*/Makefile.win32: Provide explicit beam filenames because nmake does not accept wildcards (thanks to Attila Vangel)(EJAB-543) SVN Revision: 1588	2008-09-30 16:12:05 +00:00
Badlop	404c2dc0e5	* contrib/ejabberd-modules.repo: Include 2.0.x branches SVN Revision: 1586	2008-09-29 15:16:45 +00:00
Mickaël Rémond	2a0823f423	* src/mod_configure.erl: Fix adhoc commands reply types for "get-online-users-num" and "get-registered-users-num" (EJAB-756). SVN Revision: 1569	2008-09-22 16:08:37 +00:00
Badlop	995941b593	* doc/guide.tex: Fix explanation of mod_muc's anonymous option. Make clear that an ejabberd_service can only serve a single external component. Provide Mnesia directory when setting clustering (thanks to Matthew Reilly) SVN Revision: 1563	2008-09-15 18:38:52 +00:00
Badlop	2493bb99d4	* doc/guide.tex: Fix mod_proxy configuration example * doc/guide.html: Likewise SVN Revision: 1560	2008-09-02 17:31:10 +00:00
Badlop	e0fdf9a4e9	Fix release date of ejabberd 2.0.2 to 28 August 2008 SVN Revision: 1557	2008-08-30 11:17:03 +00:00