Merge lp:~benlangfeld/ubuntu/precise/ejabberd/2.1.13 into lp:ubuntu/precise/ejabberd

[Ben Langfeld]

Update to ejabberd 2.1.13

This is my very first attempt at packaging for Debian/Ubuntu, so if I'm doing something wrong, please accept my apologies and be gentle in your criticism.

This upgrades ejabberd to 2.1.13, the latest 2.1.x release. I require at least 2.1.12 so that I can use mod_muc_admin successfully; 2.1.11 contains changes related to ODBC which are not API compatible with 2.1.10, and API compatibility was restored in 2.1.12.

[lp:~benlangfeld/ubuntu/precise/ejabberd/2.1.13]

39. By Ben Langfeld on 2014-07-01

Second attempt at package upload, this time including original source tarball

40. By Ben Langfeld on 2014-07-01

Changelog formatting

41. By Ben Langfeld on 2014-07-02

Update git repo

42. By Ben Langfeld on 2014-07-02

Update git repo

43. By Ben Langfeld on 2014-07-10

Patch for LDAP filter breakage

44. By Ben Langfeld on 2014-07-10

Include patch

Unmerged revisions

44. By Ben Langfeld on 2014-07-10

Include patch

43. By Ben Langfeld on 2014-07-10

Patch for LDAP filter breakage

42. By Ben Langfeld on 2014-07-02

Update git repo

41. By Ben Langfeld on 2014-07-02

Update git repo

40. By Ben Langfeld on 2014-07-01

Changelog formatting

39. By Ben Langfeld on 2014-07-01

Second attempt at package upload, this time including original source tarball

38. By Ben Langfeld on 2014-07-01

Should use my own namespace for package version

37. By Ben Langfeld on 2014-07-01

Ubuntu release of Debian's 2.1.13-1

36. By Ben Langfeld on 2014-07-01

Revert unintentional modifications from 33

35. By Ben Langfeld on 2014-07-01

declare package source format as 3.0 (quilt)

=== added directory '.git'
=== added file '.git/FETCH_HEAD'
--- .git/FETCH_HEAD	1970-01-01 00:00:00 +0000
+++ .git/FETCH_HEAD	2014-07-10 22:50:00 +0000
@@ -0,0 +1,3 @@
+260f43840924bf203bf210b8863de38153a33038		branch 'master' of github.com:benlangfeld/debian-ejabberd
+f0b36b45a6a70e673fca841dff5c5af0d7f33d04	not-for-merge	branch 'upstream' of github.com:benlangfeld/debian-ejabberd
+305e14c0ec9f2391b1b7149e5629c535d066368b	not-for-merge	branch 'wheezy' of github.com:benlangfeld/debian-ejabberd

=== added file '.git/HEAD'
--- .git/HEAD	1970-01-01 00:00:00 +0000
+++ .git/HEAD	2014-07-10 22:50:00 +0000
@@ -0,0 +1,1 @@
+ref: refs/heads/master

=== added file '.git/config'
--- .git/config	1970-01-01 00:00:00 +0000
+++ .git/config	2014-07-10 22:50:00 +0000
@@ -0,0 +1,13 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+	ignorecase = true
+	precomposeunicode = true
+[remote "origin"]
+	url = [e-mail]:benlangfeld/debian-ejabberd.git
+	fetch = +refs/heads/*:refs/remotes/origin/*
+[branch "master"]
+	remote = origin
+	merge = refs/heads/master

=== added file '.git/description'
--- .git/description	1970-01-01 00:00:00 +0000
+++ .git/description	2014-07-10 22:50:00 +0000
@@ -0,0 +1,1 @@
+Unnamed repository; edit this file 'description' to name the repository.

=== added directory '.git/hooks'
=== added file '.git/hooks/applypatch-msg.sample'
--- .git/hooks/applypatch-msg.sample	1970-01-01 00:00:00 +0000
+++ .git/hooks/applypatch-msg.sample	2014-07-10 22:50:00 +0000
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message taken by
+# applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.  The hook is
+# allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "applypatch-msg".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/commit-msg" &&
+	exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
+:

=== added file '.git/hooks/commit-msg.sample'
--- .git/hooks/commit-msg.sample	1970-01-01 00:00:00 +0000
+++ .git/hooks/commit-msg.sample	2014-07-10 22:50:00 +0000
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message.
+# Called by "git commit" with one argument, the name of the file
+# that has the commit message.  The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit.  The hook is allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "commit-msg".
+
+# Uncomment the below to add a Signed-off-by line to the message.
+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
+# hook is more suited to it.
+#
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
+# This example catches duplicate Signed-off-by lines.
+
+test "" = "$(grep '^Signed-off-by: ' "$1" |
+	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
+	echo >&2 Duplicate Signed-off-by lines.
+	exit 1
+}

=== added file '.git/hooks/post-update.sample'
--- .git/hooks/post-update.sample	1970-01-01 00:00:00 +0000
+++ .git/hooks/post-update.sample	2014-07-10 22:50:00 +0000
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# An example hook script to prepare a packed repository for use over
+# dumb transports.
+#
+# To enable this hook, rename this file to "post-update".
+
+exec git update-server-info

=== added file '.git/hooks/pre-applypatch.sample'
--- .git/hooks/pre-applypatch.sample	1970-01-01 00:00:00 +0000
+++ .git/hooks/pre-applypatch.sample	2014-07-10 22:50:00 +0000
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed
+# by applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-applypatch".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/pre-commit" &&
+	exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
+:

=== added file '.git/hooks/pre-commit.sample'
--- .git/hooks/pre-commit.sample	1970-01-01 00:00:00 +0000
+++ .git/hooks/pre-commit.sample	2014-07-10 22:50:00 +0000
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git commit" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message if
+# it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-commit".
+
+if git rev-parse --verify HEAD >/dev/null 2>&1
+then
+	against=HEAD
+else
+	# Initial commit: diff against an empty tree object
+	against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
+fi
+
+# If you want to allow non-ASCII filenames set this variable to true.
+allownonascii=$(git config --bool hooks.allownonascii)
+
+# Redirect output to stderr.
+exec 1>&2
+
+# Cross platform projects tend to avoid non-ASCII filenames; prevent
+# them from being added to the repository. We exploit the fact that the
+# printable range starts at the space character and ends with tilde.
+if [ "$allownonascii" != "true" ] &&
+	# Note that the use of brackets around a tr range is ok here, (it's
+	# even required, for portability to Solaris 10's /usr/bin/tr), since
+	# the square bracket bytes happen to fall in the designated range.
+	test $(git diff --cached --name-only --diff-filter=A -z $against |
+	  LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
+then
+	cat <<\EOF
+Error: Attempt to add a non-ASCII file name.
+
+This can cause problems if you want to work with people on other platforms.
+
+To be portable it is advisable to rename the file.
+
+If you know what you are doing you can disable this check using:
+
+  git config hooks.allownonascii true
+EOF
+	exit 1
+fi
+
+# If there are whitespace errors, print the offending file names and fail.
+exec git diff-index --check --cached $against --

=== added file '.git/hooks/pre-push.sample'
--- .git/hooks/pre-push.sample	1970-01-01 00:00:00 +0000
+++ .git/hooks/pre-push.sample	2014-07-10 22:50:00 +0000
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+# An example hook script to verify what is about to be pushed.  Called by "git
+# push" after it has checked the remote status, but before anything has been
+# pushed.  If this script exits with a non-zero status nothing will be pushed.
+#
+# This hook is called with the following parameters:
+#
+# $1 -- Name of the remote to which the push is being done
+# $2 -- URL to which the push is being done
+#
+# If pushing without using a named remote those arguments will be equal.
+#
+# Information about the commits which are being pushed is supplied as lines to
+# the standard input in the form:
+#
+#   <local ref> <local sha1> <remote ref> <remote sha1>
+#
+# This sample shows how to prevent push of commits where the log message starts
+# with "WIP" (work in progress).
+
+remote="$1"
+url="$2"
+
+z40=0000000000000000000000000000000000000000
+
+IFS=' '
+while read local_ref local_sha remote_ref remote_sha
+do
+	if [ "$local_sha" = $z40 ]
+	then
+		# Handle delete
+		:
+	else
+		if [ "$remote_sha" = $z40 ]
+		then
+			# New branch, examine all commits
+			range="$local_sha"
+		else
+			# Update to existing branch, examine new commits
+			range="$remote_sha..$local_sha"
+		fi
+
+		# Check for WIP commit
+		commit=`git rev-list -n 1 --grep '^WIP' "$range"`
+		if [ -n "$commit" ]
+		then
+			echo "Found WIP commit in $local_ref, not pushing"
+			exit 1
+		fi
+	fi
+done
+
+exit 0

=== added file '.git/hooks/pre-rebase.sample'
--- .git/hooks/pre-rebase.sample	1970-01-01 00:00:00 +0000
+++ .git/hooks/pre-rebase.sample	2014-07-10 22:50:00 +0000
@@ -0,0 +1,169 @@
+#!/bin/sh
+#
+# Copyright (c) 2006, 2008 Junio C Hamano
+#
+# The "pre-rebase" hook is run just before "git rebase" starts doing
+# its job, and can prevent the command from running by exiting with
+# non-zero status.
+#
+# The hook is called with the following parameters:
+#
+# $1 -- the upstream the series was forked from.
+# $2 -- the branch being rebased (or empty when rebasing the current branch).
+#
+# This sample shows how to prevent topic branches that are already
+# merged to 'next' branch from getting rebased, because allowing it
+# would result in rebasing already published history.
+
+publish=next
+basebranch="$1"
+if test "$#" = 2
+then
+	topic="refs/heads/$2"
+else
+	topic=`git symbolic-ref HEAD` ||
+	exit 0 ;# we do not interrupt rebasing detached HEAD
+fi
+
+case "$topic" in
+refs/heads/??/*)
+	;;
+*)
+	exit 0 ;# we do not interrupt others.
+	;;
+esac
+
+# Now we are dealing with a topic branch being rebased
+# on top of master.  Is it OK to rebase it?
+
+# Does the topic really exist?
+git show-ref -q "$topic" || {
+	echo >&2 "No such branch $topic"
+	exit 1
+}
+
+# Is topic fully merged to master?
+not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
+if test -z "$not_in_master"
+then
+	echo >&2 "$topic is fully merged to master; better remove it."
+	exit 1 ;# we could allow it, but there is no point.
+fi
+
+# Is topic ever merged to next?  If so you should not be rebasing it.
+only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
+only_next_2=`git rev-list ^master           ${publish} | sort`
+if test "$only_next_1" = "$only_next_2"
+then
+	not_in_topic=`git rev-list "^$topic" master`
+	if test -z "$not_in_topic"
+	then
+		echo >&2 "$topic is already up-to-date with master"
+		exit 1 ;# we could allow it, but there is no point.
+	else
+		exit 0
+	fi
+else
+	not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
+	/usr/bin/perl -e '
+		my $topic = $ARGV[0];
+		my $msg = "* $topic has commits already merged to public branch:\n";
+		my (%not_in_next) = map {
+			/^([0-9a-f]+) /;
+			($1 => 1);
+		} split(/\n/, $ARGV[1]);
+		for my $elem (map {
+				/^([0-9a-f]+) (.*)$/;
+				[$1 => $2];
+			} split(/\n/, $ARGV[2])) {
+			if (!exists $not_in_next{$elem->[0]}) {
+				if ($msg) {
+					print STDERR $msg;
+					undef $msg;
+				}
+				print STDERR " $elem->[1]\n";
+			}
+		}
+	' "$topic" "$not_in_next" "$not_in_master"
+	exit 1
+fi
+
+exit 0
+
+################################################################
+
+This sample hook safeguards topic branches that have been
+published from being rewound.
+
+The workflow assumed here is:
+
+ * Once a topic branch forks from "master", "master" is never
+   merged into it again (either directly or indirectly).
+
+ * Once a topic branch is fully cooked and merged into "master",
+   it is deleted.  If you need to build on top of it to correct
+   earlier mistakes, a new topic branch is created by forking at
+   the tip of the "master".  This is not strictly necessary, but
+   it makes it easier to keep your history simple.
+
+ * Whenever you need to test or publish your changes to topic
+   branches, merge them into "next" branch.
+
+The script, being an example, hardcodes the publish branch name
+to be "next", but it is trivial to make it configurable via
+$GIT_DIR/config mechanism.
+
+With this workflow, you would want to know:
+
+(1) ... if a topic branch has ever been merged to "next".  Young
+    topic branches can have stupid mistakes you would rather
+    clean up before publishing, and things that have not been
+    merged into other branches can be easily rebased without
+    affecting other people.  But once it is published, you would
+    not want to rewind it.
+
+(2) ... if a topic branch has been fully merged to "master".
+    Then you can delete it.  More importantly, you should not
+    build on top of it -- other people may already want to
+    change things related to the topic as patches against your
+    "master", so if you need further changes, it is better to
+    fork the topic (perhaps with the same name) afresh from the
+    tip of "master".
+
+Let's look at this example:
+
+		   o---o---o---o---o---o---o---o---o---o "next"
+		  /       /           /           /
+		 /   a---a---b A     /           /
+		/   /               /           /
+	       /   /   c---c---c---c B         /
+	      /   /   /             \         /
+	     /   /   /   b---b C     \       /
+	    /   /   /   /             \     /
+    ---o---o---o---o---o---o---o---o---o---o---o "master"
+
+
+A, B and C are topic branches.
+
+ * A has one fix since it was merged up to "next".
+
+ * B has finished.  It has been fully merged up to "master" and "next",
+   and is ready to be deleted.
+
+ * C has not merged to "next" at all.
+
+We would want to allow C to be rebased, refuse A, and encourage
+B to be deleted.
+
+To compute (1):
+
+	git rev-list ^master ^topic next
+	git rev-list ^master        next
+
+	if these match, topic has not merged in next at all.
+
+To compute (2):
+
+	git rev-list master..topic
+
+	if this is empty, it is fully merged to "master".

=== added file '.git/hooks/prepare-commit-msg.sample'
--- .git/hooks/prepare-commit-msg.sample	1970-01-01 00:00:00 +0000
+++ .git/hooks/prepare-commit-msg.sample	2014-07-10 22:50:00 +0000
@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# An example hook script to prepare the commit log message.
+# Called by "git commit" with the name of the file that has the
+# commit message, followed by the description of the commit
+# message's source.  The hook's purpose is to edit the commit
+# message file.  If the hook fails with a non-zero status,
+# the commit is aborted.
+#
+# To enable this hook, rename this file to "prepare-commit-msg".
+
+# This hook includes three examples.  The first comments out the
+# "Conflicts:" part of a merge commit.
+#
+# The second includes the output of "git diff --name-status -r"
+# into the message, just before the "git status" output.  It is
+# commented because it doesn't cope with --amend or with squashed
+# commits.
+#
+# The third example adds a Signed-off-by line to the message, that can
+# still be edited.  This is rarely a good idea.
+
+case "$2,$3" in
+  merge,)
+    /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
+
+# ,|template,)
+#   /usr/bin/perl -i.bak -pe '
+#      print "\n" . `git diff --cached --name-status -r`
+#	 if /^#/ && $first++ == 0' "$1" ;;
+
+  *) ;;
+esac
+
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"

=== added file '.git/hooks/update.sample'
--- .git/hooks/update.sample	1970-01-01 00:00:00 +0000
+++ .git/hooks/update.sample	2014-07-10 22:50:00 +0000
@@ -0,0 +1,128 @@
+#!/bin/sh
+#
+# An example hook script to blocks unannotated tags from entering.
+# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
+#
+# To enable this hook, rename this file to "update".
+#
+# Config
+# ------
+# hooks.allowunannotated
+#   This boolean sets whether unannotated tags will be allowed into the
+#   repository.  By default they won't be.
+# hooks.allowdeletetag
+#   This boolean sets whether deleting tags will be allowed in the
+#   repository.  By default they won't be.
+# hooks.allowmodifytag
+#   This boolean sets whether a tag may be modified after creation. By default
+#   it won't be.
+# hooks.allowdeletebranch
+#   This boolean sets whether deleting branches will be allowed in the
+#   repository.  By default they won't be.
+# hooks.denycreatebranch
+#   This boolean sets whether remotely creating branches will be denied
+#   in the repository.  By default this is allowed.
+#
+
+# --- Command line
+refname="$1"
+oldrev="$2"
+newrev="$3"
+
+# --- Safety check
+if [ -z "$GIT_DIR" ]; then
+	echo "Don't run this script from the command line." >&2
+	echo " (if you want, you could supply GIT_DIR then run" >&2
+	echo "  $0 <ref> <oldrev> <newrev>)" >&2
+	exit 1
+fi
+
+if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
+	echo "usage: $0 <ref> <oldrev> <newrev>" >&2
+	exit 1
+fi
+
+# --- Config
+allowunannotated=$(git config --bool hooks.allowunannotated)
+allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
+denycreatebranch=$(git config --bool hooks.denycreatebranch)
+allowdeletetag=$(git config --bool hooks.allowdeletetag)
+allowmodifytag=$(git config --bool hooks.allowmodifytag)
+
+# check for no description
+projectdesc=$(sed -e '1q' "$GIT_DIR/description")
+case "$projectdesc" in
+"Unnamed repository"* | "")
+	echo "*** Project description file hasn't been set" >&2
+	exit 1
+	;;
+esac
+
+# --- Check types
+# if $newrev is 0000...0000, it's a commit to delete a ref.
+zero="0000000000000000000000000000000000000000"
+if [ "$newrev" = "$zero" ]; then
+	newrev_type=delete
+else
+	newrev_type=$(git cat-file -t $newrev)
+fi
+
+case "$refname","$newrev_type" in
+	refs/tags/*,commit)
+		# un-annotated tag
+		short_refname=${refname##refs/tags/}
+		if [ "$allowunannotated" != "true" ]; then
+			echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
+			echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,delete)
+		# delete tag
+		if [ "$allowdeletetag" != "true" ]; then
+			echo "*** Deleting a tag is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,tag)
+		# annotated tag
+		if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
+		then
+			echo "*** Tag '$refname' already exists." >&2
+			echo "*** Modifying a tag is not allowed in this repository." >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,commit)
+		# branch
+		if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
+			echo "*** Creating a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,delete)
+		# delete branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/remotes/*,commit)
+		# tracking branch
+		;;
+	refs/remotes/*,delete)
+		# delete tracking branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a tracking branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	*)
+		# Anything else (is there anything else?)
+		echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
+		exit 1
+		;;
+esac
+
+# --- Finished
+exit 0

=== added file '.git/index'
Binary files .git/index	1970-01-01 00:00:00 +0000 and .git/index	2014-07-10 22:50:00 +0000 differ
=== added directory '.git/info'
=== added file '.git/info/exclude'
--- .git/info/exclude	1970-01-01 00:00:00 +0000
+++ .git/info/exclude	2014-07-10 22:50:00 +0000
@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~

=== added directory '.git/logs'
=== added file '.git/logs/HEAD'
--- .git/logs/HEAD	1970-01-01 00:00:00 +0000
+++ .git/logs/HEAD	2014-07-10 22:50:00 +0000
@@ -0,0 +1,1 @@
+0000000000000000000000000000000000000000 260f43840924bf203bf210b8863de38153a33038 Ben Langfeld <[e-mail]> 1404260569 -0300	clone: from [e-mail]:benlangfeld/debian-ejabberd.git

=== added directory '.git/logs/refs'
=== added directory '.git/logs/refs/heads'
=== added file '.git/logs/refs/heads/master'
--- .git/logs/refs/heads/master	1970-01-01 00:00:00 +0000
+++ .git/logs/refs/heads/master	2014-07-10 22:50:00 +0000
@@ -0,0 +1,1 @@
+0000000000000000000000000000000000000000 260f43840924bf203bf210b8863de38153a33038 Ben Langfeld <[e-mail]> 1404260569 -0300	clone: from [e-mail]:benlangfeld/debian-ejabberd.git

=== added directory '.git/logs/refs/remotes'
=== added directory '.git/logs/refs/remotes/origin'
=== added file '.git/logs/refs/remotes/origin/HEAD'
--- .git/logs/refs/remotes/origin/HEAD	1970-01-01 00:00:00 +0000
+++ .git/logs/refs/remotes/origin/HEAD	2014-07-10 22:50:00 +0000
@@ -0,0 +1,1 @@
+0000000000000000000000000000000000000000 260f43840924bf203bf210b8863de38153a33038 Ben Langfeld <[e-mail]> 1404260569 -0300	clone: from [e-mail]:benlangfeld/debian-ejabberd.git

=== added directory '.git/objects'
=== added directory '.git/objects/info'
=== added directory '.git/objects/pack'
=== added file '.git/objects/pack/pack-44a21b0ac5bd1f713aa94df9f0d7c4c59c3d81ea.idx'
Binary files .git/objects/pack/pack-44a21b0ac5bd1f713aa94df9f0d7c4c59c3d81ea.idx	1970-01-01 00:00:00 +0000 and .git/objects/pack/pack-44a21b0ac5bd1f713aa94df9f0d7c4c59c3d81ea.idx	2014-07-10 22:50:00 +0000 differ
=== added file '.git/objects/pack/pack-44a21b0ac5bd1f713aa94df9f0d7c4c59c3d81ea.pack'
Binary files .git/objects/pack/pack-44a21b0ac5bd1f713aa94df9f0d7c4c59c3d81ea.pack	1970-01-01 00:00:00 +0000 and .git/objects/pack/pack-44a21b0ac5bd1f713aa94df9f0d7c4c59c3d81ea.pack	2014-07-10 22:50:00 +0000 differ
=== added file '.git/packed-refs'
--- .git/packed-refs	1970-01-01 00:00:00 +0000
+++ .git/packed-refs	2014-07-10 22:50:00 +0000
@@ -0,0 +1,141 @@
+# pack-refs with: peeled fully-peeled 
+260f43840924bf203bf210b8863de38153a33038 refs/remotes/origin/master
+f0b36b45a6a70e673fca841dff5c5af0d7f33d04 refs/remotes/origin/upstream
+305e14c0ec9f2391b1b7149e5629c535d066368b refs/remotes/origin/wheezy
+2f15f9fd0f5f9925e524dfc31645844a32ebb0c1 refs/tags/debian/1.0.0-2
+d8b7809515a902c25d0f743ca2f0ec8110e607e4 refs/tags/debian/1.1.1-1
+55235538210388605f4a7a7efc8d6f512ee35b05 refs/tags/debian/1.1.1-2
+c17535e1352de6070b768810c588e336b12998c7 refs/tags/debian/1.1.1-3
+751e1c30dfcd01f9098bf2f993340826fde9873f refs/tags/debian/1.1.1-4
+ffccca32bf6ddb4b49af50931d39dfc66e0af7b7 refs/tags/debian/1.1.1-5
+8de40fb22edcebe58c67f6c5a983425f592cfca4 refs/tags/debian/1.1.1-6
+4e98eeada4486a94ae6adec5c18235a6febf967a refs/tags/debian/1.1.1-7
+9a390b0c7d3000dc7e9421d89792718ec119bc57 refs/tags/debian/1.1.1-8
+73dc1f8ee9f9b330b59c3d15f023c2b09f9b9b41 refs/tags/debian/1.1.1-9
+c3c8f9fd5722f22cc8e4fa63eec0d04ba19da82c refs/tags/debian/1.1.2-1
+747b00eb0ee4a424ae8cc477548bd0626ac58244 refs/tags/debian/1.1.2-10
+f4f2d3d76afa7257c06b61c667b8ad58556abd57 refs/tags/debian/1.1.2-2
+202e941d2c561a0902b7bab872f0dbfe321ab35e refs/tags/debian/1.1.2-3
+062575f49c900530085aea00daec13d77bb3e5a7 refs/tags/debian/1.1.2-4
+d437b8d4dd377442b16a5511aa5a8469b3a1e0d8 refs/tags/debian/1.1.2-5
+ed61e0abcfe955105ad4ae909152226efc6b1564 refs/tags/debian/1.1.2-6
+a608028575802c6bf007aca188ca66a2fd3752f8 refs/tags/debian/1.1.2-7
+66fdfe6e4d17007e1ada6817d5868d4fcf2cd771 refs/tags/debian/1.1.2-8
+f8b1088d2287effbcb4ea9df9b94beace2541204 refs/tags/debian/1.1.2-9
+acfeb1d41313f7437a5ceba3cf5d8d11daf8feca refs/tags/debian/1.1.4-1
+acacbd748c8ab861f98530a4c934c3014985016b refs/tags/debian/1.1.4-2
+e0dd8127b9307f70795084d98931c50b86b2d01e refs/tags/debian/1.1.4-3
+24fe08d31026449affed57531c5546d036a54b43 refs/tags/debian/1.1.4-4
+a09d0ea2465c089a03130b56d480b52672abc16f refs/tags/debian/1.1.4-5
+f00e1b9d3ae423b686def64fcef3a1e8dadbdd6c refs/tags/debian/1.1.4-6
+b2a9c548cd5a5c799f106f1fca961c5e7ccea14c refs/tags/debian/1.1.4-7
+2e539f3a0bded5e43ee96838e8e93e3a641e7c79 refs/tags/debian/2.0.0-1
+8f8bb8317580e87d76754f6933a6f69738538460 refs/tags/debian/2.0.0-2
+3611642f5b4e7fe51fae165a0e2a060d481ded19 refs/tags/debian/2.0.0-3
+93299f29ec992955cb01fa751eb680b536b426f6 refs/tags/debian/2.0.0-4
+a449f71764ebfb29dbcd79876ea918e51aa8d150 refs/tags/debian/2.0.0-5
+3442fb972813b05eac11a7c799142aec98cc5c83 refs/tags/debian/2.0.0-6
+49e1d980d2398bfa91d30f1caca9a70bc48ed794 refs/tags/debian/2.0.0-7
+726d40c4eeb68cfdb1e6bfb895a2bb692ba61352 refs/tags/debian/2.0.1-1
+7c82e86d1c65a4639cb998b104e596c4a7a12d8c refs/tags/debian/2.0.1-2
+43f1b4aab532d684f0b3a097b3d7711e62309b68 refs/tags/debian/2.0.1-3
+999fd1804f479d513f29bcff90e47c7cddc89a3d refs/tags/debian/2.0.1-4
[phone]fa25d7916b80369c4f20d862d refs/tags/debian/2.0.1-5
+142a59ee7a8df8ca3bd111fe6f24ee69ca788292 refs/tags/debian/2.0.1-6
+34e1c538dbc240b694a0f9b64def89fb27b2f4ec refs/tags/debian/2.0.1-6+lenny1
+892f73dec04b272d4c7fbc4c42dc91c7380262d9 refs/tags/debian/2.0.2-1
+72ed7070c81f7ea52046cd5c95e3c58465af802d refs/tags/debian/2.0.2-2
+bb13c3f7af9b95c46e8a4bd0192677ea63cecbda refs/tags/debian/2.0.2-3
+2c81f5ff5061784676beadf224485504968ee491 refs/tags/debian/2.0.3-1
+2898b5cc3618d15278522eb05f4266484619b0c5 refs/tags/debian/2.0.3-2
+42bf12c0d413a4ace59ee9383eb2411951f288a4 refs/tags/debian/2.0.5-1
+f4828b4140dc6dc909857790c57c1bfe6eeb1994 refs/tags/debian/2.0.5-1.1
+2e93ea40ba3ce5ad891ddb8410e22ba477fbc9cc refs/tags/debian/2.0.5-1_bpo50+1
+7c6d622ccde29796cdc18f012666e65b032e3f48 refs/tags/debian/2.1.0-2
+20d532d5af21e53af5864f2af2689be895e7d3a9 refs/tags/debian/2.1.1-1
+dd0ce4d725c16ce8b6ed558a5314da3ded6206f1 refs/tags/debian/2.1.10-1
+^c352294f1784ba02dc2822a388c5c7cb7e78231d
+b12a995bffa88658a867e681deb2f937d985f6cd refs/tags/debian/2.1.10-2
+^6073d6b63fef7497722c7f97a5d5325490e8b7d0
+98a24504d09646aa544d23324b87ac907a51c888 refs/tags/debian/2.1.10-3
+^0ea99c66cdaba71358752a3a211d27137df52bdf
+eda805df3b81bbf8b53b4694106c444fed44484c refs/tags/debian/2.1.10-4
+^dbe8f65123c4c5166405a3d24dd84f7c96c99c37
+daab52b0d0cc3d5b535eac10dcbf73483c2d7652 refs/tags/debian/2.1.10-4+deb7u1
+^305e14c0ec9f2391b1b7149e5629c535d066368b
+f6a0e318c8372d001fcb79a96d0fce2fa42266ab refs/tags/debian/2.1.10-5
+^01237e5cfd4d5b5be8d4e852f32b54ad9348ea37
+3673e7ae5fc9a232b42820ddac5f3866c02204a2 refs/tags/debian/2.1.2-1
+e5c0ff266d074e2ec4a30241d650bbe8f00bf5fe refs/tags/debian/2.1.2-2
+ddb509dbdfc4b07c3f5d3cf725faae778aa066c6 refs/tags/debian/2.1.2-3
+6233e5c4f1b591c7bb97462b4cf5e2f36225c589 refs/tags/debian/2.1.3-1
+^cd0bec699b118959650034f9b4c71eee787146b0
+b6c7385bec8453eeafe10317eb4dadfd3f085ac3 refs/tags/debian/2.1.3-2
+^52cd0f7f22d9438303489ec27090a58e95477200
+e8316e28851fd56b5f8c612f6e681a92d13a9c7f refs/tags/debian/2.1.4-1
+^4d6d2fefa0e329d7cf28b61b099e7a06799f0894
+bcffd2ca1d25f58854fab273871f01e59e2e49c5 refs/tags/debian/2.1.5-1
+^7f8a17352b97a2a16da4e2d8f84cbbc097200b1f
+47315c293f36a2c2eaec8b063723eacf22f3906f refs/tags/debian/2.1.5-2
+^49467d2d00731957915c9d6cf5cc852ec3c31b6e
+adbe97a769f0270e89593710363c48a5cdc147f7 refs/tags/debian/2.1.5-3
+^e81e802052910b1dfe0a4117c666dbb6d4b0ad6e
+2d54bad22f84fe790eb676e6bd23f03273bdd745 refs/tags/debian/2.1.5-3+squeeze1
+^d133f4af9a0461b4d6b38a8617cd73d1b1e4cde9
+9a35411a56795e1b389c7dabcca548023a5047be refs/tags/debian/2.1.5-3+squeeze1_bpo50+1
+^8704f4ee40845e61b162b1a2779a546a8348c991
+7781c1a6ef4d70a96ecc818c78f439c9456a02a5 refs/tags/debian/2.1.5-3+squeeze2
+^6716aa6b176e4e79158e5e43f3e6e487eaf1ee15
+44f26e7c815c54f341dbc00cff9178dfb443ac29 refs/tags/debian/2.1.6-1
+^c8388c124037a24db131de341e929f7237bb5ee1
+312d9640e5ac919fe631dfadeff76e19342f8bad refs/tags/debian/2.1.6-2.1
+9323d95b64a3edb3d40b01cf52e3ea6afccba82d refs/tags/debian/2.1.8-1
+^6f5fab8556fe986057126068f5b988fb65b39018
+6ca86c18faf4d877afa1c9eff2721b8b2c45d1e4 refs/tags/debian/2.1.9-1
+^0f3b2d547e358aed0767f59690d8ce9791ddba2b
+0ce6287ed5f80ccd9ca458de6fd04527cfcbe7c9 refs/tags/ubuntu/2.1.10-2ubuntu1
+^2b1be0fc9c6da13b9b6ca295b7c202525b9361bd
+e65f9821ccf1d3aa310ce39f3dd47a740ae2932e refs/tags/upstream/1.0.0
+^9c9e5d65ef6b47dc252a17d23a71951a2c108e7a
+4e909270cb140056c96425778a4553baf894e078 refs/tags/upstream/1.1.1
+^a7bae6d3f4a2c02f48c9d3738060161521a93e68
+da9e5b178aea985e91ba78eba6b36ed01f3c3adf refs/tags/upstream/1.1.2
+^7fb54104aac9db81ef3ad5db09574f777459c9e7
+de904e17421fc90eb940b5c27f15303ac77858a0 refs/tags/upstream/1.1.4
+^b3a4375b911f3cf3d4c3c1c7d1535dc084340288
+abf2dd98fdd35af4071df8578bfa83eabc911666 refs/tags/upstream/2.0.0
+^808d37de52c3a06dc59427736c2f50d3852cb00a
+c03b7a4f7b2c0e0df08683b64d7ffd9931727116 refs/tags/upstream/2.0.1
+^2a6409c2b43debf2abb82048deb60e60948aa5f1
+ec6c7d152a17118874b16efcc7980f1a3ed98752 refs/tags/upstream/2.0.2
+^d4507bbcaef1e429990476d32317c0a9b9bed04c
+23e0d38d60d23111fcab38c212846d918aed64b6 refs/tags/upstream/2.0.3
+^20db5691ae04a3b07ac38f965581c6b5ef8be3ba
+666f620084fd6040b3eb457bd557396627498324 refs/tags/upstream/2.0.5
+^2d328f8f5f6f81b767b3d35c742f79ed9f47d2d6
+b362e4e02e7df2e97c93ae4a23a6f242e9045970 refs/tags/upstream/2.1.0
+^96472ed382dca18ffa33ba057a0eb6e86f10c044
+599f9e56288e7e2e2b2bce46fd0408fb4ec9e846 refs/tags/upstream/2.1.0rc1
+^3fdaa89ed7477a546db9022360714296b92f2dcb
+2b6ebb237a0ce67e0848653f974786837c953644 refs/tags/upstream/2.1.1
+^e0267f7704df7c64a2a801b31581cf82c13585d6
+20ec34de6481821da182a074f69216d911f3c944 refs/tags/upstream/2.1.10
+^d8ad8ab301acb7f7bf34f75fdaaec33f221cde55
+526ab7bb2799a537e63e47c5076a15be45a8f834 refs/tags/upstream/2.1.13
+^f0b36b45a6a70e673fca841dff5c5af0d7f33d04
+8f999055e1d19944b787c14c960a62546a616826 refs/tags/upstream/2.1.2
+^5a2ad5ab3cf7c264ed94a713e8e775765b43ed45
+f71218fc975e48ffa05cf7ec72214d1792bcd416 refs/tags/upstream/2.1.3
+^af124ba8c90b923fceba51d3c4d4bd7be578ff3d
+07fa519b1b826724c4aae0909a17c65548028b93 refs/tags/upstream/2.1.4
+^bbb939b2b01e5e95185975821c40f6304bfe4181
+e0c8a7a618a996ead6f409337973a77a136764a5 refs/tags/upstream/2.1.5
+^0fa6975e87ecb185197f4ae5b2dd0b44444c79f5
+fc0a5e08dbd169002aa391d25535342e029e2d62 refs/tags/upstream/2.1.6
+^a7492727f476e373ab6b5423c3566dd7385953ef
+f885a6fe97320a43546e186f74857e2902b6ab60 refs/tags/upstream/2.1.7
+^df055e1577fff2f9f745a79d17a5eebeb4dd033a
+e226ee32ee2fb039f2b639ac617d595e0237a81e refs/tags/upstream/2.1.8
+^edbaef2110e4e0ed989ffe82274a65193ec28224
+c937501d33af41f065e065509746932611e41926 refs/tags/upstream/2.1.9
+^7e53c3ed3f78377b3356d3d7e0e0384794620604

=== added directory '.git/refs'
=== added directory '.git/refs/heads'
=== added file '.git/refs/heads/master'
--- .git/refs/heads/master	1970-01-01 00:00:00 +0000
+++ .git/refs/heads/master	2014-07-10 22:50:00 +0000
@@ -0,0 +1,1 @@
+260f43840924bf203bf210b8863de38153a33038

=== added directory '.git/refs/remotes'
=== added directory '.git/refs/remotes/origin'
=== added file '.git/refs/remotes/origin/HEAD'
--- .git/refs/remotes/origin/HEAD	1970-01-01 00:00:00 +0000
+++ .git/refs/remotes/origin/HEAD	2014-07-10 22:50:00 +0000
@@ -0,0 +1,1 @@
+ref: refs/remotes/origin/master

=== added directory '.git/refs/tags'
=== added file '.gitignore'
--- .gitignore	1970-01-01 00:00:00 +0000
+++ .gitignore	2014-07-10 22:50:00 +0000
@@ -0,0 +1,3 @@
+stamp-*
+*-stamp
+src

=== modified file 'README'
--- README	2011-09-11 16:16:55 +0000
+++ README	2014-07-10 22:50:00 +0000
@@ -9,7 +9,7 @@
  - GNU Make
  - GCC
  - Libexpat 1.95 or higher
- - Erlang/OTP R10B-9 or higher. Recommended: R12B-5 and R13B04.
+ - Erlang/OTP R10B-9 or higher. Recommended: R13B04 and R14B04.
    Avoid R14A and R14B.
  - OpenSSL 0.9.8 or higher, for STARTTLS, SASL and SSL encryption.
  - Zlib 1.2.3 or higher, for Stream Compression support

=== modified file 'contrib/extract_translations/extract_translations.erl'
--- contrib/extract_translations/extract_translations.erl	2010-04-06 13:00:03 +0000
+++ contrib/extract_translations/extract_translations.erl	2014-07-10 22:50:00 +0000
@@ -281,14 +281,14 @@
       List).
 
 print_translation(File, Line, Str, StrT) ->
-    {ok, StrQ, _} = regexp:gsub(Str, "\"", "\\\""),
-    {ok, StrTQ, _} = regexp:gsub(StrT, "\"", "\\\""),
+    StrQ = ejabberd_regexp:greplace(Str, "\\\"", "\\\\\""),
+    StrTQ = ejabberd_regexp:greplace(StrT, "\\\"", "\\\\\""),
     io:format("#: ~s:~p~nmsgid \"~s\"~nmsgstr \"~s\"~n~n", [File, Line, StrQ, StrTQ]).
 
 print_translation_obsolete(Str, StrT) ->
     File = "unknown.erl",
     Line = 1,
-    {ok, StrQ, _} = regexp:gsub(Str, "\"", "\\\""),
-    {ok, StrTQ, _} = regexp:gsub(StrT, "\"", "\\\""),
+    StrQ = ejabberd_regexp:greplace(Str, "\\\"", "\\\\\""),
+    StrTQ = ejabberd_regexp:greplace(StrT, "\\\"", "\\\\\""),
     io:format("#: ~s:~p~n#~~ msgid \"~s\"~n#~~ msgstr \"~s\"~n~n", [File, Line, StrQ, StrTQ]).
 

=== modified file 'debian/NEWS'
--- debian/NEWS	2011-09-11 16:16:55 +0000
+++ debian/NEWS	2014-07-10 22:50:00 +0000
@@ -1,3 +1,22 @@
+ejabberd (2.1.13-1) experimental; urgency=low
+
+  This release fixes miscellaneous bugs. See the upstream release notes for details.
+
+ -- Ben Langfeld <[e-mail]>  Tue, 1 Jul 2014 15:52:23 -0300
+
+ejabberd (2.1.11-1) unstable; urgency=low
+
+  This release adds support for the SCRAM-SHA-1 authentication mecnahism.
+  If the fully-qualified hostname of the server differs from the name
+  of the XMPP domain it serves, in order for this mechanism to work
+  with compliant clients, a modification should be made to the ejabberd's
+  configuration file.
+
+  Please consult the section "Using SCRAM-SHA-1 authentication mechanism"
+  in the README.Debian file for detailed information.
+
+ -- Konstantin Khomoutov <[e-mail]>  Thu, 16 May 2013 13:27:56 +0000
+
 ejabberd (2.1.8-1) unstable; urgency=low
 
   This release drops support for the @recent@ shared roster group

=== modified file 'debian/README.Debian'
--- debian/README.Debian	2010-04-06 13:00:03 +0000
+++ debian/README.Debian	2014-07-10 22:50:00 +0000
@@ -14,6 +14,7 @@
 6. Upgrading from 2.0.x series
 6.1 Changes in ejabberdctl program
 6.2 Changes in logging
+7. Using SCRAM-SHA-1 authentication mechanism
 
 
 1. Running
@@ -361,6 +362,47 @@
 to "--erlang-log" to match the change above.
 
 
+7. Using SCRAM-SHA-1 authentication mechanism
+=============================================
+
+Since version 2.1.9 ejabberd supports the SCRAM-SHA-1 authentication
+mechanism (which, among other things, allows to not store passwords of
+XMPP accounts in clear text if the internal database backend is used
+for storage).  This authentication process implemented by this
+mechanism includes the client sending a so-called "digest URI" which
+includes the server's identity as perceived by the connecting client.
+The SCRAM-SHA-1 RFC document requires this identity to be the
+fully-qualified host name of the server.  This hostname is typically
+obtained by the client by looking up a server-specific DNS record of
+type SRV for the XMPP domain the client wants to register in.
+
+Unfortunately, the current implementation of SCRAM-SHA-1 in ejabberd
+is not able to perform the same kind of DNS query as used by the
+clients to know its "canonical" fully-qualified host name.
+Consequently, if the actual hostname of the server differs from the
+name of the XMPP domain it serves, a special option should be included
+in the configuration file to let the server know its hostname as seen
+by its clients.  This configuration option is called "fqdn" and it
+expects a single argument -- the fully-qualified hostname of the
+server, as recorded in the appropriate DNS SRV record for the server.
+An example of its usage:
+
+{fqdn, "foo.example.com"}.
+
+It worth repeating that if the server's hostname is not different from
+the name of XMPP domain it servers (for instance, the XMPP domain is
+"example.com" and the server's hostname is also "example.com") the
+usage of this configuration option is not necessary as ejabberd will
+just use the domain name in the indicated case.
+
+It should be noted that while certain clients faithfully implement the
+SCRAM-SHA-1 specification, some other clients diverge and use the XMPP
+domain instead of the fully-qualified hostname of the server in the
+digest URI strings they send.  Ejabberd implements relaxed rules for
+interpreting digest URIs to be interoperable with broken client
+implementations.
+
+
 Authors
 =======
 

=== added file 'debian/bzr-builddeb.conf'
--- debian/bzr-builddeb.conf	1970-01-01 00:00:00 +0000
+++ debian/bzr-builddeb.conf	2014-07-10 22:50:00 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+native = True

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-15 08:50:42 +0000
+++ debian/changelog	2014-07-10 22:50:00 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 ejabberd (2.1.10-2ubuntu1) precise; urgency=low
 
   * Revert bumping erlang-dev Build-Depends version to >= 1:15.b, there is no
@@ -5,6 +6,125 @@
 
  -- Gerfried Fuchs <[e-mail]>  Wed, 15 Feb 2012 08:50:42 +0100
 
+=======
+ejabberd (2.1.13-1benlangfeld3) trusty; urgency=low
+
+  [ Ben Langfeld ]
+  * Include patch from https://github.com/processone/ejabberd/issues/246
+
+ -- Ben Langfeld <[e-mail]>  Thu, 10 Jul 2014 19:29:49 -0300
+
+ejabberd (2.1.13-1benlangfeld2) trusty; urgency=low
+
+  [ Ben Langfeld ]
+  * Second attempt at package upload, this time including original source tarball
+
+ -- Ben Langfeld <[e-mail]>  Tue, 1 Jul 2014 19:24:09 -0300
+
+ejabberd (2.1.13-1benlangfeld1) trusty; urgency=low
+
+  [ Ben Langfeld ]
+  * Ubuntu release of Debian's 2.1.13-1
+
+ -- Ben Langfeld <[e-mail]>  Tue, 1 Jul 2014 18:47:12 -0300
+
+ejabberd (2.1.13-1) unstable; urgency=low
+
+  [ Ben Langfeld ]
+  * New upstream release.
+  * New upstream release made these patches obsolete:
+    disable-insecure-ssl-cyphers.patch, disable-ssl2.patch,
+    fix-ldap-vcard-jpeg-photos.patch,
+    scram-optional-parameter-parsing-bugfix.patch
+
+
+ -- Ben Langfeld <[e-mail]>  Tue, 1 Jul 2014 15:44:32 -0300
+
+ejabberd (2.1.11-1ubuntu3) utopic; urgency=low
+
+  * Fix LDAP authentication (LP: #1241632)
+    - debian/patches/fix-erlang-r16b-compat.patch: backport upstream
+      fix for Erlang 16b compatibility.
+    - upstream reference: https://support.process-one.net/browse/EJAB-1612
+  * Add ufw profile (LP: #1254688)
+
+ -- Lionel Porcheron <[e-mail]>  Mon, 28 Apr 2014 13:27:21 +0200
+
+ejabberd (2.1.11-1ubuntu2) trusty; urgency=low
+
+  * Use autotools-dev for arm64.
+
+ -- Daniel T Chen <[e-mail]>  Mon, 10 Feb 2014 14:41:57 -0500
+
+ejabberd (2.1.11-1ubuntu1) trusty; urgency=low
+
+  * Add digest-uri-virtual-hosts.patch from upstream commit f434501
+    - Fixes a problem with Pidgin not being able to log in on a server
+      with multiple virtual hosts and SRV records (LP: #1097366)
+
+ -- a7x <[e-mail]>  Tue, 08 Jan 2013 12:52:21 -0500
+
+ejabberd (2.1.11-1) unstable; urgency=low
+
+  [ Konstantin Khomoutov ]
+  * New upstream release (closes: #654853).
+  * Update mod_admin_extra module to revision 1126.
+  * Provide custom implementation of xmerl_regexp:sh_to_awk/1
+    (closes: #670307).
+  * Refresh reopen-log.patch
+  * Add use_dpkg_buildflags.patch (thanks to Simon Ruderich,
+    closes: #664034).
+  * Explain the "fqdn" configuration file option which has to be used
+    in certain setups for the SCRAM-SHA-1 to work with complying clients.
+    Mention this fact in the NEWS file. (Closes: #706590)
+  * Add upstream patch fixing incorrect escaping of a single quote character
+    in SQL queries generated by the ODBC storage backend (closes: #708151,
+    thanks to Vladislav Chugunov).
+
+  [ Gerfried Fuchs ]
+  * Add upstream patches disabling SSLv2 and weak cyphers in TLS driver
+    (closes: #722105).
+  * New upstream release made these patches obsolete:
+    relax-digest-uri-handling.patch, fix-parsing-split-https-requests.patch,
+    fix-odbc-escaping.patch
+
+ -- Gerfried Fuchs <[e-mail]>  Thu, 17 Oct 2013 12:57:47 +0200
+
+ejabberd (2.1.10-5) unstable; urgency=low
+
+  [ Konstantin Khomoutov ]
+  * Add patch fixing parsing of optional parameters in SCRAM SHA-1 headers
+    (closes: #705613, thanks to Stephen Röttger for both writing the
+    original patch and backporting it to 2.1.10).
+
+ -- Konstantin Khomoutov <[e-mail]>  Thu, 25 Apr 2013 15:31:59 +0000
+
+ejabberd (2.1.10-4) unstable; urgency=low
+
+  [ Konstantin Khomoutov ]
+  * Do not run ejabberdctl as root in prerm and logrotate scripts
+    (closes: #691125, thanks to Michael Stapelberg and Felix Geyer).
+  * Add upstream patch fixing receiving JPEG vCard photos via LDAP
+    (closes: #660186).
+  * Add upstream patch fixing parsing HTTPS requests split into
+    multiple packets (closes: #698309).
+
+ -- Konstantin Khomoutov <[e-mail]>  Sat, 16 Feb 2013 16:59:21 +0000
+
+ejabberd (2.1.10-3) unstable; urgency=low
+
+  [ Konstantin Khomoutov ]
+  * Provide custom implementation of xmerl_regexp:sh_to_awk/1
+    (closes: #670307).
+  * Add use_dpkg_buildflags.patch (thanks to Simon Ruderich,
+    closes: #664034).
+  * Add relax-digest-uri-handling.patch (closes: #654853).
+  * Add Slovak translation (thanks to Slavko, closes: #647115).
+  * Add Italian translation (thanks to Beatrice Torracca, closes: #682987).
+
+ -- Konstantin Khomoutov <[e-mail]>  Sun, 20 May 2012 14:51:12 +0400
+
+>>>>>>> MERGE-SOURCE
 ejabberd (2.1.10-2) unstable; urgency=low
 
   [ Gerfried Fuchs ]
@@ -729,7 +849,7 @@
   [ Sergei Golovan ]
   * new upstream release
   * added spanish translation
-  * removed no longer needed mod_muc_log patch 
+  * removed no longer needed mod_muc_log patch
   * added variable ERLANG_NODE, which allows to override default
     ejabberd node, to /etc/default/ejabberd file
   * changed erlang node selection by ejabberdctl (in some cases

=== modified file 'debian/control'
--- debian/control	2012-02-15 08:50:42 +0000
+++ debian/control	2014-07-10 22:50:00 +0000
@@ -1,9 +1,14 @@
 Source: ejabberd
 Section: net
 Priority: optional
-Maintainer: Konstantin Khomoutov <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Konstantin Khomoutov <[e-mail]>
 Uploaders: Gerfried Fuchs <[e-mail]>
+<<<<<<< TREE
 Build-Depends: debhelper (>= 7.3~), quilt, erlang-base, erlang-asn1, erlang-parsetools, erlang-dev (>= 1:13.b), libexpat1-dev, libssl-dev, zlib1g-dev, libpam0g-dev, po-debconf
+=======
+Build-Depends: debhelper (>= 7.3~), quilt, erlang-base, erlang-asn1, erlang-parsetools, erlang-dev (>= 1:15.b), libexpat1-dev, libssl-dev, zlib1g-dev, libpam0g-dev, po-debconf, autotools-dev
+>>>>>>> MERGE-SOURCE
 Standards-Version: 3.9.2
 Homepage: http://www.process-one.net/en/projects/ejabberd/
 Vcs-Git: git://git.deb.at/pkg/ejabberd.git

=== modified file 'debian/dirs'
--- debian/dirs	2006-09-14 07:20:39 +0000
+++ debian/dirs	2014-07-10 22:50:00 +0000
@@ -1,2 +1,3 @@
 var/lib/ejabberd
 var/log/ejabberd
+etc/ufw/applications.d

=== added file 'debian/ejabberd.ufw.profile'
--- debian/ejabberd.ufw.profile	1970-01-01 00:00:00 +0000
+++ debian/ejabberd.ufw.profile	2014-07-10 22:50:00 +0000
@@ -0,0 +1,14 @@
+[Ejabberd]
+title=Jabber server (xmpp-client)
+description=distributed, fault-tolerant Jabber/XMPP server written in Erlang
+ports=5222/tcp
+
+[Ejabberd SSL]
+title=Jabber server (xmpp-client-ssl)
+description=distributed, fault-tolerant Jabber/XMPP server written in Erlang    
+ports=5223/tcp
+
+[Ejabberd S2S]
+title=Jabber server (xmpp-server)
+description=distributed, fault-tolerant Jabber/XMPP server written in Erlang    
+ports=5269/tcp

=== modified file 'debian/logrotate'
--- debian/logrotate	2010-07-26 20:36:14 +0000
+++ debian/logrotate	2014-07-10 22:50:00 +0000
@@ -9,6 +9,6 @@
 	create 640 ejabberd adm
 	sharedscripts
 	postrotate
-		/usr/sbin/ejabberdctl reopen-log > /dev/null
+		su ejabberd -c '/usr/sbin/ejabberdctl reopen-log' > /dev/null
 	endscript
 }

=== added file 'debian/patches/ejabberd_regexp.patch'
--- debian/patches/ejabberd_regexp.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/ejabberd_regexp.patch	2014-07-10 22:50:00 +0000
@@ -0,0 +1,95 @@
+Description: Provide custom replacement for xmerl_regexp:sh_to_awk/1
+ Erlang R15 dropped support for its old regular expressions library
+ (implemented as the "regexp" module) and replaced it with a new,
+ PCRE-based, implementation (implemented as the "re" module).
+ This transition lost the regexp:sh_to_awk/1 function which, given
+ a "glob-style expression" commonly used in POSIX shells to match
+ filenames, would produce a regular expression specification with
+ the equivalent semantics.  The ejabberd upstream tried to combat
+ this situation [1] by using xmerl_regexp:sh_to_awk/1.
+ This introduced an implicit dependency on the erlang-xmerl library
+ which has been the cause for a Debian bug #670307.
+ Depending on erlang-xmerl has two problems:
+ 1) It's a 1.5M library otherwise not used by ejabberd code while
+    the function itself is rather straightforward to implement.
+ 2) The implementation of xmerl_regexp:sh_to_awk/1 has certain
+    flaws (incorrect parsing of bracketed expressions, not escaping
+    match repetition counts).
+ As a result, a custom implementation of sh_to_awk/1 is provided,
+ which works almost like xmerl_regexp:sh_to_awk/1 but fixes its flaws.
+ 1. https://support.process-one.net/browse/EJAB-921
+Author: Konstantin Khomoutov <[e-mail]>
+Forwarded: no
+Last-Update: 2012-06-04
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/ejabberd_regexp.erl
++++ b/src/ejabberd_regexp.erl
+@@ -26,6 +26,7 @@
+ 
+ -module(ejabberd_regexp).
+ -compile([export_all]).
++-import(lists, [reverse/1, member/2]).
+ 
+ exec(ReM, ReF, ReA, RgM, RgF, RgA) ->
+     try apply(ReM, ReF, ReA)
+@@ -66,7 +67,56 @@
+ 	A -> A
+     end.
+ 
+-sh_to_awk(ShRegExp) ->
+-    case exec(xmerl_regexp, sh_to_awk, [ShRegExp], regexp, sh_to_awk, [ShRegExp]) of
+-	A -> A
++sh_to_awk(Pattern) when is_list(Pattern) ->
++    fnmatch_char(Pattern, [$(,$^]).
++
++fnmatch_char([], Acc) ->
++    lists:reverse([$$,$)|Acc]);
++fnmatch_char([Ch|Tail], Acc) ->
++    case Ch of
++	$\\ ->
++	    fnmatch_char(Tail, [$\\,$\\|Acc]);
++	$[ ->
++	    fnmatch_bexp_first(Tail, [Ch|Acc]);
++	$? ->
++	    fnmatch_char(Tail, [$.|Acc]);
++	$* ->
++	    fnmatch_char(Tail, [$*,$.|Acc]);
++	_ ->
++	    case lists:member(Ch, "^.+{}()$|\\") of
++		true ->
++		    fnmatch_char(Tail, [Ch,$\\|Acc]);
++		false ->
++		    fnmatch_char(Tail, [Ch|Acc])
++	    end
++    end.
++
++fnmatch_bexp_first([], _) ->
++    {error, unclosed_be};
++fnmatch_bexp_first([Ch|Tail], Acc) ->
++    case Ch of
++	$] ->
++	    {error, empty_be};
++	$! ->
++	    fnmatch_bexp_next(Tail, false, [$^|Acc]);
++	$\\ ->
++	    fnmatch_bexp_next(Tail, true, Acc);
++	_ ->
++	    fnmatch_bexp_next(Tail, false, [Ch|Acc])
++    end.
++
++fnmatch_bexp_next([], _, _) ->
++    {error, unclosed_be};
++fnmatch_bexp_next([Ch|Tail], true, Acc) ->
++    fnmatch_bexp_next(Tail, false, [Ch,$\\|Acc]);
++fnmatch_bexp_next([Ch|Tail], false, Acc) ->
++    case Ch of
++	$] ->
++	    fnmatch_char(Tail, [Ch|Acc]);
++	$\\ ->
++	    fnmatch_bexp_next(Tail, true, Acc);
++	_ ->
++	    fnmatch_bexp_next(Tail, false, [Ch|Acc])
+     end.
++
++%% vim:ts=8:sw=4:sts=4:noet

=== added file 'debian/patches/ldap-filter-dnattributes.patch'
--- debian/patches/ldap-filter-dnattributes.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/ldap-filter-dnattributes.patch	2014-07-10 22:50:00 +0000
@@ -0,0 +1,25 @@
+From f81c9c9953fd4970b156170bf5adeb9f4800d91f Mon Sep 17 00:00:00 2001
+From: Ben Langfeld <[e-mail]>
+Date: Thu, 10 Jul 2014 18:50:03 -0300
+Subject: [PATCH] Set dnAttributes on when it's requested by a filter
+
+---
+ src/eldap/eldap_filter_yecc.yrl | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/eldap/eldap_filter_yecc.yrl b/src/eldap/eldap_filter_yecc.yrl
+index a8f7970..303dda3 100644
+--- a/src/eldap/eldap_filter_yecc.yrl
++++ b/src/eldap/eldap_filter_yecc.yrl
+@@ -38,9 +38,9 @@ any -> '$empty': [].
+ initial -> value: initial('$1').
+ final -> value: final('$1').
+
+-extensible -> xattr ':dn' ':' matchingrule ':=' value: extensible('$6', ['$1', '$4']).
++extensible -> xattr ':dn' ':' matchingrule ':=' value: extensible('$6', ['$1', '$4', {dnAttributes, true}]).
+ extensible -> xattr ':' matchingrule ':=' value: extensible('$5', ['$1', '$3']).
+-extensible -> xattr ':dn' ':=' value: extensible('$4', ['$1']).
++extensible -> xattr ':dn' ':=' value: extensible('$4', ['$1', {dnAttributes, true}]).
+ extensible -> xattr ':=' value: extensible('$3', ['$1']).
+ extensible -> ':dn' ':' matchingrule ':=' value: extensible('$5', ['$3']).
+ extensible -> ':' matchingrule ':=' value: extensible('$4', ['$2']).

=== modified file 'debian/patches/mod_admin_extra.patch'
--- debian/patches/mod_admin_extra.patch	2012-01-08 11:45:38 +0000
+++ debian/patches/mod_admin_extra.patch	2014-07-10 22:50:00 +0000
@@ -4,7 +4,7 @@
 
 The code is taken from the ProcessOne repository:
 https://forge.process-one.net/browse/ejabberd-modules/mod_admin_extra
-(trunk, revision 1123).
+(trunk, revision 1126).
 
 --- a/src/ejabberd.app
 +++ b/src/ejabberd.app
@@ -18,7 +18,7 @@
  	     node_default,
 --- /dev/null
 +++ b/src/mod_admin_extra.erl
-@@ -0,0 +1,1560 @@
+@@ -0,0 +1,1568 @@
 +%%%-------------------------------------------------------------------
 +%%% File    : mod_admin_extra.erl
 +%%% Author  : Badlop <[e-mail]>
@@ -375,7 +375,7 @@
 +			result = {res, rescode}},
 +
 +     #ejabberd_commands{name = add_rosteritem, tags = [roster],
-+			desc = "Add an item to a user's roster",
++			desc = "Add an item to a user's roster (supports ODBC)",
 +			module = ?MODULE, function = add_rosteritem,
 +			args = [{localuser, string}, {localserver, string},
 +				{user, string}, {server, string},
@@ -386,7 +386,7 @@
 +     %%{"", "example: add-roster peter localhost mike server.com MiKe Employees both"},
 +     %%{"", "will add [e-mail] to peter@localhost roster"},
 +     #ejabberd_commands{name = delete_rosteritem, tags = [roster],
-+			desc = "Delete an item from a user's roster",
++			desc = "Delete an item from a user's roster (supports ODBC)",
 +			module = ?MODULE, function = delete_rosteritem,
 +			args = [{localuser, string}, {localserver, string},
 +				{user, string}, {server, string}],
@@ -1082,21 +1082,18 @@
 +add_rosteritem(LU, LS, User, Server, Nick, Group, Subscription, Xattrs) ->
 +    subscribe(LU, LS, User, Server, Nick, Group, Subscription, Xattrs).
 +
-+subscribe(LU, LS, User, Server, Nick, Group, Subscription, Xattrs) ->
-+    mnesia:transaction(
-+      fun() ->
-+	      mnesia:write({roster,
-+			    {LU,LS,{User,Server,[]}}, % uj
-+			    {LU,LS},                  % user
-+			    {User,Server,[]},      % jid
-+			    Nick,                  % name: "Mom", []
-+			    Subscription,  % subscription: none, to=you see him, from=he sees you, both
-+			    none,          % ask: out=send request, in=somebody requests you, none
-+			    [Group],       % groups: ["Family"]
-+			    Xattrs,        % xattrs: [{"category","conference"}]
-+			    []             % xs: []
-+			   })
-+      end).
++subscribe(LU, LS, User, Server, Nick, Group, Subscription, _Xattrs) ->
++    SubscriptionS = case is_atom(Subscription) of
++	true -> atom_to_list(Subscription);
++	false -> Subscription
++    end,
++    ItemEl = build_roster_item(User, Server, {add, Nick, SubscriptionS, Group}),
++    {ok, M} = loaded_module(LS,[mod_roster_odbc,mod_roster]),
++    M:set_items(
++	LU, LS,
++	{xmlelement,"query",
++            [{"xmlns","jabber:iq:roster"}],
++            [ItemEl]}).
 +
 +delete_rosteritem(LocalUser, LocalServer, User, Server) ->
 +    case unsubscribe(LocalUser, LocalServer, User, Server) of
@@ -1108,11 +1105,22 @@
 +    end.
 +
 +unsubscribe(LU, LS, User, Server) ->
-+    mnesia:transaction(
-+      fun() ->
-+              mnesia:delete({roster, {LU, LS, {User, Server, []}}})
-+      end).
++    ItemEl = build_roster_item(User, Server, remove),
++    {ok, M} = loaded_module(LS,[mod_roster_odbc,mod_roster]),
++    M:set_items(
++	LU, LS,
++	{xmlelement,"query",
++            [{"xmlns","jabber:iq:roster"}],
++            [ItemEl]}).
 +
++loaded_module(Domain,Options) ->
++    LoadedModules = gen_mod:loaded_modules(Domain),
++    case lists:filter(fun(Module) ->
++                              lists:member(Module, LoadedModules)
++                      end, Options) of
++        [M|_] -> {ok, M};
++        [] -> {error,not_found}
++    end.
 +
 +%% -----------------------------
 +%% Get Roster

=== modified file 'debian/patches/reopen-log.patch'
--- debian/patches/reopen-log.patch	2011-10-03 20:27:12 +0000
+++ debian/patches/reopen-log.patch	2014-07-10 22:50:00 +0000
@@ -58,7 +58,7 @@
  	    {ok, State#state{fd = Fd}};
 --- a/src/ejabberd_admin.erl
 +++ b/src/ejabberd_admin.erl
-@@ -219,28 +219,9 @@
+@@ -223,28 +223,9 @@
  
  reopen_log() ->
      ejabberd_hooks:run(reopen_log_hook, []),

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-10-03 20:27:12 +0000
+++ debian/patches/series	2014-07-10 22:50:00 +0000
@@ -1,4 +1,7 @@
+use_dpkg_buildflags.patch
+ejabberd_regexp.patch
 mod_admin_extra.patch
 captcha.patch
 fix_examples.patch
 reopen-log.patch
+ldap-filter-dnattributes.patch

=== added file 'debian/patches/use_dpkg_buildflags.patch'
--- debian/patches/use_dpkg_buildflags.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/use_dpkg_buildflags.patch	2014-07-10 22:50:00 +0000
@@ -0,0 +1,70 @@
+Description: Use CPPFLAGS from environment (dpkg-buildflags).
+ Necessary for hardening flags.
+Author: Simon Ruderich <[e-mail]>
+Last-Update: 2012-03-15
+
+Index: ejabberd-2.1.10/src/configure
+===================================================================
+--- ejabberd-2.1.10.orig/src/configure	2012-03-15 00:20:28.288591657 +0100
++++ ejabberd-2.1.10/src/configure	2012-03-15 00:22:09.780595520 +0100
+@@ -4479,7 +4479,7 @@
+ 	fi
+ 	zlib_save_CFLAGS="$CFLAGS"
+ 	CFLAGS="$CFLAGS $ZLIB_CFLAGS"
+-       zlib_save_CPPFLAGS="$CFLAGS"
++       zlib_save_CPPFLAGS="$CPPFLAGS"
+        CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS"
+ 	for ac_header in zlib.h
+ do :
+Index: ejabberd-2.1.10/src/acinclude.m4
+===================================================================
+--- ejabberd-2.1.10.orig/src/acinclude.m4	2012-03-15 00:20:28.288591657 +0100
++++ ejabberd-2.1.10/src/acinclude.m4	2012-03-15 00:22:09.784595520 +0100
+@@ -54,7 +54,7 @@
+ 	fi
+ 	zlib_save_CFLAGS="$CFLAGS"
+ 	CFLAGS="$CFLAGS $ZLIB_CFLAGS"
+-       zlib_save_CPPFLAGS="$CFLAGS"
++       zlib_save_CPPFLAGS="$CPPFLAGS"
+        CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS"
+ 	AC_CHECK_HEADERS(zlib.h, , zlib_found=no)
+ 	if test $zlib_found = no; then
+Index: ejabberd-2.1.10/src/Makefile.in
+===================================================================
+--- ejabberd-2.1.10.orig/src/Makefile.in	2012-03-15 00:20:28.288591657 +0100
++++ ejabberd-2.1.10/src/Makefile.in	2012-03-15 00:22:09.784595520 +0100
+@@ -168,7 +168,7 @@
+ 	@ERLC@ -W $(EFLAGS) $*.erl
+ 
+ $(ERLSHLIBS):	%.so:	%.c
+-	$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) \
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(LIBS) \
+ 		$(subst ../,,$(subst .so,.c,$@)) \
+ 		$(EXPAT_LIBS) \
+ 		$(EXPAT_CFLAGS) \
+Index: ejabberd-2.1.10/src/mod_irc/Makefile.in
+===================================================================
+--- ejabberd-2.1.10.orig/src/mod_irc/Makefile.in	2012-03-15 00:20:28.288591657 +0100
++++ ejabberd-2.1.10/src/mod_irc/Makefile.in	2012-03-15 00:22:09.784595520 +0100
+@@ -41,7 +41,7 @@
+ #	erl -s make all report "{outdir, \"..\"}" -noinput -s erlang halt
+ 
+ $(ERLSHLIBS):	../%.so:	%.c
+-	$(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) \
++	$(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) \
+ 		$(subst ../,,$(subst .so,.c,$@)) \
+ 		$(LIBS) \
+ 		$(ERLANG_CFLAGS) \
+Index: ejabberd-2.1.10/src/stringprep/Makefile.in
+===================================================================
+--- ejabberd-2.1.10.orig/src/stringprep/Makefile.in	2012-03-15 00:22:43.904596819 +0100
++++ ejabberd-2.1.10/src/stringprep/Makefile.in	2012-03-15 00:22:58.844597386 +0100
+@@ -42,7 +42,7 @@
+ #	erl -s make all report "{outdir, \"..\"}" -noinput -s erlang halt
+ 
+ $(ERLSHLIBS):	../%.so:	%.c uni_data.c uni_norm.c
+-	$(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES) \
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(INCLUDES) \
+ 		$(subst ../,,$(subst .so,.c,$@)) $(LIBS) \
+ 		$(ERLANG_LIBS) \
+ 		$(ERLANG_CFLAGS) \

=== added file 'debian/po/it.po'
--- debian/po/it.po	1970-01-01 00:00:00 +0000
+++ debian/po/it.po	2014-07-10 22:50:00 +0000
@@ -0,0 +1,104 @@
+# Italian translation of ejabberd debconf messages.
+# Copyright (C) 2012, ejabberd package copyright holder.
+# This file is distributed under the same license as the ejabberd package.
+# Beatrice Torracca <[e-mail]>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ejabberd\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2008-02-15 10:37+0300\n"
+"PO-Revision-Date: 2012-07-22 13:11+0200\n"
+"Last-Translator: Beatrice Torracca <[e-mail]>\n"
+"Language-Team: Italian <[e-mail]>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.7.1\n"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid "The name of the host ejabberd will serve:"
+msgstr "Il nome dell'host per cui ejabberd farà da server:"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid "Please enter the hostname of your Jabber server (in lowercase)."
+msgstr "Inserire il nome host del server Jabber (in lettere minuscole)."
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid "The username of an admin account for ejabberd:"
+msgstr "Il nome utente di un account di amministrazione per ejabberd:"
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid ""
+"Please provide the name of an account to administrate the ejabberd server. "
+"After the installation of ejabberd you can use this account to log in with "
+"any Jabber client to do administrative tasks or go to http://"
+"${hostname}:5280/admin/ and log in with this account to enter the admin "
+"interface. Enter the username part here (e.g. ${user}), but use the full "
+"Jabber ID (e.g. ${user}@${hostname}) to log into ejabberd web interface; "
+"otherwise it will fail."
+msgstr ""
+"Inserire il nome di un account per amministrare il server ejabberd. Dopo "
+"l'installazione di ejabberd sarà possibile usare questo account per fare il "
+"login con qualsiasi client Jabber per svolgere compiti di amministrazione "
+"oppure si potrà andare all'indirizzo http://${hostname}:5280/admin/ e fare "
+"il login con questo account per entrare nell'interfaccia di amministrazione. "
+"Inserire qui la parte del nome utente (ad esempio ${user}), ma usare l'ID "
+"Jabber completo (ad esempio ${user}@${hostname}) per fare il login "
+"nell'interfaccia web, altrimenti non riuscirà."
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid "Leave empty if you don't want to create an admin account automatically."
+msgstr ""
+"Lasciare vuoto se non si desidera creare automaticamente un account di "
+"amministrazione."
+
+#. Type: password
+#. Description
+#: ../templates:3001
+msgid "The password for the admin account:"
+msgstr "La password per l'account di amministrazione:"
+
+#. Type: password
+#. Description
+#: ../templates:3001
+msgid "Please enter the password for the administrative user."
+msgstr "Inserire la password dell'utente amministratore."
+
+#. Type: password
+#. Description
+#: ../templates:4001
+msgid "The password for the admin account again for verification:"
+msgstr ""
+"Inserire nuovamente la password per l'account di amministrazione per "
+"verifica:"
+
+#. Type: password
+#. Description
+#: ../templates:4001
+msgid ""
+"Please reenter the password for the administrative user for verification."
+msgstr "Reinserire la password per l'utente amministratore per verifica."
+
+#. Type: error
+#. Description
+#: ../templates:5001
+msgid "The passwords do not match!"
+msgstr "Le password non corrispondono."
+
+#. Type: error
+#. Description
+#: ../templates:5001
+msgid "The passwords you have typed do not match. Please try again."
+msgstr "Le password inserite non corrispondono. Riprovare."

=== added file 'debian/po/sk.po'
--- debian/po/sk.po	1970-01-01 00:00:00 +0000
+++ debian/po/sk.po	2014-07-10 22:50:00 +0000
@@ -0,0 +1,104 @@
+# Slovak translations for ejabberd package
+# Slovenské preklady pre balík ejabberd.
+# Copyright (C) 2011 THE ejabberd'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the ejabberd package.
+# Automatically generated, 2011.
+# Slavko <[e-mail]>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ejabberd 2.1.9-1\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2008-02-15 10:37+0300\n"
+"PO-Revision-Date: 2011-10-30 15:15+0100\n"
+"Last-Translator: Slavko <[e-mail]>\n"
+"Language-Team: slovenčina <[e-mail]>\n"
+"Language: sk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-POFile-SpellExtra: admin hostname Jabber ejabberd administračného\n"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid "The name of the host ejabberd will serve:"
+msgstr "Meno hostiteľa, ktoré bude ejabberd poskytovať:"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid "Please enter the hostname of your Jabber server (in lowercase)."
+msgstr "Prosím, zadajte meno hostiteľa servera Jabber (malými písmenami)."
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid "The username of an admin account for ejabberd:"
+msgstr "Meno používateľa účtu administrátora pre ejabberd:"
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid ""
+"Please provide the name of an account to administrate the ejabberd server. "
+"After the installation of ejabberd you can use this account to log in with "
+"any Jabber client to do administrative tasks or go to http://"
+"${hostname}:5280/admin/ and log in with this account to enter the admin "
+"interface. Enter the username part here (e.g. ${user}), but use the full "
+"Jabber ID (e.g. ${user}@${hostname}) to log into ejabberd web interface; "
+"otherwise it will fail."
+msgstr ""
+"Prosím, zadajte meno účtu administrátora servera ejabberd. Po inštalácii "
+"ejabberd môžete tento účet použiť na prihlásenie sa pomocou ktoréhokoľvek "
+"klienta Jabber a vykonávanie administratívnych úloh alebo použiť http://"
+"${hostname}:5280/admin/ a prihlásiť sa pomocou tohoto účtu do "
+"administračného rozhrania. Tu zadajte len časť s používateľským menom (napr. "
+"${user}), ale na prihlásenie do webového rozhrania ejabberd použite úplný "
+"identifikátor Jabber (napr. ${user}@${hostname}); inak prihlásenie zlyhá."
+
+#. Type: string
+#. Description
+#: ../templates:2001
+msgid "Leave empty if you don't want to create an admin account automatically."
+msgstr ""
+"Nechajte prázdne, ak nechcete aby bol účet administrátora vytvorený "
+"automaticky."
+
+#. Type: password
+#. Description
+#: ../templates:3001
+msgid "The password for the admin account:"
+msgstr "Heslo účtu administrátora:"
+
+#. Type: password
+#. Description
+#: ../templates:3001
+msgid "Please enter the password for the administrative user."
+msgstr "Prosím, zadajte heslo administračného používateľa."
+
+#. Type: password
+#. Description
+#: ../templates:4001
+msgid "The password for the admin account again for verification:"
+msgstr "Heslo administrátora znova, kvôli overeniu:"
+
+#. Type: password
+#. Description
+#: ../templates:4001
+msgid ""
+"Please reenter the password for the administrative user for verification."
+msgstr "Prosím, zdajte znova heslo administrátora, kvôli overeniu."
+
+#. Type: error
+#. Description
+#: ../templates:5001
+msgid "The passwords do not match!"
+msgstr "Heslá sa nezhodujú!"
+
+#. Type: error
+#. Description
+#: ../templates:5001
+msgid "The passwords you have typed do not match. Please try again."
+msgstr "Heslá, ktoré ste zadali sa nezhodujú. Prosím, skúste znova."

=== modified file 'debian/prerm'
--- debian/prerm	2007-05-18 13:44:53 +0000
+++ debian/prerm	2014-07-10 22:50:00 +0000
@@ -15,15 +15,23 @@
 #          <conflicting-package> <version>
 # for details, see /usr/doc/packaging-manual/
 
+ctl() {
+	local cmd='/usr/sbin/ejabberdctl'
+	for arg in "$@"; do
+		cmd="$cmd '$arg'"
+	done
+	su ejabberd -c "$cmd"
+}
+
 case "$1" in
     remove|upgrade)
-	if ejabberdctl status >/dev/null ; then
+	if ctl status >/dev/null ; then
 	    # Use timestamp to make database restoring easier
 	    TIME=$(date +%Y-%m-%dT%H:%M:%S)
 	    BACKUPDIR=$(mktemp -d -p /var/backups/ ejabberd-$TIME.XXXXXX)
 	    chown ejabberd:ejabberd $BACKUPDIR
 	    BACKUP=$BACKUPDIR/ejabberd-database
-	    ejabberdctl backup $BACKUP
+	    ctl backup $BACKUP
 	    # Change ownership to root:root because ejabberd user might be
 	    # removed on package removal.
 	    chown -R root:root $BACKUPDIR

=== modified file 'debian/rules'
--- debian/rules	2012-02-01 01:50:40 +0000
+++ debian/rules	2014-07-10 22:50:00 +0000
@@ -24,7 +24,7 @@
 configure: configure-stamp
 configure-stamp: $(QUILT_STAMPFN)
 	dh_testdir
-
+	dh_autotools-dev_updateconfig
 	dh_auto_configure $(AUTO_OPTS) -- $(DEB_CONFIGURE_EXTRA_FLAGS) \
 		$(shell dpkg-buildflags --export=configure)
 
@@ -35,7 +35,7 @@
 build-arch: build-stamp
 build-indep: build-stamp
 
-build-stamp: configure-stamp  
+build-stamp: configure-stamp
 	dh_testdir
 
 	dh_auto_build $(AUTO_OPTS)
@@ -48,13 +48,13 @@
 	rm -f build-stamp configure-stamp
 
 	dh_auto_clean $(AUTO_OPTS)
-
-	dh_clean 
+	dh_autotools-dev_restoreconfig
+	dh_clean
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_prep  
+	dh_prep
 	dh_installdirs
 
 	dh_auto_install $(AUTO_OPTS)
@@ -72,6 +72,8 @@
 	# Remove autogenerated init-script:
 	rm $(CURDIR)/src/ejabberd.init
 
+	install -m644 debian/ejabberd.ufw.profile debian/ejabberd/etc/ufw/applications.d/ejabberd
+
 
 # Build architecture-independent files here.
 binary-indep: install
@@ -81,7 +83,7 @@
 binary-arch: install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs 
+	dh_installchangelogs
 	dh_installdocs
 	dh_installexamples
 	dh_install

=== modified file 'doc/api/overview.edoc'
--- doc/api/overview.edoc	2009-01-15 19:44:58 +0000
+++ doc/api/overview.edoc	2014-07-10 22:50:00 +0000
@@ -1,6 +1,6 @@
 @author Mickael Remond <[e-mail]>
   [http://www.process-one.net/]
-@copyright 2007 ProcessOne
+@copyright 2013 ProcessOne
 @version {@vsn}, {@date} {@time}
 @title ejabberd Development API Documentation
 

=== modified file 'doc/dev.html'
--- doc/dev.html	2012-01-08 11:45:38 +0000
+++ doc/dev.html	2014-07-10 22:50:00 +0000
@@ -2,7 +2,7 @@
             "http://www.w3.org/TR/REC-html40/loose.dtd">
 <HTML>
 <HEAD>
-<TITLE>Ejabberd 2.1.10 Developers Guide
+<TITLE>Ejabberd 2.1.13 Developers Guide
 </TITLE>
 
 <META http-equiv="Content-Type" content="text/html; charset=US-ASCII">
@@ -49,7 +49,7 @@
 <!--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.1.10 Developers Guide</H1><H3 CLASS="titlerest">Alexey Shchepin<BR>
+</P><TABLE CLASS="title"><TR><TD><H1 CLASS="titlemain">Ejabberd 2.1.13 Developers Guide</H1><H3 CLASS="titlerest">Alexey Shchepin<BR>
  <A HREF="mailto:[e-mail]"><TT>mailto:[e-mail]</TT></A><BR>
  <A HREF="xmpp:[e-mail]"><TT>xmpp:[e-mail]</TT></A></H3></TD></TR>
 </TABLE><DIV CLASS="center">

=== modified file 'doc/features.html'
--- doc/features.html	2012-01-08 11:45:38 +0000
+++ doc/features.html	2014-07-10 22:50:00 +0000
@@ -2,7 +2,7 @@
             "http://www.w3.org/TR/REC-html40/loose.dtd">
 <HTML>
 <HEAD>
-<TITLE>Ejabberd 2.1.10 Feature Sheet
+<TITLE>Ejabberd 2.1.13 Feature Sheet
 </TITLE>
 
 <META http-equiv="Content-Type" content="text/html; charset=US-ASCII">
@@ -50,7 +50,7 @@
 <!--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.1.10 Feature Sheet</H1><H3 CLASS="titlerest">Sander Devrieze<BR>
+</P><TABLE CLASS="title"><TR><TD><H1 CLASS="titlemain">Ejabberd 2.1.13 Feature Sheet</H1><H3 CLASS="titlerest">Sander Devrieze<BR>
  <A HREF="mailto:[e-mail]"><TT>mailto:[e-mail]</TT></A><BR>
  <A HREF="xmpp:[e-mail]"><TT>xmpp:[e-mail]</TT></A></H3></TD></TR>
 </TABLE><DIV CLASS="center">

=== modified file 'doc/guide.html'
--- doc/guide.html	2012-01-08 11:45:38 +0000
+++ doc/guide.html	2014-07-10 22:50:00 +0000
@@ -6,7 +6,7 @@
  
  
 
- ejabberd 2.1.10 
+ ejabberd 2.1.13 
  
  Installation and Operation Guide
  
@@ -76,7 +76,7 @@
 <HR SIZE=2><BR>
 <BR>
 
-<TABLE CELLSPACING=6 CELLPADDING=0><TR><TD ALIGN=right NOWRAP> <FONT SIZE=6><B>ejabberd 2.1.10 </B></FONT></TD></TR>
+<TABLE CELLSPACING=6 CELLPADDING=0><TR><TD ALIGN=right NOWRAP> <FONT SIZE=6><B>ejabberd 2.1.13 </B></FONT></TD></TR>
 <TR><TD ALIGN=right NOWRAP>&nbsp;</TD></TR>
 <TR><TD ALIGN=right NOWRAP> <FONT SIZE=6>Installation and Operation Guide</FONT></TD></TR>
 </TABLE><BR>
@@ -109,7 +109,7 @@
 </LI><LI CLASS="li-toc"><A HREF="#htoc15">2.4.7&#XA0;&#XA0;Specific Notes for Sun Solaris</A>
 </LI><LI CLASS="li-toc"><A HREF="#htoc16">2.4.8&#XA0;&#XA0;Specific Notes for Microsoft Windows</A>
 </LI></UL>
-</LI><LI CLASS="li-toc"><A HREF="#htoc17">2.5&#XA0;&#XA0;Create a XMPP Account for Administration</A>
+</LI><LI CLASS="li-toc"><A HREF="#htoc17">2.5&#XA0;&#XA0;Create an XMPP Account for Administration</A>
 </LI><LI CLASS="li-toc"><A HREF="#htoc18">2.6&#XA0;&#XA0;Upgrading <TT>ejabberd</TT></A>
 </LI></UL>
 </LI><LI CLASS="li-toc"><A HREF="#htoc19">Chapter&#XA0;3&#XA0;&#XA0;Configuring <TT>ejabberd</TT></A>
@@ -348,7 +348,7 @@
 GNU Make
 </LI><LI CLASS="li-itemize">GCC
 </LI><LI CLASS="li-itemize">Libexpat 1.95 or higher
-</LI><LI CLASS="li-itemize">Erlang/OTP R10B-9 or higher. The recommended versions are R12B-5 and R13B04.
+</LI><LI CLASS="li-itemize">Erlang/OTP R10B-9 or higher. The recommended versions are R13B04 and R14B04.
 Don&#X2019;t use R14A or R14B because <A HREF="http://www.erlang.org/cgi-bin/ezmlm-cgi/4/54598">they have a bug</A>.
 </LI><LI CLASS="li-itemize">OpenSSL 0.9.8 or higher, for STARTTLS, SASL and SSL encryption.
 </LI><LI CLASS="li-itemize">Zlib 1.2.3 or higher, for Stream Compression support (<A HREF="http://xmpp.org/extensions/xep-0138.html">XEP-0138</A>). Optional.
@@ -513,16 +513,16 @@
 nmake -f Makefile.win32
 </PRE></LI><LI CLASS="li-enumerate">Edit the file <CODE>ejabberd\src\ejabberd.cfg</CODE> and run
 <PRE CLASS="verbatim">werl -s ejabberd -name ejabberd
-</PRE></LI></OL><P> <A NAME="initialadmin"></A> </P><!--TOC section Create a XMPP Account for Administration-->
-<H2 CLASS="section"><!--SEC ANCHOR --><A NAME="htoc17">2.5</A>&#XA0;&#XA0;<A HREF="#initialadmin">Create a XMPP Account for Administration</A></H2><!--SEC END --><P> <A NAME="initialadmin"></A> </P><P>You need a XMPP account and grant him administrative privileges
+</PRE></LI></OL><P> <A NAME="initialadmin"></A> </P><!--TOC section Create an XMPP Account for Administration-->
+<H2 CLASS="section"><!--SEC ANCHOR --><A NAME="htoc17">2.5</A>&#XA0;&#XA0;<A HREF="#initialadmin">Create an XMPP Account for Administration</A></H2><!--SEC END --><P> <A NAME="initialadmin"></A> </P><P>You need an XMPP account and grant him administrative privileges
 to enter the <TT>ejabberd</TT> Web Admin:
 </P><OL CLASS="enumerate" type=1><LI CLASS="li-enumerate">
-Register a XMPP account on your <TT>ejabberd</TT> server, for example <TT>[e-mail]</TT>.
-There are two ways to register a XMPP account:
+Register an XMPP account on your <TT>ejabberd</TT> server, for example <TT>[e-mail]</TT>.
+There are two ways to register an XMPP account:
 <OL CLASS="enumerate" type=a><LI CLASS="li-enumerate">
 Using <TT>ejabberdctl</TT> (see section&#XA0;<A HREF="#ejabberdctl">4.1</A>):
 <PRE CLASS="verbatim">ejabberdctl register admin1 example.org FgT5bk3
-</PRE></LI><LI CLASS="li-enumerate">Using a XMPP client and In-Band Registration (see section&#XA0;<A HREF="#modregister">3.3.19</A>).
+</PRE></LI><LI CLASS="li-enumerate">Using an XMPP client and In-Band Registration (see section&#XA0;<A HREF="#modregister">3.3.19</A>).
 </LI></OL>
 </LI><LI CLASS="li-enumerate">Edit the <TT>ejabberd</TT> configuration file to give administration rights to the XMPP account you created:
 <PRE CLASS="verbatim">{acl, admin, {user, "admin1", "example.org"}}.
@@ -688,14 +688,14 @@
 Interacts with an <A HREF="http://www.ejabberd.im/tutorials-transports">external component</A>
 (as defined in the Jabber Component Protocol (<A HREF="http://xmpp.org/extensions/xep-0114.html">XEP-0114</A>).<BR>
  Options: <TT>access</TT>, <TT>hosts</TT>, <TT>max_fsm_queue</TT>,
-<TT>service_check_from</TT>, <TT>shaper</TT>
+<TT>service_check_from</TT>, <TT>shaper_rule</TT>
 </DD><DT CLASS="dt-description"><B><TT>ejabberd_stun</TT></B></DT><DD CLASS="dd-description">
 Handles STUN Binding requests as defined in
 <A HREF="http://tools.ietf.org/html/rfc5389">RFC 5389</A>.<BR>
  Options: <TT>certfile</TT>
 </DD><DT CLASS="dt-description"><B><TT>ejabberd_http</TT></B></DT><DD CLASS="dd-description">
 Handles incoming HTTP connections.<BR>
- Options: <TT>captcha</TT>, <TT>certfile</TT>, <TT>http_bind</TT>, <TT>http_poll</TT>,
+ Options: <TT>captcha</TT>, <TT>certfile</TT>, <TT>default_host</TT>, <TT>http_bind</TT>, <TT>http_poll</TT>,
 <TT>request_handlers</TT>, <TT>tls</TT>, <TT>trusted_proxies</TT>, <TT>web_admin</TT><BR>
 </DD></DL><P> <A NAME="listened-options"></A> </P><!--TOC subsubsection Options-->
 <H4 CLASS="subsubsection"><!--SEC ANCHOR --><A HREF="#listened-options">Options</A></H4><!--SEC END --><P> <A NAME="listened-options"></A> </P><P>This is a detailed description of each option allowed by the listening modules:
@@ -712,6 +712,11 @@
 Simple web page that allows a user to fill a CAPTCHA challenge (see section <A HREF="#captcha">3.1.8</A>).
 </DD><DT CLASS="dt-description"><B><TT>{certfile, Path}</TT></B></DT><DD CLASS="dd-description"> Full path to a file containing the default SSL certificate.
 To define a certificate file specific for a given domain, use the global option <TT>domain_certfile</TT>.
+</DD><DT CLASS="dt-description"><B><TT>{default_host, undefined|HostName}</TT></B></DT><DD CLASS="dd-description">
+If the HTTP request received by ejabberd contains the HTTP header <TT>Host</TT>
+with an ambiguous virtual host that doesn&#X2019;t match any one defined in ejabberd (see <A HREF="#hostnames">3.1.1</A>),
+then this configured HostName is set as the request Host.
+The default value of this option is: <TT>undefined</TT>.
 </DD><DT CLASS="dt-description"><B><TT>{hosts, [Hostname, ...], [HostOption, ...]}</TT></B></DT><DD CLASS="dd-description"> 
 The external Jabber component that connects to this <TT>ejabberd_service</TT>
 can serve one or more hostnames.
@@ -787,6 +792,9 @@
 </DD><DT CLASS="dt-description"><B><TT>{shaper, none|ShaperName}</TT></B></DT><DD CLASS="dd-description"> This option defines a
 shaper for the port (see section&#XA0;<A HREF="#shapers">3.1.6</A>). The default value
 is <TT>none</TT>.
+</DD><DT CLASS="dt-description"><B><TT>{shaper_rule, none|ShaperRule}</TT></B></DT><DD CLASS="dd-description"> This option defines a
+shaper rule for the <TT>ejabberd_service</TT> (see section&#XA0;<A HREF="#shapers">3.1.6</A>). The recommended value
+is <TT>fast</TT>.
 </DD><DT CLASS="dt-description"><B><TT>starttls</TT></B></DT><DD CLASS="dd-description"> This option
 specifies that STARTTLS encryption is available on connections to the port.
 You should also set the <TT>certfile</TT> option.
@@ -1059,7 +1067,11 @@
 <A HREF="http://tools.ietf.org/html/rfc6120#section-7.7.2.2">XMPP Core: section 7.7.2.2</A>.
 The default value is <TT>closeold</TT>.
 If the client uses old Jabber Non-SASL authentication (<A HREF="http://xmpp.org/extensions/xep-0078.html">XEP-0078</A>),
-then this option is not respected, and the action performed is <TT>closeold</TT>.</P><P> <A NAME="internalauth"></A> </P><!--TOC subsubsection Internal-->
+then this option is not respected, and the action performed is <TT>closeold</TT>.</P><P>The option <TT>fqdn</TT> allows you to define the Fully Qualified Domain Name
+of the machine, in case it isn&#X2019;t detected automatically.
+The FQDN is used to authenticate some clients that use the DIGEST-MD5 SASL mechanism.
+The option syntax is:
+</P><DL CLASS="description"><DT CLASS="dt-description"><B><TT>{fqdn, undefined|FqdnString|[FqdnString]}.</TT></B></DT></DL><P> <A NAME="internalauth"></A> </P><!--TOC subsubsection Internal-->
 <H4 CLASS="subsubsection"><!--SEC ANCHOR --><A HREF="#internalauth">Internal</A></H4><!--SEC END --><P> <A NAME="internalauth"></A> 
 </P><P><TT>ejabberd</TT> uses its internal Mnesia database as the default authentication method.
 The value <TT>internal</TT> will enable the internal authentication method.</P><P>The option <TT>{auth_password_format, plain|scram}</TT>
@@ -1106,7 +1118,7 @@
 the authentication information since the user last disconnected,
 to verify again the user authentication without querying again the extauth script.
 Note: caching should not be enabled in a host if internal auth is also enabled.
-If caching is enabled, <TT>mod_last</TT> or <TT>mod_last_odbc</TT> must be enabled also in that vhost.
+If caching is enabled, <TT>mod_last</TT> must be enabled also in that vhost.
 </DD></DL><P>This example sets external authentication, the extauth script, enables caching for 10 minutes,
 and starts three instances of the script for each virtual host defined in ejabberd:
 </P><PRE CLASS="verbatim">{auth_method, [external]}.
@@ -1201,7 +1213,7 @@
 </LI><LI CLASS="li-itemize">You may want to allow login access only for certain users. <TT>pam_listfile.so</TT>
 module provides such functionality.
 </LI><LI CLASS="li-itemize">If you use <TT>pam_winbind</TT> to authorise against a Windows Active Directory,
-then <TT>/etc/nssswitch.conf</TT> must be configured to use <TT>winbind</TT> as well.
+then <TT>/etc/nsswitch.conf</TT> must be configured to use <TT>winbind</TT> as well.
 </LI></UL><P> <A NAME="accessrules"></A> </P><!--TOC subsection Access Rules-->
 <H3 CLASS="subsection"><!--SEC ANCHOR --><A NAME="htoc25">3.1.5</A>&#XA0;&#XA0;<A HREF="#accessrules">Access Rules</A></H3><!--SEC END --><P> <A NAME="accessrules"></A> 
 </P><P> <A NAME="ACLDefinition"></A> </P><!--TOC subsubsection ACL Definition-->
@@ -1340,7 +1352,7 @@
 </P><DL CLASS="description"><DT CLASS="dt-description">
 <B><TT>{captcha_cmd, Path}</TT></B></DT><DD CLASS="dd-description"> 
 Full path to a script that generates the image.
-The default value is an empty string: <TT>""</TT>
+The default value disables the feature: <TT>undefined</TT>
 </DD><DT CLASS="dt-description"><B><TT>{captcha_host, ProtocolHostPort}</TT></B></DT><DD CLASS="dd-description"> 
 ProtocolHostPort is a string with the host, and optionally the Protocol and Port number.
 It must identify where ejabberd listens for CAPTCHA requests.
@@ -1560,12 +1572,10 @@
 </PRE><P> <A NAME="mysqlstorage"></A> </P><!--TOC subsubsection Storage-->
 <H4 CLASS="subsubsection"><!--SEC ANCHOR --><A HREF="#mysqlstorage">Storage</A></H4><!--SEC END --><P> <A NAME="mysqlstorage"></A> 
 </P><P>MySQL also can be used to store information into from several <TT>ejabberd</TT>
-modules. See section&#XA0;<A HREF="#modoverview">3.3.1</A> to see which modules have a version
-with the &#X2018;_odbc&#X2019;. This suffix indicates that the module can be used with
+modules. See section&#XA0;<A HREF="#modoverview">3.3.1</A> to see which modules can be used with
 relational databases like MySQL. To enable storage to your database, just make
-sure that your database is running well (see previous sections), and replace the
-suffix-less or ldap module variant with the odbc module variant. Keep in mind
-that you cannot have several variants of the same module loaded!</P><P> <A NAME="mssql"></A> </P><!--TOC subsection Microsoft SQL Server-->
+sure that your database is running well (see previous sections), and add the
+module option <TT>{db_type, odbc}</TT>.</P><P> <A NAME="mssql"></A> </P><!--TOC subsection Microsoft SQL Server-->
 <H3 CLASS="subsection"><!--SEC ANCHOR --><A NAME="htoc34">3.2.2</A>&#XA0;&#XA0;<A HREF="#mssql">Microsoft SQL Server</A></H3><!--SEC END --><P> <A NAME="mssql"></A> 
 </P><P>Although this section will describe <TT>ejabberd</TT>&#X2019;s configuration when you want to
 use Microsoft SQL Server, it does not describe Microsoft SQL Server&#X2019;s
@@ -1592,13 +1602,10 @@
 ODBC compatible servers (see section&#XA0;<A HREF="#odbcauth">3.2.4</A>).</P><P> <A NAME="mssqlstorage"></A> </P><!--TOC subsubsection Storage-->
 <H4 CLASS="subsubsection"><!--SEC ANCHOR --><A HREF="#mssqlstorage">Storage</A></H4><!--SEC END --><P> <A NAME="mssqlstorage"></A> 
 </P><P>Microsoft SQL Server also can be used to store information into from several
-<TT>ejabberd</TT> modules. See section&#XA0;<A HREF="#modoverview">3.3.1</A> to see which modules have
-a version with the &#X2018;_odbc&#X2019;. This suffix indicates that the module can be used
-with relational databases like Microsoft SQL Server. To enable storage to your
-database, just make sure that your database is running well (see previous
-sections), and replace the suffix-less or ldap module variant with the odbc
-module variant. Keep in mind that you cannot have several variants of the same
-module loaded!</P><P> <A NAME="pgsql"></A> </P><!--TOC subsection PostgreSQL-->
+modules. See section&#XA0;<A HREF="#modoverview">3.3.1</A> to see which modules can be used with
+relational databases like MySQL. To enable storage to your database, just make
+sure that your database is running well (see previous sections), and add the
+module option <TT>{db_type, odbc}</TT>.</P><P> <A NAME="pgsql"></A> </P><!--TOC subsection PostgreSQL-->
 <H3 CLASS="subsection"><!--SEC ANCHOR --><A NAME="htoc35">3.2.3</A>&#XA0;&#XA0;<A HREF="#pgsql">PostgreSQL</A></H3><!--SEC END --><P> <A NAME="pgsql"></A> 
 </P><P>Although this section will describe <TT>ejabberd</TT>&#X2019;s configuration when you want to
 use the native PostgreSQL driver, it does not describe PostgreSQL&#X2019;s installation
@@ -1650,12 +1657,10 @@
 </PRE><P> <A NAME="pgsqlstorage"></A> </P><!--TOC subsubsection Storage-->
 <H4 CLASS="subsubsection"><!--SEC ANCHOR --><A HREF="#pgsqlstorage">Storage</A></H4><!--SEC END --><P> <A NAME="pgsqlstorage"></A> 
 </P><P>PostgreSQL also can be used to store information into from several <TT>ejabberd</TT>
-modules. See section&#XA0;<A HREF="#modoverview">3.3.1</A> to see which modules have a version
-with the &#X2018;_odbc&#X2019;. This suffix indicates that the module can be used with
-relational databases like PostgreSQL. To enable storage to your database, just
-make sure that your database is running well (see previous sections), and
-replace the suffix-less or ldap module variant with the odbc module variant.
-Keep in mind that you cannot have several variants of the same module loaded!</P><P> <A NAME="odbc"></A> </P><!--TOC subsection ODBC Compatible-->
+modules. See section&#XA0;<A HREF="#modoverview">3.3.1</A> to see which modules can be used with
+relational databases like MySQL. To enable storage to your database, just make
+sure that your database is running well (see previous sections), and add the
+module option <TT>{db_type, odbc}</TT>.</P><P> <A NAME="odbc"></A> </P><!--TOC subsection ODBC Compatible-->
 <H3 CLASS="subsection"><!--SEC ANCHOR --><A NAME="htoc36">3.2.4</A>&#XA0;&#XA0;<A HREF="#odbc">ODBC Compatible</A></H3><!--SEC END --><P> <A NAME="odbc"></A> 
 </P><P>Although this section will describe <TT>ejabberd</TT>&#X2019;s configuration when you want to
 use the ODBC driver, it does not describe the installation and database creation
@@ -1694,13 +1699,11 @@
 </PRE><P> <A NAME="odbcstorage"></A> </P><!--TOC subsubsection Storage-->
 <H4 CLASS="subsubsection"><!--SEC ANCHOR --><A HREF="#odbcstorage">Storage</A></H4><!--SEC END --><P> <A NAME="odbcstorage"></A> 
 </P><P>An ODBC compatible database also can be used to store information into from
-several <TT>ejabberd</TT> modules. See section&#XA0;<A HREF="#modoverview">3.3.1</A> to see which
-modules have a version with the &#X2018;_odbc&#X2019;. This suffix indicates that the module
-can be used with ODBC compatible relational databases. To enable storage to your
-database, just make sure that your database is running well (see previous
-sections), and replace the suffix-less or ldap module variant with the odbc
-module variant. Keep in mind that you cannot have several variants of the same
-module loaded!</P><P> <A NAME="ldap"></A> </P><!--TOC subsection LDAP-->
+several <TT>ejabberd</TT>
+modules. See section&#XA0;<A HREF="#modoverview">3.3.1</A> to see which modules can be used with
+relational databases like MySQL. To enable storage to your database, just make
+sure that your database is running well (see previous sections), and add the
+module option <TT>{db_type, odbc}</TT>.</P><P> <A NAME="ldap"></A> </P><!--TOC subsection LDAP-->
 <H3 CLASS="subsection"><!--SEC ANCHOR --><A NAME="htoc37">3.2.5</A>&#XA0;&#XA0;<A HREF="#ldap">LDAP</A></H3><!--SEC END --><P> <A NAME="ldap"></A> 
 </P><P><TT>ejabberd</TT> has built-in LDAP support. You can authenticate users against LDAP
 server and use LDAP directory as vCard storage.</P><P>Usually <TT>ejabberd</TT> treats LDAP as a read-only storage:
@@ -1959,61 +1962,37 @@
 <TR><TD ALIGN=left NOWRAP><A HREF="#modhttpfileserver"><TT>mod_http_fileserver</TT></A></TD><TD ALIGN=left NOWRAP>Small HTTP file server</TD><TD ALIGN=left NOWRAP>&nbsp;</TD></TR>
 <TR><TD ALIGN=left NOWRAP><A HREF="#modirc"><TT>mod_irc</TT></A></TD><TD ALIGN=left NOWRAP>IRC transport</TD><TD ALIGN=left NOWRAP>&nbsp;</TD></TR>
 <TR><TD ALIGN=left NOWRAP><A HREF="#modlast"><TT>mod_last</TT></A></TD><TD ALIGN=left NOWRAP>Last Activity (<A HREF="http://xmpp.org/extensions/xep-0012.html">XEP-0012</A>)</TD><TD ALIGN=left NOWRAP>&nbsp;</TD></TR>
-<TR><TD ALIGN=left NOWRAP><A HREF="#modlast"><TT>mod_last_odbc</TT></A></TD><TD ALIGN=left NOWRAP>Last Activity (<A HREF="http://xmpp.org/extensions/xep-0012.html">XEP-0012</A>)</TD><TD ALIGN=left NOWRAP>supported DB (*)</TD></TR>
 <TR><TD ALIGN=left NOWRAP><A HREF="#modmuc"><TT>mod_muc</TT></A></TD><TD ALIGN=left NOWRAP>Multi-User Chat (<A HREF="http://xmpp.org/extensions/xep-0045.html">XEP-0045</A>)</TD><TD ALIGN=left NOWRAP>&nbsp;</TD></TR>
 <TR><TD ALIGN=left NOWRAP><A HREF="#modmuclog"><TT>mod_muc_log</TT></A></TD><TD ALIGN=left NOWRAP>Multi-User Chat room logging</TD><TD ALIGN=left NOWRAP><TT>mod_muc</TT></TD></TR>
 <TR><TD ALIGN=left NOWRAP><A HREF="#modoffline"><TT>mod_offline</TT></A></TD><TD ALIGN=left NOWRAP>Offline message storage (<A HREF="http://xmpp.org/extensions/xep-0160.html">XEP-0160</A>)</TD><TD ALIGN=left NOWRAP>&nbsp;</TD></TR>
-<TR><TD ALIGN=left NOWRAP><A HREF="#modoffline"><TT>mod_offline_odbc</TT></A></TD><TD ALIGN=left NOWRAP>Offline message storage (<A HREF="http://xmpp.org/extensions/xep-0160.html">XEP-0160</A>)</TD><TD ALIGN=left NOWRAP>supported DB (*)</TD></TR>
 <TR><TD ALIGN=left NOWRAP><A HREF="#modping"><TT>mod_ping</TT></A></TD><TD ALIGN=left NOWRAP>XMPP Ping and periodic keepalives (<A HREF="http://xmpp.org/extensions/xep-0199.html">XEP-0199</A>)</TD><TD ALIGN=left NOWRAP>&nbsp;</TD></TR>
 <TR><TD ALIGN=left NOWRAP><A HREF="#modprescounter"><TT>mod_pres_counter</TT></A></TD><TD ALIGN=left NOWRAP>Detect presence subscription flood</TD><TD ALIGN=left NOWRAP>&nbsp;</TD></TR>
 <TR><TD ALIGN=left NOWRAP><A HREF="#modprivacy"><TT>mod_privacy</TT></A></TD><TD ALIGN=left NOWRAP>Blocking Communication (<A HREF="http://xmpp.org/extensions/xep-0016.html">XEP-0016</A>)</TD><TD ALIGN=left NOWRAP>&nbsp;</TD></TR>
-<TR><TD ALIGN=left NOWRAP><A HREF="#modprivacy"><TT>mod_privacy_odbc</TT></A></TD><TD ALIGN=left NOWRAP>Blocking Communication (<A HREF="http://xmpp.org/extensions/xep-0016.html">XEP-0016</A>)</TD><TD ALIGN=left NOWRAP>supported DB (*)</TD></TR>
 <TR><TD ALIGN=left NOWRAP><A HREF="#modprivate"><TT>mod_private</TT></A></TD><TD ALIGN=left NOWRAP>Private XML Storage (<A HREF="http://xmpp.org/extensions/xep-0049.html">XEP-0049</A>)</TD><TD ALIGN=left NOWRAP>&nbsp;</TD></TR>
-<TR><TD ALIGN=left NOWRAP><A HREF="#modprivate"><TT>mod_private_odbc</TT></A></TD><TD ALIGN=left NOWRAP>Private XML Storage (<A HREF="http://xmpp.org/extensions/xep-0049.html">XEP-0049</A>)</TD><TD ALIGN=left NOWRAP>supported DB (*)</TD></TR>
 <TR><TD ALIGN=left NOWRAP><A HREF="#modproxy"><TT>mod_proxy65</TT></A></TD><TD ALIGN=left NOWRAP>SOCKS5 Bytestreams (<A HREF="http://xmpp.org/extensions/xep-0065.html">XEP-0065</A>)</TD><TD ALIGN=left NOWRAP>&nbsp;</TD></TR>
 <TR><TD ALIGN=left NOWRAP><A HREF="#modpubsub"><TT>mod_pubsub</TT></A></TD><TD ALIGN=left NOWRAP>Pub-Sub (<A HREF="http://xmpp.org/extensions/xep-0060.html">XEP-0060</A>), PEP (<A HREF="http://xmpp.org/extensions/xep-0163.html">XEP-0163</A>)</TD><TD ALIGN=left NOWRAP><TT>mod_caps</TT></TD></TR>
 <TR><TD ALIGN=left NOWRAP><A HREF="#modpubsub"><TT>mod_pubsub_odbc</TT></A></TD><TD ALIGN=left NOWRAP>Pub-Sub (<A HREF="http://xmpp.org/extensions/xep-0060.html">XEP-0060</A>), PEP (<A HREF="http://xmpp.org/extensions/xep-0163.html">XEP-0163</A>)</TD><TD ALIGN=left NOWRAP>supported DB (*) and <TT>mod_caps</TT></TD></TR>
 <TR><TD ALIGN=left NOWRAP><A HREF="#modregister"><TT>mod_register</TT></A></TD><TD ALIGN=left NOWRAP>In-Band Registration (<A HREF="http://xmpp.org/extensions/xep-0077.html">XEP-0077</A>)</TD><TD ALIGN=left NOWRAP>&nbsp;</TD></TR>
 <TR><TD ALIGN=left NOWRAP><A HREF="#modregisterweb"><TT>mod_register_web</TT></A></TD><TD ALIGN=left NOWRAP>Web for Account Registrations</TD><TD ALIGN=left NOWRAP>&nbsp;</TD></TR>
 <TR><TD ALIGN=left NOWRAP><A HREF="#modroster"><TT>mod_roster</TT></A></TD><TD ALIGN=left NOWRAP>Roster management (XMPP IM)</TD><TD ALIGN=left NOWRAP>&nbsp;</TD></TR>
-<TR><TD ALIGN=left NOWRAP><A HREF="#modroster"><TT>mod_roster_odbc</TT></A></TD><TD ALIGN=left NOWRAP>Roster management (XMPP IM)</TD><TD ALIGN=left NOWRAP>supported DB (*)</TD></TR>
 <TR><TD ALIGN=left NOWRAP><A HREF="#modservicelog"><TT>mod_service_log</TT></A></TD><TD ALIGN=left NOWRAP>Copy user messages to logger service</TD><TD ALIGN=left NOWRAP>&nbsp;</TD></TR>
-<TR><TD ALIGN=left NOWRAP><A HREF="#modsharedroster"><TT>mod_shared_roster</TT></A></TD><TD ALIGN=left NOWRAP>Shared roster management</TD><TD ALIGN=left NOWRAP><TT>mod_roster</TT> or</TD></TR>
-<TR><TD ALIGN=left NOWRAP>&nbsp;</TD><TD ALIGN=left NOWRAP>&nbsp;</TD><TD ALIGN=left NOWRAP><TT>mod_roster_odbc</TT></TD></TR>
-<TR><TD ALIGN=left NOWRAP><A HREF="#modsharedrosterldap"><TT>mod_shared_roster_ldap</TT></A></TD><TD ALIGN=left NOWRAP>LDAP Shared roster management</TD><TD ALIGN=left NOWRAP><TT>mod_roster</TT> or</TD></TR>
-<TR><TD ALIGN=left NOWRAP>&nbsp;</TD><TD ALIGN=left NOWRAP>&nbsp;</TD><TD ALIGN=left NOWRAP><TT>mod_roster_odbc</TT></TD></TR>
+<TR><TD ALIGN=left NOWRAP><A HREF="#modsharedroster"><TT>mod_shared_roster</TT></A></TD><TD ALIGN=left NOWRAP>Shared roster management</TD><TD ALIGN=left NOWRAP><TT>mod_roster</TT></TD></TR>
+<TR><TD ALIGN=left NOWRAP><A HREF="#modsharedrosterldap"><TT>mod_shared_roster_ldap</TT></A></TD><TD ALIGN=left NOWRAP>LDAP Shared roster management</TD><TD ALIGN=left NOWRAP><TT>mod_roster</TT></TD></TR>
 <TR><TD ALIGN=left NOWRAP><A HREF="#modsic"><TT>mod_sic</TT></A></TD><TD ALIGN=left NOWRAP>Server IP Check (<A HREF="http://xmpp.org/extensions/xep-0279.html">XEP-0279</A>)</TD><TD ALIGN=left NOWRAP>&nbsp;</TD></TR>
 <TR><TD ALIGN=left NOWRAP><A HREF="#modstats"><TT>mod_stats</TT></A></TD><TD ALIGN=left NOWRAP>Statistics Gathering (<A HREF="http://xmpp.org/extensions/xep-0039.html">XEP-0039</A>)</TD><TD ALIGN=left NOWRAP>&nbsp;</TD></TR>
 <TR><TD ALIGN=left NOWRAP><A HREF="#modtime"><TT>mod_time</TT></A></TD><TD ALIGN=left NOWRAP>Entity Time (<A HREF="http://xmpp.org/extensions/xep-0202.html">XEP-0202</A>)</TD><TD ALIGN=left NOWRAP>&nbsp;</TD></TR>
 <TR><TD ALIGN=left NOWRAP><A HREF="#modvcard"><TT>mod_vcard</TT></A></TD><TD ALIGN=left NOWRAP>vcard-temp (<A HREF="http://xmpp.org/extensions/xep-0054.html">XEP-0054</A>)</TD><TD ALIGN=left NOWRAP>&nbsp;</TD></TR>
 <TR><TD ALIGN=left NOWRAP><A HREF="#modvcardldap"><TT>mod_vcard_ldap</TT></A></TD><TD ALIGN=left NOWRAP>vcard-temp (<A HREF="http://xmpp.org/extensions/xep-0054.html">XEP-0054</A>)</TD><TD ALIGN=left NOWRAP>LDAP server</TD></TR>
-<TR><TD ALIGN=left NOWRAP><A HREF="#modvcard"><TT>mod_vcard_odbc</TT></A></TD><TD ALIGN=left NOWRAP>vcard-temp (<A HREF="http://xmpp.org/extensions/xep-0054.html">XEP-0054</A>)</TD><TD ALIGN=left NOWRAP>supported DB (*)</TD></TR>
-<TR><TD ALIGN=left NOWRAP><A HREF="#modvcardxupdate"><TT>mod_vcard_xupdate</TT></A></TD><TD ALIGN=left NOWRAP>vCard-Based Avatars (<A HREF="http://xmpp.org/extensions/xep-0153.html">XEP-0153</A>)</TD><TD ALIGN=left NOWRAP><TT>mod_vcard</TT> or <TT>mod_vcard_odbc</TT></TD></TR>
+<TR><TD ALIGN=left NOWRAP><A HREF="#modvcardxupdate"><TT>mod_vcard_xupdate</TT></A></TD><TD ALIGN=left NOWRAP>vCard-Based Avatars (<A HREF="http://xmpp.org/extensions/xep-0153.html">XEP-0153</A>)</TD><TD ALIGN=left NOWRAP><TT>mod_vcard</TT></TD></TR>
 <TR><TD ALIGN=left NOWRAP><A HREF="#modversion"><TT>mod_version</TT></A></TD><TD ALIGN=left NOWRAP>Software Version (<A HREF="http://xmpp.org/extensions/xep-0092.html">XEP-0092</A>)</TD><TD ALIGN=left NOWRAP>&nbsp;</TD></TR>
 </TABLE>
 <DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE><UL CLASS="itemize"><LI CLASS="li-itemize">
 (*) This module requires a supported database. For a list of supported databases, see section&#XA0;<A HREF="#database">3.2</A>.
 </LI></UL><P>You can see which database backend each module needs by looking at the suffix:
 </P><UL CLASS="itemize"><LI CLASS="li-itemize">
-No suffix, this means that the modules uses Erlang&#X2019;s built-in database
-Mnesia as backend.
-</LI><LI CLASS="li-itemize">&#X2018;_odbc&#X2019;, this means that the module needs a supported database
-(see&#XA0;<A HREF="#database">3.2</A>) as backend.
+No suffix, this means that the module uses Erlang&#X2019;s built-in database
+Mnesia as backend, or a ODBC database in some cases (see&#XA0;<A HREF="#database">3.2</A>).
 </LI><LI CLASS="li-itemize">&#X2018;_ldap&#X2019;, this means that the module needs an LDAP server as backend.
-</LI></UL><P>If you want to,
-it is possible to use a relational database to store the tables created by some ejabberd modules.
-You can do this by changing the module name to a name with an
-<TT>_odbc</TT> suffix in <TT>ejabberd</TT> config file. You can use a relational
-database for the following data:</P><UL CLASS="itemize"><LI CLASS="li-itemize">
-Last connection date and time: Use <TT>mod_last_odbc</TT> instead of
-<TT>mod_last</TT>.
-</LI><LI CLASS="li-itemize">Offline messages: Use <TT>mod_offline_odbc</TT> instead of
-<TT>mod_offline</TT>.
-</LI><LI CLASS="li-itemize">Rosters: Use <TT>mod_roster_odbc</TT> instead of <TT>mod_roster</TT>.
-</LI><LI CLASS="li-itemize">Users&#X2019; VCARD: Use <TT>mod_vcard_odbc</TT> instead of <TT>mod_vcard</TT>.
-</LI><LI CLASS="li-itemize">Private XML storage: Use <TT>mod_private_odbc</TT> instead of <TT>mod_private</TT>.
-</LI><LI CLASS="li-itemize">User rules for blocking communications: Use <TT>mod_privacy_odbc</TT> instead of <TT>mod_privacy</TT>.
-</LI><LI CLASS="li-itemize">Pub-Sub nodes, items and subscriptions: Use <TT>mod_pubsub_odbc</TT> instead of <TT>mod_pubsub</TT>.
 </LI></UL><P>You can find more
 <A HREF="http://www.ejabberd.im/contributions">contributed modules</A> on the
 <TT>ejabberd</TT> website. Please remember that these contributions might not work or
@@ -2105,7 +2084,11 @@
 Any message sent to this JID removes the existing message of the day (MOTD).
 </DD></DL><P>Options:
 </P><DL CLASS="description"><DT CLASS="dt-description">
-<B><TT>{access, AccessName}</TT></B></DT><DD CLASS="dd-description"> This option specifies who is allowed to
+<B><TT>{db_type, mnesia|odbc}</TT></B></DT><DD CLASS="dd-description"> 
+Define the type of storage where the module will create the tables and store user information.
+The default is to store in the internal Mnesia database.
+If <TT>odbc</TT> value is defined, make sure you have defined the database, see&#XA0;<A HREF="#database">3.2</A>.
+</DD><DT CLASS="dt-description"><B><TT>{access, AccessName}</TT></B></DT><DD CLASS="dd-description"> This option specifies who is allowed to
 send announcements and to set the message of the day (by default, nobody is
 able to send such messages).
 </DD></DL><P>Examples:
@@ -2381,6 +2364,10 @@
 hostname of the virtual host with the prefix &#X2018;<TT>irc.</TT>&#X2019;. The keyword "@HOST@"
 is replaced at start time with the real virtual host name.
 
+</DD><DT CLASS="dt-description"><B><TT>{db_type, mnesia|odbc}</TT></B></DT><DD CLASS="dd-description"> 
+Define the type of storage where the module will create the tables and store user information.
+The default is to store in the internal Mnesia database.
+If <TT>odbc</TT> value is defined, make sure you have defined the database, see&#XA0;<A HREF="#database">3.2</A>.
 </DD><DT CLASS="dt-description"><B><TT>{access, AccessName}</TT></B></DT><DD CLASS="dd-description"> This option can be used to specify who
 may use the IRC transport (default value: <TT>all</TT>).
 </DD><DT CLASS="dt-description"><B><TT>{default_encoding, Encoding}</TT></B></DT><DD CLASS="dd-description"> Set the default IRC encoding.
@@ -2421,6 +2408,10 @@
 </P><DL CLASS="description"><DT CLASS="dt-description">
 <B><TT>{iqdisc, Discipline}</TT></B></DT><DD CLASS="dd-description"> This specifies
 the processing discipline for Last activity (<TT>jabber:iq:last</TT>) IQ queries (see section&#XA0;<A HREF="#modiqdiscoption">3.3.2</A>).
+</DD><DT CLASS="dt-description"><B><TT>{db_type, mnesia|odbc}</TT></B></DT><DD CLASS="dd-description"> 
+Define the type of storage where the module will create the tables and store user information.
+The default is to store in the internal Mnesia database.
+If <TT>odbc</TT> value is defined, make sure you have defined the database, see&#XA0;<A HREF="#database">3.2</A>.
 </DD></DL><P> <A NAME="modmuc"></A> </P><!--TOC subsection <TT>mod_muc</TT>-->
 <H3 CLASS="subsection"><!--SEC ANCHOR --><A NAME="htoc48">3.3.10</A>&#XA0;&#XA0;<A HREF="#modmuc"><TT>mod_muc</TT></A></H3><!--SEC END --><P> <A NAME="modmuc"></A> 
 </P><P>This module provides a Multi-User Chat (<A HREF="http://xmpp.org/extensions/xep-0045.html">XEP-0045</A>) service.
@@ -2449,6 +2440,10 @@
 hostname of the virtual host with the prefix &#X2018;<TT>conference.</TT>&#X2019;. The keyword "@HOST@"
 is replaced at start time with the real virtual host name.
 
+</DD><DT CLASS="dt-description"><B><TT>{db_type, mnesia|odbc}</TT></B></DT><DD CLASS="dd-description"> 
+Define the type of storage where the module will create the tables and store user information.
+The default is to store in the internal Mnesia database.
+If <TT>odbc</TT> value is defined, make sure you have defined the database, see&#XA0;<A HREF="#database">3.2</A>.
 </DD><DT CLASS="dt-description"><B><TT>{access, AccessName}</TT></B></DT><DD CLASS="dd-description"> You can specify who is allowed to use
 the Multi-User Chat service. By default everyone is allowed to use it.
 </DD><DT CLASS="dt-description"><B><TT>{access_create, AccessName}</TT></B></DT><DD CLASS="dd-description"> To configure who is
@@ -2526,7 +2521,7 @@
 </DD><DT CLASS="dt-description"><B><TT>{default_room_options, [ {OptionName, OptionValue}, ...]}</TT></B></DT><DD CLASS="dd-description"> 
 This module option allows to define the desired default room options.
 Note that the creator of a room can modify the options of his room
-at any time using a XMPP client with MUC capability.
+at any time using an XMPP client with MUC capability.
 The available room options and the default values are:
 <DL CLASS="description"><DT CLASS="dt-description">
 <B><TT>{allow_change_subj, true|false}</TT></B></DT><DD CLASS="dd-description"> Allow occupants to change the subject.
@@ -2702,6 +2697,10 @@
 <TT>html</TT> stores in HTML format,
 <TT>plaintext</TT> stores in plain text.
 The default value is <TT>html</TT>.
+</DD><DT CLASS="dt-description"><B><TT>{file_permissions, {Mode, Group}}</TT></B></DT><DD CLASS="dd-description">
+Define the permissions that must be used when creating the log files:
+the number of the mode, and the numeric id of the group that will own the files.
+The default value is <TT>{644, 33}</TT>.
 </DD><DT CLASS="dt-description"><B><TT>{outdir, Path}</TT></B></DT><DD CLASS="dd-description">
 This option sets the full path to the directory in which the HTML files should
 be stored. Make sure the <TT>ejabberd</TT> daemon user has write access on that
@@ -2763,6 +2762,8 @@
                  {access_log, muc_log},
                  {cssfile, false},
                  {dirtype, subdirs},
+                 {dirtype, subdirs},
+                 {file_permissions, {644, 33}},
                  {outdir, "/var/www/muclogs"},
                  {timezone, local}
                 ]},
@@ -2776,7 +2777,11 @@
 online again. Thus it is very similar to how email works. Note that
 <TT>ejabberdctl</TT> has a command to delete expired messages
 (see section&#XA0;<A HREF="#ejabberdctl">4.1</A>).</P><DL CLASS="description"><DT CLASS="dt-description">
-<B><TT>{access_max_user_messages, AccessName}</TT></B></DT><DD CLASS="dd-description">
+<B><TT>{db_type, mnesia|odbc}</TT></B></DT><DD CLASS="dd-description"> 
+Define the type of storage where the module will create the tables and store user information.
+The default is to store in the internal Mnesia database.
+If <TT>odbc</TT> value is defined, make sure you have defined the database, see&#XA0;<A HREF="#database">3.2</A>.
+</DD><DT CLASS="dt-description"><B><TT>{access_max_user_messages, AccessName}</TT></B></DT><DD CLASS="dd-description">
 This option defines which access rule will be enforced to limit
 the maximum number of offline messages that a user can have (quota).
 When a user has too many offline messages, any new messages that he receive are discarded,
@@ -2881,6 +2886,10 @@
 </P><DL CLASS="description"><DT CLASS="dt-description">
 <B><TT>{iqdisc, Discipline}</TT></B></DT><DD CLASS="dd-description"> This specifies
 the processing discipline for Blocking Communication (<TT>jabber:iq:privacy</TT>) IQ queries (see section&#XA0;<A HREF="#modiqdiscoption">3.3.2</A>).
+</DD><DT CLASS="dt-description"><B><TT>{db_type, mnesia|odbc}</TT></B></DT><DD CLASS="dd-description"> 
+Define the type of storage where the module will create the tables and store user information.
+The default is to store in the internal Mnesia database.
+If <TT>odbc</TT> value is defined, make sure you have defined the database, see&#XA0;<A HREF="#database">3.2</A>.
 </DD></DL><P> <A NAME="modprivate"></A> </P><!--TOC subsection <TT>mod_private</TT>-->
 <H3 CLASS="subsection"><!--SEC ANCHOR --><A NAME="htoc54">3.3.16</A>&#XA0;&#XA0;<A HREF="#modprivate"><TT>mod_private</TT></A></H3><!--SEC END --><P> <A NAME="modprivate"></A> 
 </P><P>This module adds support for Private XML Storage (<A HREF="http://xmpp.org/extensions/xep-0049.html">XEP-0049</A>):
@@ -2893,6 +2902,10 @@
 </P><DL CLASS="description"><DT CLASS="dt-description">
 <B><TT>{iqdisc, Discipline}</TT></B></DT><DD CLASS="dd-description"> This specifies
 the processing discipline for Private XML Storage (<TT>jabber:iq:private</TT>) IQ queries (see section&#XA0;<A HREF="#modiqdiscoption">3.3.2</A>).
+</DD><DT CLASS="dt-description"><B><TT>{db_type, mnesia|odbc}</TT></B></DT><DD CLASS="dd-description"> 
+Define the type of storage where the module will create the tables and store user information.
+The default is to store in the internal Mnesia database.
+If <TT>odbc</TT> value is defined, make sure you have defined the database, see&#XA0;<A HREF="#database">3.2</A>.
 </DD></DL><P> <A NAME="modproxy"></A> </P><!--TOC subsection <TT>mod_proxy65</TT>-->
 <H3 CLASS="subsection"><!--SEC ANCHOR --><A NAME="htoc55">3.3.17</A>&#XA0;&#XA0;<A HREF="#modproxy"><TT>mod_proxy65</TT></A></H3><!--SEC END --><P> <A NAME="modproxy"></A> 
 </P><P>This module implements SOCKS5 Bytestreams (<A HREF="http://xmpp.org/extensions/xep-0065.html">XEP-0065</A>).
@@ -3179,6 +3192,10 @@
 </P><DL CLASS="description"><DT CLASS="dt-description">
 <B><TT>{iqdisc, Discipline}</TT></B></DT><DD CLASS="dd-description"> This specifies
 the processing discipline for Roster Management (<TT>jabber:iq:roster</TT>) IQ queries (see section&#XA0;<A HREF="#modiqdiscoption">3.3.2</A>).
+</DD><DT CLASS="dt-description"><B><TT>{db_type, mnesia|odbc}</TT></B></DT><DD CLASS="dd-description"> 
+Define the type of storage where the module will create the tables and store user information.
+The default is to store in the internal Mnesia database.
+If <TT>odbc</TT> value is defined, make sure you have defined the database, see&#XA0;<A HREF="#database">3.2</A>.
 </DD><DT CLASS="dt-description"><B><TT>{versioning, false|true}</TT></B></DT><DD CLASS="dd-description"> Enables
 Roster Versioning.
 This option is disabled by default.
@@ -3237,7 +3254,13 @@
 users from the shared roster groups.
 A shared roster group can have members from any XMPP server,
 but the presence will only be available from and to members
-of the same virtual host where the group is created.</P><P>Shared roster groups can be edited <EM>only</EM> via the Web Admin. Each group
+of the same virtual host where the group is created.</P><P>Options:
+</P><DL CLASS="description"><DT CLASS="dt-description">
+<B><TT>{db_type, mnesia|odbc}</TT></B></DT><DD CLASS="dd-description"> 
+Define the type of storage where the module will create the tables and store user information.
+The default is to store in the internal Mnesia database.
+If <TT>odbc</TT> value is defined, make sure you have defined the database, see&#XA0;<A HREF="#database">3.2</A>.
+</DD></DL><P>Shared roster groups can be edited <EM>only</EM> via the Web Admin. Each group
 has a unique identification and the following parameters:
 </P><DL CLASS="description"><DT CLASS="dt-description">
 <B>Name</B></DT><DD CLASS="dd-description"> The name of the group, which will be displayed in the roster.
@@ -3584,6 +3607,10 @@
 
 </DD><DT CLASS="dt-description"><B><TT>{iqdisc, Discipline}</TT></B></DT><DD CLASS="dd-description"> This specifies
 the processing discipline for <TT>vcard-temp</TT> IQ queries (see section&#XA0;<A HREF="#modiqdiscoption">3.3.2</A>).
+</DD><DT CLASS="dt-description"><B><TT>{db_type, mnesia|odbc}</TT></B></DT><DD CLASS="dd-description"> 
+Define the type of storage where the module will create the tables and store user information.
+The default is to store in the internal Mnesia database.
+If <TT>odbc</TT> value is defined, make sure you have defined the database, see&#XA0;<A HREF="#database">3.2</A>.
 </DD><DT CLASS="dt-description"><B><TT>{search, true|false}</TT></B></DT><DD CLASS="dd-description">This option specifies whether the search
 functionality is enabled or not
 If disabled, the option <TT>host</TT> will be ignored and the
@@ -3599,7 +3626,7 @@
 </DD><DT CLASS="dt-description"><B><TT>{search_all_hosts, true|false}</TT></B></DT><DD CLASS="dd-description">If this option is set
 to <TT>true</TT>, search operations will apply to all virtual hosts. Otherwise
 only the current host will be searched. The default value is <TT>true</TT>.
-This option is available in <TT>mod_vcard</TT>, but not available in <TT>mod_vcard_odbc</TT>.
+This option is available in <TT>mod_vcard</TT>when using Mnesia, but not when using ODBC storage.
 </DD></DL><P>Examples:
 </P><UL CLASS="itemize"><LI CLASS="li-itemize">
 In this first situation, search results are limited to twenty items,
@@ -3821,7 +3848,13 @@
 and each presence sent by a client produces hash retrieval and a
 presence stanza rewrite.
 For this reason, enabling this module will introduce a computational overhead
-in servers with clients that change frequently their presence.</P><P> <A NAME="modversion"></A> </P><!--TOC subsection <TT>mod_version</TT>-->
+in servers with clients that change frequently their presence.</P><P>Options:
+</P><DL CLASS="description"><DT CLASS="dt-description">
+<B><TT>{db_type, mnesia|odbc}</TT></B></DT><DD CLASS="dd-description"> 
+Define the type of storage where the module will create the tables and store user information.
+The default is to store in the internal Mnesia database.
+If <TT>odbc</TT> value is defined, make sure you have defined the database, see&#XA0;<A HREF="#database">3.2</A>.
+</DD></DL><P> <A NAME="modversion"></A> </P><!--TOC subsection <TT>mod_version</TT>-->
 <H3 CLASS="subsection"><!--SEC ANCHOR --><A NAME="htoc69">3.3.31</A>&#XA0;&#XA0;<A HREF="#modversion"><TT>mod_version</TT></A></H3><!--SEC END --><P> <A NAME="modversion"></A> 
 </P><P>This module implements Software Version (<A HREF="http://xmpp.org/extensions/xep-0092.html">XEP-0092</A>). Consequently, it
 answers <TT>ejabberd</TT>&#X2019;s version when queried.</P><P>Options:
@@ -3866,7 +3899,6 @@
 In this example there is no restriction:
 </P><PRE CLASS="verbatim">{ejabberdctl_access_commands, []}.
 </PRE><P>If account <TT>[e-mail]</TT> is registered in <TT>ejabberd</TT> with password <TT>abcdef</TT>
-(which MD5 is E8B501798950FC58AAD83C8C14978E),
 and <TT>ejabberd.cfg</TT> contains this setting:
 </P><PRE CLASS="verbatim">{hosts, ["example.org"]}.
 {acl, bots, {user, "robot1", "example.org"}}.
@@ -3875,7 +3907,7 @@
 </PRE><P>then you can do this in the shell:
 </P><PRE CLASS="verbatim">$ ejabberdctl registered_users example.org
 Error: no_auth_provided
-$ ejabberdctl --auth robot1 example.org E8B501798950FC58AAD83C8C14978E registered_users example.org
+$ ejabberdctl --auth robot1 example.org abcdef registered_users example.org
 robot1
 testuser1
 testuser2
@@ -4015,6 +4047,8 @@
 from other Jabber/XMPP servers
 There exist tutorials to
 <A HREF="http://www.ejabberd.im/migrate-to-ejabberd">migrate from other software to ejabberd</A>.
+</DD><DT CLASS="dt-description"><B><TT>export2odbc virtualhost directory</TT></B></DT><DD CLASS="dd-description"> 
+Export virtual host information from Mnesia tables to SQL files.
 </DD><DT CLASS="dt-description"><B><TT>delete_expired_messages</TT></B></DT><DD CLASS="dd-description"> This option can be used to delete old messages
 in offline storage. This might be useful when the number of offline messages
 is very high.
@@ -4038,8 +4072,7 @@
 and is Username, Hostname and Password of a local XMPP account
 that has permission to execute the corresponding command.
 This means that the account must be registered in the local ejabberd,
-because the information will be verified.
-It is possible to provide the plaintext password or its MD5 sum.</P><P>When one or several access restrictions are defined and the
+because the information will be verified.</P><P>When one or several access restrictions are defined and the
 authentication information is provided,
 each restriction is verified until one matches completely:
 the account matches the Access rule,
@@ -4146,7 +4179,7 @@
 See section <A HREF="#erlangconfiguration">4.1.2</A>.</P><P> <A NAME="adhoccommands"></A> </P><!--TOC section Ad-hoc Commands-->
 <H2 CLASS="section"><!--SEC ANCHOR --><A NAME="htoc78">4.4</A>&#XA0;&#XA0;<A HREF="#adhoccommands">Ad-hoc Commands</A></H2><!--SEC END --><P> <A NAME="adhoccommands"></A> </P><P>If you enable <TT>mod_configure</TT> and <TT>mod_adhoc</TT>,
 you can perform several administrative tasks in <TT>ejabberd</TT>
-with a XMPP client.
+with an XMPP client.
 The client must support Ad-Hoc Commands (<A HREF="http://xmpp.org/extensions/xep-0050.html">XEP-0050</A>),
 and you must login in the XMPP server with
 an account with proper privileges.</P><P> <A NAME="changeerlangnodename"></A> </P><!--TOC section Change Computer Hostname-->
@@ -4467,6 +4500,7 @@
 </LI><LI CLASS="li-itemize">Badlop (<A HREF="xmpp:[e-mail]"><TT>xmpp:[e-mail]</TT></A>)
 </LI><LI CLASS="li-itemize">Evgeniy Khramtsov (<A HREF="xmpp:[e-mail]"><TT>xmpp:[e-mail]</TT></A>)
 </LI><LI CLASS="li-itemize">Florian Zumbiehl (<A HREF="xmpp:[e-mail]"><TT>xmpp:[e-mail]</TT></A>)
+</LI><LI CLASS="li-itemize">Ludovic Bocquet (<A HREF="xmpp:[e-mail]"><TT>xmpp:[e-mail]</TT></A>)
 </LI><LI CLASS="li-itemize">Marcin Owsiany (<A HREF="xmpp:[e-mail]"><TT>xmpp:[e-mail]</TT></A>)
 </LI><LI CLASS="li-itemize">Michael Grigutsch (<A HREF="xmpp:[e-mail]"><TT>xmpp:[e-mail]</TT></A>)
 </LI><LI CLASS="li-itemize">Mickael Remond (<A HREF="xmpp:[e-mail]"><TT>xmpp:[e-mail]</TT></A>)
@@ -4475,7 +4509,7 @@
 </LI><LI CLASS="li-itemize">Vsevolod Pelipas (<A HREF="xmpp:[e-mail]"><TT>xmpp:[e-mail]</TT></A>)
 </LI></UL><P> <A NAME="copyright"></A> </P><!--TOC chapter Copyright Information-->
 <H1 CLASS="chapter"><!--SEC ANCHOR --><A NAME="htoc103">Appendix&#XA0;D</A>&#XA0;&#XA0;<A HREF="#copyright">Copyright Information</A></H1><!--SEC END --><P> <A NAME="copyright"></A> </P><P>Ejabberd Installation and Operation Guide.<BR>
-Copyright &#XA9; 2003 &#X2014; 2010 ProcessOne</P><P>This document is free software; you can redistribute it and/or
+Copyright &#XA9; 2003 &#X2014; 2013 ProcessOne</P><P>This document is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
 as published by the Free Software Foundation; either version 2
 of the License, or (at your option) any later version.</P><P>This document is distributed in the hope that it will be useful,

=== modified file 'doc/guide.tex'
--- doc/guide.tex	2012-01-08 11:45:38 +0000
+++ doc/guide.tex	2014-07-10 22:50:00 +0000
@@ -75,24 +75,19 @@
 \newcommand{\modhttpfileserver}{\module{mod\_http\_fileserver}}
 \newcommand{\modirc}{\module{mod\_irc}}
 \newcommand{\modlast}{\module{mod\_last}}
-\newcommand{\modlastodbc}{\module{mod\_last\_odbc}}
 \newcommand{\modmuc}{\module{mod\_muc}}
 \newcommand{\modmuclog}{\module{mod\_muc\_log}}
 \newcommand{\modoffline}{\module{mod\_offline}}
-\newcommand{\modofflineodbc}{\module{mod\_offline\_odbc}}
 \newcommand{\modping}{\module{mod\_ping}}
 \newcommand{\modprescounter}{\module{mod\_pres\_counter}}
 \newcommand{\modprivacy}{\module{mod\_privacy}}
-\newcommand{\modprivacyodbc}{\module{mod\_privacy\_odbc}}
 \newcommand{\modprivate}{\module{mod\_private}}
-\newcommand{\modprivateodbc}{\module{mod\_private\_odbc}}
 \newcommand{\modproxy}{\module{mod\_proxy65}}
 \newcommand{\modpubsub}{\module{mod\_pubsub}}
 \newcommand{\modpubsubodbc}{\module{mod\_pubsub\_odbc}}
 \newcommand{\modregister}{\module{mod\_register}}
 \newcommand{\modregisterweb}{\module{mod\_register\_web}}
 \newcommand{\modroster}{\module{mod\_roster}}
-\newcommand{\modrosterodbc}{\module{mod\_roster\_odbc}}
 \newcommand{\modservicelog}{\module{mod\_service\_log}}
 \newcommand{\modsharedroster}{\module{mod\_shared\_roster}}
 \newcommand{\modsharedrosterldap}{\module{mod\_shared\_roster\_ldap}}
@@ -101,7 +96,6 @@
 \newcommand{\modtime}{\module{mod\_time}}
 \newcommand{\modvcard}{\module{mod\_vcard}}
 \newcommand{\modvcardldap}{\module{mod\_vcard\_ldap}}
-\newcommand{\modvcardodbc}{\module{mod\_vcard\_odbc}}
 \newcommand{\modvcardxupdate}{\module{mod\_vcard\_xupdate}}
 \newcommand{\modversion}{\module{mod\_version}}
 
@@ -123,6 +117,11 @@
   hostname of the virtual host with the prefix `\jid{#1.}'. The keyword "@HOST@"
   is replaced at start time with the real virtual host name.
 }
+\newcommand{\dbtype}{\titem{\{db\_type, mnesia|odbc\}} \ind{options!dbtype}
+  Define the type of storage where the module will create the tables and store user information.
+  The default is to store in the internal Mnesia database.
+  If \term{odbc} value is defined, make sure you have defined the database, see~\ref{database}.
+}
 
 %% Title page
 \include{version}
@@ -315,7 +314,7 @@
 \item GNU Make
 \item GCC
 \item Libexpat 1.95 or higher
-\item Erlang/OTP R10B-9 or higher. The recommended versions are R12B-5 and R13B04.
+\item Erlang/OTP R10B-9 or higher. The recommended versions are R13B04 and R14B04.
   Don't use R14A or R14B because \footahref{http://www.erlang.org/cgi-bin/ezmlm-cgi/4/54598}{they have a bug}.
 \item OpenSSL 0.9.8 or higher, for STARTTLS, SASL and SSL encryption.
 \item Zlib 1.2.3 or higher, for Stream Compression support (\xepref{0138}). Optional.
@@ -569,19 +568,19 @@
 %TODO: how to compile database support on windows?
 
 
-\makesection{initialadmin}{Create a XMPP Account for Administration}
+\makesection{initialadmin}{Create an XMPP Account for Administration}
 
-You need a XMPP account and grant him administrative privileges
+You need an XMPP account and grant him administrative privileges
 to enter the \ejabberd{} Web Admin:
 \begin{enumerate}
-\item Register a XMPP account on your \ejabberd{} server, for example \term{[e-mail]}.
-  There are two ways to register a XMPP account:
+\item Register an XMPP account on your \ejabberd{} server, for example \term{[e-mail]}.
+  There are two ways to register an XMPP account:
   \begin{enumerate}
   \item Using \term{ejabberdctl}\ind{ejabberdctl} (see section~\ref{ejabberdctl}):
 \begin{verbatim}
 ejabberdctl register admin1 example.org FgT5bk3
 \end{verbatim}
-  \item Using a XMPP client and In-Band Registration (see section~\ref{modregister}).
+  \item Using an XMPP client and In-Band Registration (see section~\ref{modregister}).
   \end{enumerate}
 \item Edit the \ejabberd{} configuration file to give administration rights to the XMPP account you created:
 \begin{verbatim}
@@ -819,14 +818,14 @@
     Interacts with an \footahref{http://www.ejabberd.im/tutorials-transports}{external component}
     (as defined in the Jabber Component Protocol (\xepref{0114}).\\
     Options: \texttt{access}, \texttt{hosts}, \texttt{max\_fsm\_queue},
-    \texttt{service\_check\_from}, \texttt{shaper}
+    \texttt{service\_check\_from}, \texttt{shaper\_rule}
   \titem{\texttt{ejabberd\_stun}}
     Handles STUN Binding requests as defined in
     \footahref{http://tools.ietf.org/html/rfc5389}{RFC 5389}.\\
     Options: \texttt{certfile}
   \titem{\texttt{ejabberd\_http}}
     Handles incoming HTTP connections.\\
-    Options: \texttt{captcha}, \texttt{certfile}, \texttt{http\_bind}, \texttt{http\_poll},
+    Options: \texttt{captcha}, \texttt{certfile}, \texttt{default\_host}, \texttt{http\_bind}, \texttt{http\_poll},
     \texttt{request\_handlers}, \texttt{tls}, \texttt{trusted\_proxies}, \texttt{web\_admin}\\
 \end{description}
 
@@ -847,6 +846,11 @@
     Simple web page that allows a user to fill a CAPTCHA challenge (see section \ref{captcha}).
   \titem{\{certfile, Path\}} Full path to a file containing the default SSL certificate.
     To define a certificate file specific for a given domain, use the global option \term{domain\_certfile}.
+  \titem{\{default\_host, undefined|HostName\}}
+    If the HTTP request received by ejabberd contains the HTTP header \term{Host}
+    with an ambiguous virtual host that doesn't match any one defined in ejabberd (see \ref{hostnames}),
+    then this configured HostName is set as the request Host.
+    The default value of this option is: \term{undefined}.
   \titem{\{hosts, [Hostname, ...], [HostOption, ...]\}} \ind{options!hosts}
     The external Jabber component that connects to this \term{ejabberd\_service}
     can serve one or more hostnames.
@@ -930,6 +934,9 @@
   \titem{\{shaper, none|ShaperName\}} \ind{options!shaper}This option defines a
     shaper for the port (see section~\ref{shapers}). The default value
     is \term{none}.
+  \titem{\{shaper\_rule, none|ShaperRule\}} \ind{options!shaperrule}This option defines a
+    shaper rule for the \term{ejabberd\_service} (see section~\ref{shapers}). The recommended value
+    is \term{fast}.
   \titem{starttls} \ind{options!starttls}\ind{STARTTLS}This option
     specifies that STARTTLS encryption is available on connections to the port.
     You should also set the \option{certfile} option.
@@ -1226,6 +1233,12 @@
 If the client uses old Jabber Non-SASL authentication (\xepref{0078}),
 then this option is not respected, and the action performed is \term{closeold}.
 
+The option \option{fqdn} allows you to define the Fully Qualified Domain Name
+of the machine, in case it isn't detected automatically.
+The FQDN is used to authenticate some clients that use the DIGEST-MD5 SASL mechanism.
+The option syntax is:
+\esyntax{\{fqdn, undefined|FqdnString|[FqdnString]\}.}
+
 \makesubsubsection{internalauth}{Internal}
 \ind{internal authentication}\ind{Mnesia}
 
@@ -1295,7 +1308,7 @@
   the authentication information since the user last disconnected,
   to verify again the user authentication without querying again the extauth script.
   Note: caching should not be enabled in a host if internal auth is also enabled.
-  If caching is enabled, \term{mod\_last} or \term{mod\_last\_odbc} must be enabled also in that vhost.
+  If caching is enabled, \term{mod\_last} must be enabled also in that vhost.
 \end{description}
 
 This example sets external authentication, the extauth script, enables caching for 10 minutes,
@@ -1434,7 +1447,7 @@
 \item You may want to allow login access only for certain users. \term{pam\_listfile.so}
 module provides such functionality.
 \item If you use \term{pam\_winbind} to authorise against a Windows Active Directory,
-then \term{/etc/nssswitch.conf} must be configured to use \term{winbind} as well.
+then \term{/etc/nsswitch.conf} must be configured to use \term{winbind} as well.
 \end{itemize}
 
 \makesubsection{accessrules}{Access Rules}
@@ -1664,7 +1677,7 @@
 \begin{description}
   \titem{\{captcha\_cmd, Path\}} 
   Full path to a script that generates the image.
-  The default value is an empty string: \term{""}
+  The default value disables the feature: \term{undefined}
   \titem{\{captcha\_host, ProtocolHostPort\}} 
   ProtocolHostPort is a string with the host, and optionally the Protocol and Port number.
   It must identify where ejabberd listens for CAPTCHA requests.
@@ -2011,12 +2024,10 @@
 \ind{MySQL!storage}
 
 MySQL also can be used to store information into from several \ejabberd{}
-modules. See section~\ref{modoverview} to see which modules have a version
-with the `\_odbc'. This suffix indicates that the module can be used with
+modules. See section~\ref{modoverview} to see which modules can be used with
 relational databases like MySQL. To enable storage to your database, just make
-sure that your database is running well (see previous sections), and replace the
-suffix-less or ldap module variant with the odbc module variant. Keep in mind
-that you cannot have several variants of the same module loaded!
+sure that your database is running well (see previous sections), and add the
+module option \term{\{db\_type, odbc\}}.
 
 \makesubsection{mssql}{Microsoft SQL Server}
 \ind{Microsoft SQL Server}\ind{Microsoft SQL Server!schema}
@@ -2068,13 +2079,10 @@
 \ind{Microsoft SQL Server!storage}
 
 Microsoft SQL Server also can be used to store information into from several
-\ejabberd{} modules. See section~\ref{modoverview} to see which modules have
-a version with the `\_odbc'. This suffix indicates that the module can be used
-with relational databases like Microsoft SQL Server. To enable storage to your
-database, just make sure that your database is running well (see previous
-sections), and replace the suffix-less or ldap module variant with the odbc
-module variant. Keep in mind that you cannot have several variants of the same
-module loaded!
+modules. See section~\ref{modoverview} to see which modules can be used with
+relational databases like MySQL. To enable storage to your database, just make
+sure that your database is running well (see previous sections), and add the
+module option \term{\{db\_type, odbc\}}.
 
 \makesubsection{pgsql}{PostgreSQL}
 \ind{PostgreSQL}\ind{PostgreSQL!schema}
@@ -2166,12 +2174,10 @@
 \ind{PostgreSQL!storage}
 
 PostgreSQL also can be used to store information into from several \ejabberd{}
-modules. See section~\ref{modoverview} to see which modules have a version
-with the `\_odbc'. This suffix indicates that the module can be used with
-relational databases like PostgreSQL. To enable storage to your database, just
-make sure that your database is running well (see previous sections), and
-replace the suffix-less or ldap module variant with the odbc module variant.
-Keep in mind that you cannot have several variants of the same module loaded!
+modules. See section~\ref{modoverview} to see which modules can be used with
+relational databases like MySQL. To enable storage to your database, just make
+sure that your database is running well (see previous sections), and add the
+module option \term{\{db\_type, odbc\}}.
 
 \makesubsection{odbc}{ODBC Compatible}
 \ind{databases!ODBC}
@@ -2243,13 +2249,11 @@
 \ind{ODBC!storage}
 
 An ODBC compatible database also can be used to store information into from
-several \ejabberd{} modules. See section~\ref{modoverview} to see which
-modules have a version with the `\_odbc'. This suffix indicates that the module
-can be used with ODBC compatible relational databases. To enable storage to your
-database, just make sure that your database is running well (see previous
-sections), and replace the suffix-less or ldap module variant with the odbc
-module variant. Keep in mind that you cannot have several variants of the same
-module loaded!
+several \ejabberd{}
+modules. See section~\ref{modoverview} to see which modules can be used with
+relational databases like MySQL. To enable storage to your database, just make
+sure that your database is running well (see previous sections), and add the
+module option \term{\{db\_type, odbc\}}.
 
 \makesubsection{ldap}{LDAP}
 \ind{databases!LDAP}
@@ -2576,36 +2580,28 @@
     \hline \ahrefloc{modhttpfileserver}{\modhttpfileserver{}} & Small HTTP file server &  \\
     \hline \ahrefloc{modirc}{\modirc{}} & IRC transport &  \\
     \hline \ahrefloc{modlast}{\modlast{}} & Last Activity (\xepref{0012}) &  \\
-    \hline \ahrefloc{modlast}{\modlastodbc{}} & Last Activity (\xepref{0012}) & supported DB (*) \\
     \hline \ahrefloc{modmuc}{\modmuc{}} & Multi-User Chat (\xepref{0045}) &  \\
     \hline \ahrefloc{modmuclog}{\modmuclog{}} & Multi-User Chat room logging & \modmuc{} \\
     \hline \ahrefloc{modoffline}{\modoffline{}} & Offline message storage (\xepref{0160}) &  \\
-    \hline \ahrefloc{modoffline}{\modofflineodbc{}} & Offline message storage (\xepref{0160}) & supported DB (*) \\
     \hline \ahrefloc{modping}{\modping{}} & XMPP Ping and periodic keepalives (\xepref{0199}) &  \\
     \hline \ahrefloc{modprescounter}{\modprescounter{}} & Detect presence subscription flood &  \\
     \hline \ahrefloc{modprivacy}{\modprivacy{}} & Blocking Communication (\xepref{0016}) &  \\
-    \hline \ahrefloc{modprivacy}{\modprivacyodbc{}} & Blocking Communication (\xepref{0016}) & supported DB (*) \\
     \hline \ahrefloc{modprivate}{\modprivate{}} & Private XML Storage (\xepref{0049}) &  \\
-    \hline \ahrefloc{modprivate}{\modprivateodbc{}} & Private XML Storage (\xepref{0049}) & supported DB (*) \\
     \hline \ahrefloc{modproxy}{\modproxy{}} & SOCKS5 Bytestreams (\xepref{0065}) &  \\
     \hline \ahrefloc{modpubsub}{\modpubsub{}} & Pub-Sub (\xepref{0060}), PEP (\xepref{0163}) & \modcaps{} \\
     \hline \ahrefloc{modpubsub}{\modpubsubodbc{}} & Pub-Sub (\xepref{0060}), PEP (\xepref{0163}) & supported DB (*) and \modcaps{} \\
     \hline \ahrefloc{modregister}{\modregister{}} & In-Band Registration (\xepref{0077}) &  \\
     \hline \ahrefloc{modregisterweb}{\modregisterweb{}} & Web for Account Registrations &  \\
     \hline \ahrefloc{modroster}{\modroster{}} & Roster management (XMPP IM) &  \\
-    \hline \ahrefloc{modroster}{\modrosterodbc{}} & Roster management (XMPP IM) & supported DB (*) \\
     \hline \ahrefloc{modservicelog}{\modservicelog{}} & Copy user messages to logger service &  \\
-    \hline \ahrefloc{modsharedroster}{\modsharedroster{}} & Shared roster management & \modroster{} or \\
-    & & \modrosterodbc\\
-    \hline \ahrefloc{modsharedrosterldap}{\modsharedrosterldap{}} & LDAP Shared roster management & \modroster{} or \\
-    & & \modrosterodbc\\
+    \hline \ahrefloc{modsharedroster}{\modsharedroster{}} & Shared roster management & \modroster{} \\
+    \hline \ahrefloc{modsharedrosterldap}{\modsharedrosterldap{}} & LDAP Shared roster management & \modroster{} \\
     \hline \ahrefloc{modsic}{\modsic{}} & Server IP Check (\xepref{0279}) &  \\
     \hline \ahrefloc{modstats}{\modstats{}} & Statistics Gathering (\xepref{0039}) &  \\
     \hline \ahrefloc{modtime}{\modtime{}} & Entity Time (\xepref{0202}) &  \\
     \hline \ahrefloc{modvcard}{\modvcard{}} & vcard-temp (\xepref{0054}) &  \\
     \hline \ahrefloc{modvcardldap}{\modvcardldap{}} & vcard-temp (\xepref{0054}) & LDAP server \\
-    \hline \ahrefloc{modvcard}{\modvcardodbc{}} & vcard-temp (\xepref{0054}) & supported DB (*) \\
-    \hline \ahrefloc{modvcardxupdate}{\modvcardxupdate{}} & vCard-Based Avatars (\xepref{0153}) & \modvcard{} or \modvcardodbc{} \\
+    \hline \ahrefloc{modvcardxupdate}{\modvcardxupdate{}} & vCard-Based Avatars (\xepref{0153}) & \modvcard{} \\
     \hline \ahrefloc{modversion}{\modversion{}} & Software Version (\xepref{0092}) &  \\
     \hline
   \end{tabular}
@@ -2617,31 +2613,11 @@
 
 You can see which database backend each module needs by looking at the suffix:
 \begin{itemize}
-\item No suffix, this means that the modules uses Erlang's built-in database
-  Mnesia as backend.
-\item `\_odbc', this means that the module needs a supported database
-  (see~\ref{database}) as backend.
+\item No suffix, this means that the module uses Erlang's built-in database
+  Mnesia as backend, or a ODBC database in some cases (see~\ref{database}).
 \item `\_ldap', this means that the module needs an LDAP server as backend.
 \end{itemize}
 
-If you want to,
-it is possible to use a relational database to store the tables created by some ejabberd modules.
-You can do this by changing the module name to a name with an
-\term{\_odbc} suffix in \ejabberd{} config file. You can use a relational
-database for the following data:
-
-\begin{itemize}
-\item Last connection date and time: Use \term{mod\_last\_odbc} instead of
-  \term{mod\_last}.
-\item Offline messages: Use \term{mod\_offline\_odbc} instead of
-  \term{mod\_offline}.
-\item Rosters: Use \term{mod\_roster\_odbc} instead of \term{mod\_roster}.
-\item Users' VCARD: Use \term{mod\_vcard\_odbc} instead of \term{mod\_vcard}.
-\item Private XML storage: Use \term{mod\_private\_odbc} instead of \term{mod\_private}.
-\item User rules for blocking communications: Use \term{mod\_privacy\_odbc} instead of \term{mod\_privacy}.
-\item Pub-Sub nodes, items and subscriptions: Use \term{mod\_pubsub\_odbc} instead of \term{mod\_pubsub}.
-\end{itemize}
-
 You can find more
 \footahref{http://www.ejabberd.im/contributions}{contributed modules} on the
 \ejabberd{} website. Please remember that these contributions might not work or
@@ -2769,6 +2745,7 @@
 
 Options:
 \begin{description}
+\dbtype
 \titem{\{access, AccessName\}} \ind{options!access}This option specifies who is allowed to
   send announcements and to set the message of the day (by default, nobody is
   able to send such messages).
@@ -3099,6 +3076,7 @@
 Options:
 \begin{description}
 \hostitem{irc}
+\dbtype
 \titem{\{access, AccessName\}} \ind{options!access}This option can be used to specify who
   may use the IRC transport (default value: \term{all}).
 \titem{\{default\_encoding, Encoding\}} \ind{options!defaultencoding}Set the default IRC encoding.
@@ -3149,6 +3127,7 @@
 Options:
 \begin{description}
 \iqdiscitem{Last activity (\ns{jabber:iq:last})}
+\dbtype
 \end{description}
 
 \makesubsection{modmuc}{\modmuc{}}
@@ -3183,6 +3162,7 @@
 Module options:
 \begin{description}
 \hostitem{conference}
+\dbtype
 \titem{\{access, AccessName\}} \ind{options!access}You can specify who is allowed to use
   the Multi-User Chat service. By default everyone is allowed to use it.
 \titem{\{access\_create, AccessName\}} \ind{options!access\_create}To configure who is
@@ -3260,7 +3240,7 @@
 \titem{\{default\_room\_options, [ \{OptionName, OptionValue\}, ...]\}} \ind{options!default\_room\_options}
   This module option allows to define the desired default room options.
   Note that the creator of a room can modify the options of his room
-  at any time using a XMPP client with MUC capability.
+  at any time using an XMPP client with MUC capability.
   The available room options and the default values are:
   \begin{description}
   \titem{\{allow\_change\_subj, true|false\}} Allow occupants to change the subject.
@@ -3457,6 +3437,10 @@
   \term{html} stores in HTML format,
   \term{plaintext} stores in plain text.
   The default value is \term{html}.
+\titem{\{file\_permissions, \{Mode, Group\}\}}\ind{options!file\_permissions}
+  Define the permissions that must be used when creating the log files:
+  the number of the mode, and the numeric id of the group that will own the files.
+  The default value is \term{\{644, 33\}}.
 \titem{\{outdir, Path\}}\ind{options!outdir}
   This option sets the full path to the directory in which the HTML files should
   be stored. Make sure the \ejabberd{} daemon user has write access on that
@@ -3523,6 +3507,8 @@
                  {access_log, muc_log},
                  {cssfile, false},
                  {dirtype, subdirs},
+                 {dirtype, subdirs},
+                 {file_permissions, {644, 33}},
                  {outdir, "/var/www/muclogs"},
                  {timezone, local}
                 ]},
@@ -3542,6 +3528,7 @@
 (see section~\ref{ejabberdctl}).
 
 \begin{description}
+  \dbtype
   \titem{\{access\_max\_user\_messages, AccessName\}}\ind{options!access\_max\_user\_messages}
   This option defines which access rule will be enforced to limit
   the maximum number of offline messages that a user can have (quota).
@@ -3672,6 +3659,7 @@
 Options:
 \begin{description}
 \iqdiscitem{Blocking Communication (\ns{jabber:iq:privacy})}
+\dbtype
 \end{description}
 
 \makesubsection{modprivate}{\modprivate{}}
@@ -3688,6 +3676,7 @@
 Options:
 \begin{description}
 \iqdiscitem{Private XML Storage (\ns{jabber:iq:private})}
+\dbtype
 \end{description}
 
 \makesubsection{modproxy}{\modproxy{}}
@@ -4028,6 +4017,7 @@
 Options:
 \begin{description}
 \iqdiscitem{Roster Management (\ns{jabber:iq:roster})}
+\dbtype
   \titem{\{versioning, false|true\}} \ind{options!versioning}Enables
   Roster Versioning.
   This option is disabled by default.
@@ -4105,6 +4095,11 @@
 but the presence will only be available from and to members
 of the same virtual host where the group is created.
 
+Options:
+\begin{description}
+\dbtype
+\end{description}
+
 Shared roster groups can be edited \emph{only} via the Web Admin. Each group
 has a unique identification and the following parameters:
 \begin{description}
@@ -4623,6 +4618,7 @@
 \begin{description}
 \hostitem{vjud}
 \iqdiscitem{\ns{vcard-temp}}
+\dbtype
 \titem{\{search, true|false\}}\ind{options!search}This option specifies whether the search
   functionality is enabled or not
   If disabled, the option \term{host} will be ignored and the
@@ -4638,7 +4634,7 @@
 \titem{\{search\_all\_hosts, true|false\}}\ind{options!search\_all\_hosts}If this option is set
   to \term{true}, search operations will apply to all virtual hosts. Otherwise
   only the current host will be searched. The default value is \term{true}.
-  This option is available in \modvcard, but not available in \modvcardodbc.
+  This option is available in \modvcard when using Mnesia, but not when using ODBC storage.
 \end{description}
 
 Examples:
@@ -4911,6 +4907,11 @@
 For this reason, enabling this module will introduce a computational overhead
 in servers with clients that change frequently their presence.
 
+Options:
+\begin{description}
+\dbtype
+\end{description}
+
 \makesubsection{modversion}{\modversion{}}
 \ind{modules!\modversion{}}\ind{protocols!XEP-0092: Software Version}
 
@@ -4979,7 +4980,6 @@
 \end{verbatim}
 
 If account \term{[e-mail]} is registered in \ejabberd{} with password \term{abcdef}
-(which MD5 is E8B501798950FC58AAD83C8C14978E),
 and \term{ejabberd.cfg} contains this setting:
 \begin{verbatim}
 {hosts, ["example.org"]}.
@@ -4991,7 +4991,7 @@
 \begin{verbatim}
 $ ejabberdctl registered_users example.org
 Error: no_auth_provided
-$ ejabberdctl --auth robot1 example.org E8B501798950FC58AAD83C8C14978E registered_users example.org
+$ ejabberdctl --auth robot1 example.org abcdef registered_users example.org
 robot1
 testuser1
 testuser2
@@ -5154,6 +5154,8 @@
   from other Jabber/XMPP servers
   There exist tutorials to
   \footahref{http://www.ejabberd.im/migrate-to-ejabberd}{migrate from other software to ejabberd}.
+\titem{export2odbc virtualhost directory} \ind{export mnesia data to SQL files}
+  Export virtual host information from Mnesia tables to SQL files.
 \titem{delete\_expired\_messages} This option can be used to delete old messages
   in offline storage. This might be useful when the number of offline messages
   is very high.
@@ -5184,7 +5186,6 @@
 that has permission to execute the corresponding command.
 This means that the account must be registered in the local ejabberd,
 because the information will be verified.
-It is possible to provide the plaintext password or its MD5 sum.
 
 When one or several access restrictions are defined and the
 authentication information is provided,
@@ -5320,7 +5321,7 @@
 
 If you enable \modconfigure\ and \modadhoc,
 you can perform several administrative tasks in \ejabberd{}
-with a XMPP client.
+with an XMPP client.
 The client must support Ad-Hoc Commands (\xepref{0050}),
 and you must login in the XMPP server with
 an account with proper privileges.
@@ -5873,6 +5874,7 @@
 \item Badlop (\ahrefurl{xmpp:[e-mail]})
 \item Evgeniy Khramtsov (\ahrefurl{xmpp:[e-mail]})
 \item Florian Zumbiehl (\ahrefurl{xmpp:[e-mail]})
+\item Ludovic Bocquet (\ahrefurl{xmpp:[e-mail]})
 \item Marcin Owsiany (\ahrefurl{xmpp:[e-mail]})
 \item Michael Grigutsch (\ahrefurl{xmpp:[e-mail]})
 \item Mickael Remond (\ahrefurl{xmpp:[e-mail]})
@@ -5885,7 +5887,7 @@
 \makechapter{copyright}{Copyright Information}
 
 Ejabberd Installation and Operation Guide.\\
-Copyright \copyright{} 2003 --- 2010 ProcessOne
+Copyright \copyright{} 2003 --- 2013 ProcessOne
 
 This document is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License

=== added file 'doc/release_notes_2.1.11.txt'
--- doc/release_notes_2.1.11.txt	1970-01-01 00:00:00 +0000
+++ doc/release_notes_2.1.11.txt	2014-07-10 22:50:00 +0000
@@ -0,0 +1,58 @@
+
+                              Release Notes
+                             ejabberd 2.1.11
+
+  ejabberd 2.1.11 includes a few bugfixes and improvements.
+
+  Read more details about the changes in:
+    http://redir.process-one.net/ejabberd-2.1.11
+
+  Download the source code and installers from:
+    http://www.process-one.net/en/ejabberd/
+
+
+  The major changes are:
+
+* HTTP service
+- Fix ejabberd_http:get_line
+- Don't use binary:match to extract lines from binaries
+- Parse and encode https header names like native http parser does
+- Parse correctly https request split into multiple packets
+- Properly handle HEAD request in mod_http_bind (EJAB-1538)
+- New option default_host for handling requests with ambiguous Host (EJAB-1261)
+
+* ODBC
+- New ODBC support for mod_announce
+- New ODBC support for mod_blocking
+- New ODBC support for mod_irc
+- New ODBC support for mod_muc
+- New ODBC support for mod_shared_roster
+- New ODBC support for mod_vcard_xupdate
+- Add ODBC exporting function for privacy table
+- Work also with some unicode strings in PgSQL (EJAB-1490)
+- Replace a single quote with double quotes in an ODBC escape
+
+* SSL
+- Make sure that res is initialized in all cases
+- Parse correctly https request split into multiple packets (EJAB-1537)
+- Added missed tls:recv_data/2
+- Don't ignore Length parameter in tls:recv
+- Avoid quadratic behavior in reading SSL data
+- Dix http_bind webserver TLS fail on Chrome (EJAB-1530)
+
+* Miscelanea
+- Assume we have only one CPU when an auto-detection fails (EJAB-1516)
+- Auth: Relax digest-uri handling (EJAB-1529)
+- Caps: Cache caps timestamp before the IQ-request is done
+- IRC: Use of MUC password
+- Private: misc errors cases fixes
+- Pubsub: return user affiliation for a specified node (EJAB-1294)
+- Shared Roster: Foreign items were not pushed (EJAB-1509)
+- Shared Roster LDAP: user substitution in ldap_rfilter (EJAB-1555)
+- Windows: Fix makefile rules for building DLLs
+
+
+  Bug reports
+
+  You can officially report bugs on ProcessOne support site:
+  http://support.process-one.net/

=== added file 'doc/release_notes_2.1.12.txt'
--- doc/release_notes_2.1.12.txt	1970-01-01 00:00:00 +0000
+++ doc/release_notes_2.1.12.txt	2014-07-10 22:50:00 +0000
@@ -0,0 +1,67 @@
+
+                              Release Notes
+                             ejabberd 2.1.12
+
+  ejabberd 2.1.12 includes a many bugfixes and a few improvements.
+
+  Read more details about the changes in:
+    http://redir.process-one.net/ejabberd-2.1.12
+
+  Download the source code and installers from:
+    http://www.process-one.net/en/ejabberd/
+
+
+  The changes are:
+
+* Core ejabberd
+- Make terms serialization faster
+- Reduce size of XML stream state
+
+* Administration
+- Add SCRAM and remove MD5 support to ejabberd commands auth verification
+- Added command to list all the vhosts registered in an ejabberd node
+- Added export2odbc command, copied from mod_admin_extra.erl
+- Fix ejabberdctl number of arguments error report with R15
+- Check node name is available before starting ejabberd (EJAB-1572)
+- Fix ejabberd_xmlrpc commands authentication with SCRAM
+- Fix mod_offline:store_offline_msg argument (EJAB-1581)
+- Log IP address when auth attempt fails
+- Make sure update_info returns atoms only (EJAB-1595)
+- On shutdown, first stop listeners, then modules
+
+* Encryption
+- Detect OpenSSL version at runtime, not at compile time
+- Fixed signedness issue in tls_drv GET_DESCRYPTED_INPUT (EJAB-1591)
+- Enable DHE key exchange in TLS driver
+- Enable ECDHE key exchange in TSL driver
+- Disable old and unsecure ciphers in TLS driver
+- Disable SSL 2.0 in TLS driver
+
+* HTTP-Bind
+- Do not trigger item-not-found errors in mod_http_bind
+- Repeated http-bind request should abort only requests with same rid
+- Receiving missing request shouldn't close waiting out-ouf-order request
+
+* XMPP
+- Allow multiple fqdn values in configuration (EJAB-1578)
+- Fix get_subscription_lists/4
+- Fix account registration
+- Send announce Message stanzas as Headline type instead of Normal
+
+* Other
+- Guide: Fix file name of Name Service Switch
+- Guide: Document the db_type modules option (EJAB-1560)
+- LDAP: Fix broken JPEG photo (EJAB-1526)
+- LDAP: Fix compatibility with Erlang R16A (EJAB-1612)
+- MUC: Fix angle brackets handle in plaintext log (EJAB-1610)
+- MUC: Fix MUC start when Mnesia tables don't exist yet
+- MUC: New mod_muc_log option file_permissions (EJAB-1588)
+- ODBC: Merge SQL and Mnesia code into one module (EJAB-1560)
+- Translation: New Hebrew
+- Translation: Update Slovak
+
+
+  Bug reports
+
+  You can officially report bugs on ProcessOne support site:
+  http://support.process-one.net/

=== added file 'doc/release_notes_2.1.13.txt'
--- doc/release_notes_2.1.13.txt	1970-01-01 00:00:00 +0000
+++ doc/release_notes_2.1.13.txt	2014-07-10 22:50:00 +0000
@@ -0,0 +1,29 @@
+
+                              Release Notes
+                             ejabberd 2.1.12
+
+  ejabberd 2.1.13 includes just a few bugfixes.
+
+  Read more details about the changes in:
+    http://redir.process-one.net/ejabberd-2.1.13
+
+  Download the source code and installers from:
+    http://www.process-one.net/en/ejabberd/
+
+
+  The changes are:
+
+- Compilation: Detect correctly newer Darwin versions (EJAB-1594)
+- Guide: ejabberd_service expects a shaper_rule, not a shaper
+- MUC: Handle multiple < and > in mod_muc_log plaintext mode (EJAB-1640)
+- MUC: Handle ~ control sequence in text of mod_muc_log (EJAB-1639)
+- MUC: list_to_integer/2 only works in OTP R14 and newer
+- Pubsub: access_createnode acl also applies to auto created nodes
+- Web: Normalize HTTP path
+- WebAdmin: Fix bug when displaying offline messages in WebAdmin
+
+
+  Bug reports
+
+  You can officially report bugs on ProcessOne support site:
+  http://support.process-one.net/

=== modified file 'doc/version.tex'
--- doc/version.tex	2012-01-08 11:45:38 +0000
+++ doc/version.tex	2014-07-10 22:50:00 +0000
@@ -1,2 +1,2 @@
 % ejabberd version (automatically generated).
-\newcommand{\version}{2.1.10}
+\newcommand{\version}{2.1.13}

=== modified file 'src/Makefile.win32'
--- src/Makefile.win32	2009-12-04 18:22:49 +0000
+++ src/Makefile.win32	2014-07-10 22:50:00 +0000
@@ -170,7 +170,7 @@
 LD_FLAGS=-release -nologo -incremental:no -dll "$(EI_DIR)\lib\ei_md.lib" "$(EI_DIR)\lib\erl_interface_md.lib" "$(EXPAT_LIB)" MSVCRT.LIB kernel32.lib advapi32.lib gdi32.lib user32.lib comctl32.lib comdlg32.lib shell32.lib
 
 $(DLL) : $(OBJECT)
-	$(LD) $(LD_FLAGS) -out:$(DLL) $(OBJECT)
+	$(LD) $(LD_FLAGS) -out:$@ $<
 
 $(OBJECT) : $(SOURCE)
-	$(CC) $(CC_FLAGS) -c -Fo$(OBJECT) $(SOURCE)
+	$(CC) $(CC_FLAGS) -c -Fo$@ $<

=== modified file 'src/acl.erl'
--- src/acl.erl	2012-01-08 11:45:38 +0000
+++ src/acl.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 18 Jan 2003 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -181,9 +181,11 @@
 					lists:member(Server, ?MYHOSTS)))
 					  andalso is_regexp_match(User, UR);
 				  {shared_group, G} ->
-				      mod_shared_roster:is_user_in_group({User, Server}, G, Host);
+                                      Mod = loaded_shared_roster_module(Host),
+				      Mod:is_user_in_group({User, Server}, G, Host);
 				  {shared_group, G, H} ->
-				      mod_shared_roster:is_user_in_group({User, Server}, G, H);
+                                      Mod = loaded_shared_roster_module(H),
+				      Mod:is_user_in_group({User, Server}, G, H);
 				  {user_regexp, UR, S} ->
 				      (S == Server) andalso
 					  is_regexp_match(User, UR);
@@ -238,4 +240,10 @@
 is_glob_match(String, Glob) ->
     is_regexp_match(String, ejabberd_regexp:sh_to_awk(Glob)).
 
-
+loaded_shared_roster_module(Host) ->
+    case gen_mod:is_loaded(Host, mod_shared_roster_ldap) of
+        true ->
+            mod_shared_roster_ldap;
+        false ->
+            mod_shared_roster
+    end.

=== modified file 'src/adhoc.erl'
--- src/adhoc.erl	2011-09-11 16:16:55 +0000
+++ src/adhoc.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 31 Oct 2005 by Magnus Henoch <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/adhoc.hrl'
--- src/adhoc.hrl	2011-09-11 16:16:55 +0000
+++ src/adhoc.hrl	2014-07-10 22:50:00 +0000
@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/cache_tab.erl'
--- src/cache_tab.erl	2011-09-11 16:16:55 +0000
+++ src/cache_tab.erl	2014-07-10 22:50:00 +0000
@@ -6,7 +6,7 @@
 %%% Created : 29 Aug 2010 by Evgeniy Khramtsov <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -380,7 +380,12 @@
 		shrink_size = ShrinkSize}.
 
 get_proc_num() ->
-    erlang:system_info(logical_processors).
+    case erlang:system_info(logical_processors) of
+        unknown ->
+            1;
+        Num ->
+            Num
+    end.
 
 get_proc_by_hash(Tab, Term) ->
     N = erlang:phash2(Term, get_proc_num()) + 1,

=== modified file 'src/cache_tab_sup.erl'
--- src/cache_tab_sup.erl	2011-09-11 16:16:55 +0000
+++ src/cache_tab_sup.erl	2014-07-10 22:50:00 +0000
@@ -6,7 +6,7 @@
 %%% Created : 30 Aug 2010 by Evgeniy Khramtsov <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/configure'
--- src/configure	2012-01-08 11:45:38 +0000
+++ src/configure	2014-07-10 22:50:00 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for ejabberd 2.1.10.
+# Generated by GNU Autoconf 2.68 for ejabberd 2.1.12.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -560,8 +560,8 @@
 # Identity of this package.
 PACKAGE_NAME='ejabberd'
 PACKAGE_TARNAME='ejabberd'
-PACKAGE_VERSION='2.1.10'
-PACKAGE_STRING='ejabberd 2.1.10'
+PACKAGE_VERSION='2.1.12'
+PACKAGE_STRING='ejabberd 2.1.12'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL=''
 
@@ -1288,7 +1288,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ejabberd 2.1.10 to adapt to many kinds of systems.
+\`configure' configures ejabberd 2.1.12 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1354,7 +1354,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ejabberd 2.1.10:";;
+     short | recursive ) echo "Configuration of ejabberd 2.1.12:";;
    esac
   cat <<\_ACEOF
 
@@ -1479,7 +1479,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ejabberd configure 2.1.10
+ejabberd configure 2.1.12
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1823,7 +1823,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ejabberd $as_me 2.1.10, which was
+It was created by ejabberd $as_me 2.1.12, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -4984,8 +4984,8 @@
 
 
 case "$target_os" in
-    *darwin10*)
-	echo "Target OS is 'Darwin10'"
+    *darwin*)
+	echo "Target OS is 'Darwin'"
 	ac_ext=erl
 ac_compile='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5'
 ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5 && echo "#!/bin/sh" > conftest$ac_exeext && $as_echo "\"$ERL\" -run conftest start -run init stop -noshell" >> conftest$ac_exeext && chmod +x conftest$ac_exeext'
@@ -5690,7 +5690,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ejabberd $as_me 2.1.10, which was
+This file was extended by ejabberd $as_me 2.1.12, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5743,7 +5743,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ejabberd config.status 2.1.10
+ejabberd config.status 2.1.12
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'src/configure.ac'
--- src/configure.ac	2010-12-14 17:45:08 +0000
+++ src/configure.ac	2014-07-10 22:50:00 +0000
@@ -157,8 +157,8 @@
 
 
 case "$target_os" in
-    *darwin10*)
-	echo "Target OS is 'Darwin10'"
+    *darwin*)
+	echo "Target OS is 'Darwin'"
 	AC_LANG(Erlang)
 	AC_RUN_IFELSE(
 	    [AC_LANG_PROGRAM([],[dnl

=== modified file 'src/configure.erl'
--- src/configure.erl	2011-09-11 16:16:55 +0000
+++ src/configure.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 27 Jan 2003 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/cyrsasl.erl'
--- src/cyrsasl.erl	2011-10-03 20:27:12 +0000
+++ src/cyrsasl.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created :  8 Mar 2003 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/cyrsasl_anonymous.erl'
--- src/cyrsasl_anonymous.erl	2011-10-03 20:27:12 +0000
+++ src/cyrsasl_anonymous.erl	2014-07-10 22:50:00 +0000
@@ -6,7 +6,7 @@
 %%% Created : 23 Aug 2005 by Magnus Henoch <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/cyrsasl_digest.erl'
--- src/cyrsasl_digest.erl	2011-10-03 20:27:12 +0000
+++ src/cyrsasl_digest.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 11 Mar 2003 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -37,9 +37,11 @@
 -behaviour(cyrsasl).
 
 -record(state, {step, nonce, username, authzid, get_password, check_password, auth_module,
-		host}).
+		host, hostfqdn}).
 
 start(_Opts) ->
+    Fqdn = get_local_fqdn(),
+    ?INFO_MSG("FQDN used to check DIGEST-MD5 SASL authentication: ~p", [Fqdn]),
     cyrsasl:register_mechanism("DIGEST-MD5", ?MODULE, digest).
 
 stop() ->
@@ -49,6 +51,7 @@
     {ok, #state{step = 1,
 		nonce = randoms:get_string(),
 		host = Host,
+		hostfqdn = get_local_fqdn(),
 		get_password = GetPassword,
 		check_password = CheckPasswordDigest}}.
 
@@ -64,10 +67,11 @@
 	KeyVals ->
 	    DigestURI = xml:get_attr_s("digest-uri", KeyVals),
 	    UserName = xml:get_attr_s("username", KeyVals),
-	    case is_digesturi_valid(DigestURI, State#state.host) of
+	    case is_digesturi_valid(DigestURI, State#state.host, State#state.hostfqdn) of
 		false ->
 		    ?DEBUG("User login not authorized because digest-uri "
-			   "seems invalid: ~p", [DigestURI]),
+			   "seems invalid: ~p (checking for Host ~p, FQDN ~p)", [DigestURI,
+			   State#state.host, State#state.hostfqdn]),
 		    {error, "not-authorized", UserName};
 		true ->
 		    AuthzId = xml:get_attr_s("authzid", KeyVals),
@@ -154,21 +158,46 @@
 %% 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) ->
+%% then acceptable digest-uris would be:
+%% xmpp/server3.example.org/jabber.example.org, xmpp/server3.example.org and
+%% xmpp/jabber.example.org
+%% The last version is not actually allowed by the RFC, but implemented by popular clients
+is_digesturi_valid(DigestURICase, JabberDomain, JabberFQDN) ->
     DigestURI = stringprep:tolower(DigestURICase),
     case catch string:tokens(DigestURI, "/") of
-	["xmpp", Host] when Host == JabberHost ->
-	    true;
-	["xmpp", _Host, ServName] when ServName == JabberHost ->
-	    true;
+	["xmpp", Host] ->
+	    IsHostFqdn = is_host_fqdn(Host, JabberFQDN),
+	    (Host == JabberDomain) or IsHostFqdn;
+	["xmpp", Host, ServName] ->
+	    IsHostFqdn = is_host_fqdn(Host, JabberFQDN),
+	    (ServName == JabberDomain) and IsHostFqdn;
 	_ ->
 	    false
     end.
 
-
-
+is_host_fqdn(Host, [Letter | _Tail] = Fqdn) when not is_list(Letter) ->
+    Host == Fqdn;
+is_host_fqdn(_Host, []) ->
+    false;
+is_host_fqdn(Host, [Fqdn | _FqdnTail]) when Host == Fqdn ->
+    true;
+is_host_fqdn(Host, [Fqdn | FqdnTail]) when Host /= Fqdn ->
+    is_host_fqdn(Host, FqdnTail).
+
+get_local_fqdn() ->
+    case (catch get_local_fqdn2()) of
+	Str when is_list(Str) -> Str;
+	_ -> "unknown-fqdn, please configure fqdn option in ejabberd.cfg!"
+    end.
+get_local_fqdn2() ->
+    case ejabberd_config:get_local_option(fqdn) of
+	ConfiguredFqdn when is_list(ConfiguredFqdn) ->
+	    ConfiguredFqdn;
+	_undefined ->
+	    {ok, Hostname} = inet:gethostname(),
+	    {ok, {hostent, Fqdn, _, _, _, _}} = inet:gethostbyname(Hostname),
+	    Fqdn
+    end.
 
 digit_to_xchar(D) when (D >= 0) and (D < 10) ->
     D + 48;

=== modified file 'src/cyrsasl_plain.erl'
--- src/cyrsasl_plain.erl	2011-10-03 20:27:12 +0000
+++ src/cyrsasl_plain.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created :  8 Mar 2003 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/cyrsasl_scram.erl'
--- src/cyrsasl_scram.erl	2011-10-03 20:27:12 +0000
+++ src/cyrsasl_scram.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 7 Aug 2011 by Stephen Röttger <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberd.app'
--- src/ejabberd.app	2012-01-08 11:45:38 +0000
+++ src/ejabberd.app	2014-07-10 22:50:00 +0000
@@ -2,7 +2,7 @@
 
 {application, ejabberd,
  [{description, "ejabberd"},
-  {vsn, "2.1.10"},
+  {vsn, "2.1.13"},
   {modules, [acl,
 	     adhoc,
 	     configure,
@@ -78,16 +78,12 @@
 	     mod_irc,
 	     mod_irc_connection,
 	     mod_last,
-	     mod_last_odbc,
 	     mod_muc,
 	     mod_muc_log,
 	     mod_muc_room,
 	     mod_offline,
-	     mod_offline_odbc,
 	     mod_privacy,
-	     mod_privacy_odbc,
 	     mod_private,
-	     mod_private_odbc,
 	     mod_proxy65,
 	     mod_proxy65_lib,
 	     mod_proxy65_service,
@@ -96,14 +92,12 @@
 	     mod_pubsub,
 	     mod_register,
 	     mod_roster,
-	     mod_roster_odbc,
 	     mod_service_log,
 	     mod_shared_roster,
 	     mod_stats,
 	     mod_time,
 	     mod_vcard,
 	     mod_vcard_ldap,
-	     mod_vcard_odbc,
 	     mod_version,
 	     node_buddy,
 	     node_club,

=== modified file 'src/ejabberd.cfg.example'
--- src/ejabberd.cfg.example	2011-10-03 20:27:12 +0000
+++ src/ejabberd.cfg.example	2014-07-10 22:50:00 +0000
@@ -222,6 +222,9 @@
 %% Store the plain passwords or hashed for SCRAM:
 %%{auth_password_format, plain}.
 %%{auth_password_format, scram}.
+%%
+%% Define the FQDN if ejabberd doesn't detect it:
+%%{fqdn, "server3.example.com"}.
 
 %%
 %% Authentication using external script

=== modified file 'src/ejabberd.erl'
--- src/ejabberd.erl	2011-09-11 16:16:55 +0000
+++ src/ejabberd.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 16 Nov 2002 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberd.hrl'
--- src/ejabberd.hrl	2011-10-03 20:27:12 +0000
+++ src/ejabberd.hrl	2014-07-10 22:50:00 +0000
@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberd_admin.erl'
--- src/ejabberd_admin.erl	2012-01-08 11:45:38 +0000
+++ src/ejabberd_admin.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created :  7 May 2006 by Mickael Remond <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -31,6 +31,7 @@
 	 %% Server
 	 status/0, reopen_log/0,
 	 stop_kindly/2, send_service_message_all_mucs/2,
+	 registered_vhosts/0,
 	 %% Erlang
 	 update_list/0, update/1,
 	 %% Accounts
@@ -41,6 +42,7 @@
 	 %% Purge DB
 	 delete_expired_messages/0, delete_old_messages/1,
 	 %% Mnesia
+	 export2odbc/2,
 	 set_master/1,
 	 backup_mnesia/1, restore_mnesia/1,
 	 dump_mnesia/1, dump_table/2, load_mnesia/1,
@@ -85,6 +87,10 @@
 			args = [], result = {res, rescode}},
      #ejabberd_commands{name = stop_kindly, tags = [server],
 			desc = "Inform users and rooms, wait, and stop the server",
+			longdesc = "Provide the delay in seconds, and the "
+			    "announcement quoted, for example: \n"
+			    "ejabberdctl stop_kindly 60 "
+			    "\\\"The server will stop in one minute.\\\"",
 			module = ?MODULE, function = stop_kindly,
 			args = [{delay, integer}, {announcement, string}],
 			result = {res, rescode}},
@@ -123,6 +129,11 @@
 			module = ?MODULE, function = registered_users,
 			args = [{host, string}],
 			result = {users, {list, {username, string}}}},
+	 #ejabberd_commands{name = registered_vhosts, tags = [server],
+			desc = "List all registered vhosts in SERVER",
+			module = ?MODULE, function = registered_vhosts,
+			args = [],
+			result = {vhosts, {list, {vhost, string}}}},
 
      #ejabberd_commands{name = import_file, tags = [mnesia],
 			desc = "Import user data from jabberd14 spool file",
@@ -161,6 +172,11 @@
 			module = mod_pubsub, function = rename_default_nodeplugin,
 			args = [], result = {res, rescode}},
 
+     #ejabberd_commands{name = export2odbc, tags = [mnesia],
+			desc = "Export virtual host information from Mnesia tables to SQL files",
+			module = ?MODULE, function = export2odbc,
+			args = [{host, string}, {directory, string}],
+			result = {res, rescode}},
      #ejabberd_commands{name = set_master, tags = [mnesia],
 			desc = "Set master node of the clustered Mnesia tables",
 			longdesc = "If you provide as nodename \"self\", this "
@@ -271,7 +287,7 @@
 		  - TimestampStart,
 	      io:format("[~p/~p ~ps] ~s... ",
 			[NumberThis, NumberLast, SecondsDiff, Desc]),
-	      Result = apply(Mod, Func, Args),
+	      Result = (catch apply(Mod, Func, Args)),
 	      io:format("~p~n", [Result]),
 	      NumberThis+1
       end,
@@ -338,6 +354,8 @@
     SUsers = lists:sort(Users),
     lists:map(fun({U, _S}) -> U end, SUsers).
 
+registered_vhosts() ->
+	?MYHOSTS.
 
 %%%
 %%% Migration management
@@ -369,18 +387,38 @@
 %%%
 
 delete_expired_messages() ->
-    {atomic, ok} = mod_offline:remove_expired_messages(),
-    ok.
+    lists:foreach(
+      fun(Host) ->
+              {atomic, ok} = mod_offline:remove_expired_messages(Host)
+      end, ?MYHOSTS).
 
 delete_old_messages(Days) ->
-    {atomic, _} = mod_offline:remove_old_messages(Days),
-    ok.
-
+    lists:foreach(
+      fun(Host) ->
+              {atomic, _} = mod_offline:remove_old_messages(Days, Host)
+      end, ?MYHOSTS).
 
 %%%
 %%% Mnesia management
 %%%
 
+export2odbc(Host, Directory) ->
+    Tables = [{export_last, last},
+              {export_offline, offline},
+              {export_private_storage, private_storage},
+              {export_roster, roster},
+              {export_vcard, vcard},
+              {export_vcard_search, vcard_search},
+              {export_passwd, passwd}],
+    Export = fun({TableFun, Table}) ->
+                     Filename = filename:join([Directory, atom_to_list(Table)++".txt"]),
+                     io:format("Trying to export Mnesia table '~p' on Host '~s' to file '~s'~n", [Table, Host, Filename]),
+                     Res = (catch ejd2odbc:TableFun(Host, Filename)),
+                     io:format("  Result: ~p~n", [Res])
+             end,
+    lists:foreach(Export, Tables),
+    ok.
+
 set_master("self") ->
     set_master(node());
 set_master(NodeString) when is_list(NodeString) ->

=== modified file 'src/ejabberd_app.erl'
--- src/ejabberd_app.erl	2011-10-03 20:27:12 +0000
+++ src/ejabberd_app.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 31 Jan 2003 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -78,6 +78,7 @@
 %% This function is called when an application is about to be stopped,
 %% before shutting down the processes of the application.
 prep_stop(State) ->
+    ejabberd_listener:stop_listeners(),
     stop_modules(),
     ejabberd_admin:stop(),
     broadcast_c2s_shutdown(),

=== modified file 'src/ejabberd_auth.erl'
--- src/ejabberd_auth.erl	2011-10-03 20:27:12 +0000
+++ src/ejabberd_auth.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 23 Nov 2002 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberd_auth_anonymous.erl'
--- src/ejabberd_auth_anonymous.erl	2011-10-03 20:27:12 +0000
+++ src/ejabberd_auth_anonymous.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 17 Feb 2006 by Mickael Remond <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberd_auth_external.erl'
--- src/ejabberd_auth_external.erl	2011-10-03 20:27:12 +0000
+++ src/ejabberd_auth_external.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 12 Dec 2004 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -293,27 +293,20 @@
 get_last_info(User, Server) ->
     case get_mod_last_enabled(Server) of
 	mod_last -> mod_last:get_last_info(User, Server);
-	mod_last_odbc -> mod_last_odbc:get_last_info(User, Server);
 	no_mod_last -> mod_last_required
     end.
 
-%% @spec (Server) -> mod_last | mod_last_odbc | no_mod_last
+%% @spec (Server) -> mod_last | no_mod_last
 get_mod_last_enabled(Server) ->
-    ML = gen_mod:is_loaded(Server, mod_last),
-    MLO = gen_mod:is_loaded(Server, mod_last_odbc),
-    case {ML, MLO} of
-	{true, _} -> mod_last;
-	{false, true} -> mod_last_odbc;
-	{false, false} -> no_mod_last
+    case gen_mod:is_loaded(Server, mod_last) of
+        true -> mod_last;
+	false -> no_mod_last
     end.
 
 get_mod_last_configured(Server) ->
-    ML = is_configured(Server, mod_last),
-    MLO = is_configured(Server, mod_last_odbc),
-    case {ML, MLO} of
-	{true, _} -> mod_last;
-	{false, true} -> mod_last_odbc;
-	{false, false} -> no_mod_last
+    case is_configured(Server, mod_last) of
+        true -> mod_last;
+	false -> no_mod_last
     end.
 
 is_configured(Host, Module) ->

=== modified file 'src/ejabberd_auth_internal.erl'
--- src/ejabberd_auth_internal.erl	2011-10-03 20:27:12 +0000
+++ src/ejabberd_auth_internal.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 12 Dec 2004 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberd_auth_ldap.erl'
--- src/ejabberd_auth_ldap.erl	2011-10-03 20:27:12 +0000
+++ src/ejabberd_auth_ldap.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 12 Dec 2004 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberd_auth_odbc.erl'
--- src/ejabberd_auth_odbc.erl	2011-10-03 20:27:12 +0000
+++ src/ejabberd_auth_odbc.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 12 Dec 2004 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberd_auth_pam.erl'
--- src/ejabberd_auth_pam.erl	2011-10-03 20:27:12 +0000
+++ src/ejabberd_auth_pam.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 5 Jul 2007 by Evgeniy Khramtsov <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberd_c2s.erl'
--- src/ejabberd_c2s.erl	2012-01-08 11:45:38 +0000
+++ src/ejabberd_c2s.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 16 Nov 2002 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -556,10 +556,11 @@
 			    fsm_next_state_pack(session_established,
                                                 NewStateData);
 			_ ->
+			    IP = peerip(StateData#state.sockmod, StateData#state.socket),
 			    ?INFO_MSG(
-			       "(~w) Failed legacy authentication for ~s",
+			       "(~w) Failed legacy authentication for ~s from IP ~s (~w)",
 			       [StateData#state.socket,
-				jlib:jid_to_string(JID)]),
+				jlib:jid_to_string(JID), jlib:ip_to_list(IP), IP]),
 			    Err = jlib:make_error_reply(
 				    El, ?ERR_NOT_AUTHORIZED),
 			    send_element(StateData, Err),
@@ -646,10 +647,11 @@
 				   StateData#state{
 				     sasl_state = NewSASLState});
 		{error, Error, Username} ->
+		    IP = peerip(StateData#state.sockmod, StateData#state.socket),
 		    ?INFO_MSG(
-		       "(~w) Failed authentication for ~s@~s",
+		       "(~w) Failed authentication for ~s@~s from IP ~s (~w)",
 		       [StateData#state.socket,
-			Username, StateData#state.server]),
+			Username, StateData#state.server, jlib:ip_to_list(IP), IP]),
 		    send_element(StateData,
 				 {xmlelement, "failure",
 				  [{"xmlns", ?NS_SASL}],
@@ -799,10 +801,11 @@
 		    fsm_next_state(wait_for_sasl_response,
 		     StateData#state{sasl_state = NewSASLState});
 		{error, Error, Username} ->
+		    IP = peerip(StateData#state.sockmod, StateData#state.socket),
 		    ?INFO_MSG(
-		       "(~w) Failed authentication for ~s@~s",
+		       "(~w) Failed authentication for ~s@~s from IP ~s (~w)",
 		       [StateData#state.socket,
-			Username, StateData#state.server]),
+			Username, StateData#state.server, jlib:ip_to_list(IP), IP]),
 		    send_element(StateData,
 				 {xmlelement, "failure",
 				  [{"xmlns", ?NS_SASL}],

=== modified file 'src/ejabberd_c2s_config.erl'
--- src/ejabberd_c2s_config.erl	2011-09-11 16:16:55 +0000
+++ src/ejabberd_c2s_config.erl	2014-07-10 22:50:00 +0000
@@ -6,7 +6,7 @@
 %%% Created :  2 Nov 2007 by Mickael Remond <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberd_captcha.erl'
--- src/ejabberd_captcha.erl	2011-09-11 16:16:55 +0000
+++ src/ejabberd_captcha.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 26 Apr 2008 by Evgeniy Khramtsov <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -304,7 +304,7 @@
 	    Form =
 		{xmlelement, "p", [],
 		 [{xmlcdata,
-		   translate:translate(Lang, "The captcha is valid.")
+		   translate:translate(Lang, "The CAPTCHA is valid.")
 		  }]},
 	    ejabberd_web:make_xhtml([Form]);
 	captcha_non_valid ->

=== modified file 'src/ejabberd_check.erl'
--- src/ejabberd_check.erl	2011-09-11 16:16:55 +0000
+++ src/ejabberd_check.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 27 Feb 2008 by Mickael Remond <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberd_commands.erl'
--- src/ejabberd_commands.erl	2011-09-11 16:16:55 +0000
+++ src/ejabberd_commands.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 20 May 2008 by Badlop <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -381,18 +381,11 @@
     no_auth_provided;
 check_auth({User, Server, Password}) ->
     %% Check the account exists and password is valid
-    AccountPass = ejabberd_auth:get_password_s(User, Server),
-    AccountPassMD5 = get_md5(AccountPass),
-    case Password of
-	AccountPass -> {ok, User, Server};
-	AccountPassMD5 -> {ok, User, Server};
+    case ejabberd_auth:check_password(User, Server, Password) of
+	true -> {ok, User, Server};
 	_ -> throw({error, invalid_account_data})
     end.
 
-get_md5(AccountPass) ->
-    lists:flatten([io_lib:format("~.16B", [X])
-		   || X <- binary_to_list(crypto:md5(AccountPass))]).
-
 check_access(all, _) ->
     true;
 check_access(Access, Auth) ->

=== modified file 'src/ejabberd_commands.hrl'
--- src/ejabberd_commands.hrl	2011-09-11 16:16:55 +0000
+++ src/ejabberd_commands.hrl	2014-07-10 22:50:00 +0000
@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberd_config.erl'
--- src/ejabberd_config.erl	2011-09-11 16:16:55 +0000
+++ src/ejabberd_config.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 14 Dec 2002 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -374,6 +374,9 @@
 	    State;
 	{hosts, _Hosts} ->
 	    State;
+	{fqdn, HostFQDN} ->
+	    ?DEBUG("FQDN set to: ~p", [HostFQDN]),
+	    add_option(fqdn, HostFQDN, State);
 	{host_config, Host, Terms} ->
 	    lists:foldl(fun(T, S) -> process_host_term(T, Host, S) end,
 			State, Terms);
@@ -464,6 +467,8 @@
 	    State;
 	{odbc_server, ODBC_server} ->
 	    add_option({odbc_server, Host}, ODBC_server, State);
+        {modules, Modules} ->
+            add_option({modules, Host}, replace_modules(Modules), State);
 	{Opt, Val} ->
 	    add_option({Opt, Host}, Val, State)
     end.
@@ -607,3 +612,30 @@
 	{error, _Reason} ->
 	    false
     end.
+
+replace_module(mod_announce_odbc) -> {mod_announce, odbc};
+replace_module(mod_blocking_odbc) -> {mod_blocking, odbc};
+replace_module(mod_irc_odbc) -> {mod_irc, odbc};
+replace_module(mod_last_odbc) -> {mod_last, odbc};
+replace_module(mod_muc_odbc) -> {mod_muc, odbc};
+replace_module(mod_offline_odbc) -> {mod_offline, odbc};
+replace_module(mod_privacy_odbc) -> {mod_privacy, odbc};
+replace_module(mod_private_odbc) -> {mod_private, odbc};
+replace_module(mod_roster_odbc) -> {mod_roster, odbc};
+replace_module(mod_shared_roster_odbc) -> {mod_shared_roster, odbc};
+replace_module(mod_vcard_odbc) -> {mod_vcard, odbc};
+replace_module(mod_vcard_xupdate_odbc) -> {mod_vcard_xupdate, odbc};
+replace_module(Module) -> Module.
+
+replace_modules(Modules) ->
+    lists:map(
+      fun({Module, Opts}) ->
+              case replace_module(Module) of
+                  {NewModule, DBType} ->
+                      NewOpts = [{db_type, DBType} |
+                                 lists:keydelete(db_type, 1, Opts)],
+                      {NewModule, NewOpts};
+                  NewModule ->
+                      {NewModule, Opts}
+              end
+      end, Modules).

=== modified file 'src/ejabberd_config.hrl'
--- src/ejabberd_config.hrl	2011-09-11 16:16:55 +0000
+++ src/ejabberd_config.hrl	2014-07-10 22:50:00 +0000
@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberd_ctl.erl'
--- src/ejabberd_ctl.erl	2012-01-08 11:45:38 +0000
+++ src/ejabberd_ctl.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 11 Jan 2004 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -292,6 +292,7 @@
 		    Result = ejabberd_commands:execute_command(AccessCommands, Auth, Command,
 							       ArgsFormatted),
 		    format_result(Result, ResultFormat);
+		%% This case clause is for Erlang R14 and older
 		{'EXIT', {function_clause,[{lists,zip,[A1, A2]} | _]}} ->
 		    {NumCompa, TextCompa} =
 			case {length(A1), length(A2)} of
@@ -300,6 +301,16 @@
 			end,
 		    {io_lib:format("Error: the command ~p requires ~p ~s.",
 				   [CmdString, NumCompa, TextCompa]),
+		     wrong_command_arguments};
+		%% This case clause is for Erlang R15 and newer
+		{'EXIT', {function_clause,[{lists,zip,[A1, A2],_} | _]}} ->
+		    {NumCompa, TextCompa} =
+			case {length(A1), length(A2)} of
+			    {L1, L2} when L1 < L2 -> {L2-L1, "less argument"};
+			    {L1, L2} when L1 > L2 -> {L1-L2, "more argument"}
+			end,
+		    {io_lib:format("Error: the command ~p requires ~p ~s.",
+				   [CmdString, NumCompa, TextCompa]),
 		     wrong_command_arguments}
 	    end
     end.

=== modified file 'src/ejabberd_ctl.hrl'
--- src/ejabberd_ctl.hrl	2011-09-11 16:16:55 +0000
+++ src/ejabberd_ctl.hrl	2014-07-10 22:50:00 +0000
@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberd_frontend_socket.erl'
--- src/ejabberd_frontend_socket.erl	2011-09-11 16:16:55 +0000
+++ src/ejabberd_frontend_socket.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 23 Aug 2006 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberd_hooks.erl'
--- src/ejabberd_hooks.erl	2011-09-11 16:16:55 +0000
+++ src/ejabberd_hooks.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created :  8 Aug 2004 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberd_listener.erl'
--- src/ejabberd_listener.erl	2011-09-11 16:16:55 +0000
+++ src/ejabberd_listener.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 16 Nov 2002 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -290,8 +290,8 @@
 	    CallMod:start(strip_frontend(Module), gen_tcp, Socket, Opts),
 	    accept(ListenSocket, Module, Opts);
 	{error, Reason} ->
-	    ?INFO_MSG("(~w) Failed TCP accept: ~w",
-		      [ListenSocket, Reason]),
+	    ?ERROR_MSG("(~w) Failed TCP accept: ~w",
+                       [ListenSocket, Reason]),
 	    accept(ListenSocket, Module, Opts)
     end.
 

=== modified file 'src/ejabberd_local.erl'
--- src/ejabberd_local.erl	2011-09-11 16:16:55 +0000
+++ src/ejabberd_local.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 30 Nov 2002 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberd_logger_h.erl'
--- src/ejabberd_logger_h.erl	2011-09-11 16:16:55 +0000
+++ src/ejabberd_logger_h.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 23 Oct 2003 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberd_loglevel.erl'
--- src/ejabberd_loglevel.erl	2011-09-11 16:16:55 +0000
+++ src/ejabberd_loglevel.erl	2014-07-10 22:50:00 +0000
@@ -9,7 +9,7 @@
 %%% Created : 29 Nov 2006 by Mickael Remond <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberd_node_groups.erl'
--- src/ejabberd_node_groups.erl	2011-09-11 16:16:55 +0000
+++ src/ejabberd_node_groups.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created :  1 Nov 2006 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberd_piefxis.erl'
--- src/ejabberd_piefxis.erl	2011-10-03 20:27:12 +0000
+++ src/ejabberd_piefxis.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 17 Jul 2008 by Pablo Polvorin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -289,9 +289,10 @@
 
 populate_user(User,Domain,El=#xmlel{name='query', ns='jabber:iq:roster'}) ->
     io:format("Trying to add/update roster list...",[]),
-    case loaded_module(Domain,[mod_roster_odbc,mod_roster]) of
-	{ok, M} ->
-	    case M:set_items(User, Domain, exmpp_xml:xmlel_to_xmlelement(El)) of
+    case loaded_module(Domain, mod_roster) of
+	{ok, _DBType} ->
+	    case mod_roster:set_items(User, Domain,
+                                      exmpp_xml:xmlel_to_xmlelement(El)) of
 		{atomic, ok} ->
 		    io:format(" DONE.~n",[]),
 		    ok;
@@ -302,7 +303,7 @@
 		    {error, not_found}
 	    end;
 	E -> io:format(" ERROR: ~p~n",[E]),
-	     ?ERROR_MSG("No modules loaded [mod_roster, mod_roster_odbc] ~s ~n",
+	     ?ERROR_MSG("No modules loaded [mod_roster] ~s ~n",
 			[exmpp_xml:document_to_list(El)]),
 	     {error, not_found}
     end;
@@ -330,10 +331,10 @@
 
 populate_user(User,Domain,El=#xmlel{name='vCard', ns='vcard-temp'}) ->
     io:format("Trying to add/update vCards...",[]),
-    case loaded_module(Domain,[mod_vcard,mod_vcard_odbc]) of
-	{ok, M}  ->  FullUser = jid_to_old_jid(exmpp_jid:make(User, Domain)),
+    case loaded_module(Domain, mod_vcard) of
+	{ok, _}  ->  FullUser = jid_to_old_jid(exmpp_jid:make(User, Domain)),
 		     IQ = iq_to_old_iq(#iq{type = set, payload = El}),
-		     case M:process_sm_iq(FullUser, FullUser , IQ) of
+		     case mod_vcard:process_sm_iq(FullUser, FullUser , IQ) of
 			 {error,_Err} ->
 			     io:format(" ERROR.~n",[]),
 			     ?ERROR_MSG("Error processing vcard ~s : ~p ~n",
@@ -343,7 +344,7 @@
 		     end;
 	_ ->
 	    io:format(" ERROR.~n",[]),
-	    ?ERROR_MSG("No modules loaded [mod_vcard, mod_vcard_odbc] ~s ~n",
+	    ?ERROR_MSG("No modules loaded [mod_vcard] ~s ~n",
 		       [exmpp_xml:document_to_list(El)]),
 	    {error, not_found}
     end;
@@ -356,8 +357,8 @@
 
 populate_user(User,Domain,El=#xmlel{name='offline-messages'}) ->
     io:format("Trying to add/update offline-messages...",[]),
-    case loaded_module(Domain, [mod_offline, mod_offline_odbc]) of
-	{ok, M} ->
+    case loaded_module(Domain, mod_offline) of
+	{ok, _DBType} ->
 	    ok = exmpp_xml:foreach(
 		   fun (_Element, {xmlcdata, _}) ->
 			   ok;
@@ -367,11 +368,11 @@
 			   FullUser = jid_to_old_jid(exmpp_jid:make(User,
 								    Domain)),
 			   OldChild = exmpp_xml:xmlel_to_xmlelement(Child),
-			   _R = M:store_packet(FullFrom, FullUser, OldChild)
+			   _R = mod_offline:store_packet(FullFrom, FullUser, OldChild)
 		   end, El), io:format(" DONE.~n",[]);
 	_ ->
 	    io:format(" ERROR.~n",[]),
-	    ?ERROR_MSG("No modules loaded [mod_offline, mod_offline_odbc] ~s ~n",
+	    ?ERROR_MSG("No modules loaded [mod_offline] ~s ~n",
 		       [exmpp_xml:document_to_list(El)]),
 	    {error, not_found}
     end;
@@ -384,15 +385,15 @@
 
 populate_user(User,Domain,El=#xmlel{name='query', ns='jabber:iq:private'}) ->
     io:format("Trying to add/update private storage...",[]),
-    case loaded_module(Domain,[mod_private_odbc,mod_private]) of
-	{ok, M} ->
+    case loaded_module(Domain, mod_private) of
+	{ok, _DBType} ->
 	    FullUser = jid_to_old_jid(exmpp_jid:make(User, Domain)),
 	    IQ = iq_to_old_iq(#iq{type = set,
 				  ns = 'jabber:iq:private',
 				  kind = request,
 				  iq_ns = 'jabberd:client',
 				  payload = El}),
-	    case M:process_sm_iq(FullUser, FullUser, IQ ) of
+	    case mod_private:process_sm_iq(FullUser, FullUser, IQ ) of
 		{error, _Err} ->
 		    io:format(" ERROR.~n",[]),
 		    ?ERROR_MSG("Error processing private storage ~s : ~p ~n",
@@ -401,7 +402,7 @@
 	    end;
 	_ ->
 	    io:format(" ERROR.~n",[]),
-	    ?ERROR_MSG("No modules loaded [mod_private, mod_private_odbc] ~s ~n",
+	    ?ERROR_MSG("No modules loaded [mod_private] ~s ~n",
 		       [exmpp_xml:document_to_list(El)]),
 	    {error, not_found}
     end;
@@ -415,13 +416,12 @@
 %%%==================================
 %%%% Utilities
 
-loaded_module(Domain,Options) ->
-    LoadedModules = gen_mod:loaded_modules(Domain),
-    case lists:filter(fun(Module) ->
-			      lists:member(Module, LoadedModules)
-                      end, Options) of
-        [M|_] -> {ok, M};
-        [] -> {error,not_found}
+loaded_module(Domain, Module) ->
+    case gen_mod:is_loaded(Domain, Module) of
+        true ->
+            {ok, gen_mod:db_type(Domain, Module)};
+        false ->
+            {error, not_found}
     end.
 
 jid_to_old_jid(Jid) ->
@@ -574,13 +574,13 @@
 
 %% @spec (InfoName::atom(), Username::string(), Host::string()) -> string()
 extract_user_info(roster, Username, Host) ->
-    case loaded_module(Host,[mod_roster_odbc,mod_roster]) of
-	{ok, M} ->
+    case loaded_module(Host, mod_roster) of
+	{ok, _DBType} ->
 	    From = To = jlib:make_jid(Username, Host, ""),
 	    SubelGet = {xmlelement, "query", [{"xmlns",?NS_ROSTER}], []},
 	    %%IQGet = #iq{type=get, xmlns=?NS_ROSTER, payload=SubelGet}, % this is for 3.0.0 version
 	    IQGet = {iq, "", get, ?NS_ROSTER, "" , SubelGet},
-	    Res = M:process_local_iq(From, To, IQGet),
+	    Res = mod_roster:process_local_iq(From, To, IQGet),
 	    %%[El] = Res#iq.payload, % this is for 3.0.0 version
 	    {iq, _, result, _, _, Els} = Res,
 	    case Els of
@@ -592,8 +592,8 @@
     end;
 
 extract_user_info(offline, Username, Host) ->
-    case loaded_module(Host,[mod_offline,mod_offline_odbc]) of
-	{ok, mod_offline} ->
+    case loaded_module(Host, mod_offline) of
+	{ok, mnesia} ->
 	    Els = mnesia_pop_offline_messages([], Username, Host),
 	    case Els of
 		[] -> "";
@@ -601,30 +601,30 @@
 		    OfEl = {xmlelement, "offline-messages", [], Els},
 		    exmpp_xml:document_to_list(OfEl)
 	    end;
-	{ok, mod_offline_odbc} ->
+	{ok, odbc} ->
 	    "";
 	_E ->
 	    ""
     end;
 
 extract_user_info(private, Username, Host) ->
-    case loaded_module(Host,[mod_private,mod_private_odbc]) of
-	{ok, mod_private} ->
+    case loaded_module(Host, mod_private) of
+	{ok, mnesia} ->
 	    get_user_private_mnesia(Username, Host);
-	{ok, mod_private_odbc} ->
+	{ok, odbc} ->
 	    "";
 	_E ->
 	    ""
     end;
 
 extract_user_info(vcard, Username, Host) ->
-    case loaded_module(Host,[mod_vcard, mod_vcard_odbc, mod_vcard_odbc]) of
-	{ok, M} ->
+    case loaded_module(Host, mod_vcard) of
+	{ok, _DBType} ->
 	    From = To = jlib:make_jid(Username, Host, ""),
 	    SubelGet = {xmlelement, "vCard", [{"xmlns",?NS_VCARD}], []},
 	    %%IQGet = #iq{type=get, xmlns=?NS_VCARD, payload=SubelGet}, % this is for 3.0.0 version
 	    IQGet = {iq, "", get, ?NS_VCARD, "" , SubelGet},
-	    Res = M:process_sm_iq(From, To, IQGet),
+	    Res = mod_vcard:process_sm_iq(From, To, IQGet),
 	    %%[El] = Res#iq.payload, % this is for 3.0.0 version
 	    {iq, _, result, _, _, Els} = Res,
 	    case Els of

=== modified file 'src/ejabberd_rdbms.erl'
--- src/ejabberd_rdbms.erl	2011-09-11 16:16:55 +0000
+++ src/ejabberd_rdbms.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 31 Jan 2003 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberd_receiver.erl'
--- src/ejabberd_receiver.erl	2011-09-11 16:16:55 +0000
+++ src/ejabberd_receiver.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 10 Nov 2003 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -84,16 +84,16 @@
     gen_server:cast(Pid, {change_shaper, Shaper}).
 
 reset_stream(Pid) ->
-    gen_server:call(Pid, reset_stream).
+    do_call(Pid, reset_stream).
 
 starttls(Pid, TLSSocket) ->
-    gen_server:call(Pid, {starttls, TLSSocket}).
+    do_call(Pid, {starttls, TLSSocket}).
 
 compress(Pid, ZlibSocket) ->
-    gen_server:call(Pid, {compress, ZlibSocket}).
+    do_call(Pid, {compress, ZlibSocket}).
 
 become_controller(Pid, C2SPid) ->
-    gen_server:call(Pid, {become_controller, C2SPid}).
+    do_call(Pid, {become_controller, C2SPid}).
 
 close(Pid) ->
     gen_server:cast(Pid, close).
@@ -345,3 +345,11 @@
     ok;
 close_stream(XMLStreamState) ->
     xml_stream:close(XMLStreamState).
+
+do_call(Pid, Msg) ->
+    case catch gen_server:call(Pid, Msg) of
+        {'EXIT', Why} ->
+            {error, Why};
+        Res ->
+            Res
+    end.

=== modified file 'src/ejabberd_regexp.erl'
--- src/ejabberd_regexp.erl	2012-01-08 11:45:38 +0000
+++ src/ejabberd_regexp.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 8 Dec 2011 by Badlop
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberd_router.erl'
--- src/ejabberd_router.erl	2011-09-11 16:16:55 +0000
+++ src/ejabberd_router.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 27 Nov 2002 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberd_s2s.erl'
--- src/ejabberd_s2s.erl	2012-01-08 11:45:38 +0000
+++ src/ejabberd_s2s.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created :  7 Dec 2002 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberd_s2s_in.erl'
--- src/ejabberd_s2s_in.erl	2012-01-08 11:45:38 +0000
+++ src/ejabberd_s2s_in.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created :  6 Dec 2002 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberd_s2s_out.erl'
--- src/ejabberd_s2s_out.erl	2011-10-03 20:27:12 +0000
+++ src/ejabberd_s2s_out.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created :  6 Dec 2002 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberd_service.erl'
--- src/ejabberd_service.erl	2011-09-11 16:16:55 +0000
+++ src/ejabberd_service.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created :  6 Dec 2002 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberd_sm.erl'
--- src/ejabberd_sm.erl	2011-10-03 20:27:12 +0000
+++ src/ejabberd_sm.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 24 Nov 2002 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberd_socket.erl'
--- src/ejabberd_socket.erl	2011-09-11 16:16:55 +0000
+++ src/ejabberd_socket.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 23 Aug 2006 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberd_sup.erl'
--- src/ejabberd_sup.erl	2011-09-11 16:16:55 +0000
+++ src/ejabberd_sup.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 31 Jan 2003 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberd_system_monitor.erl'
--- src/ejabberd_system_monitor.erl	2011-09-11 16:16:55 +0000
+++ src/ejabberd_system_monitor.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 21 Mar 2007 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberd_tmp_sup.erl'
--- src/ejabberd_tmp_sup.erl	2011-09-11 16:16:55 +0000
+++ src/ejabberd_tmp_sup.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 18 Jul 2003 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberd_update.erl'
--- src/ejabberd_update.erl	2012-01-08 11:45:38 +0000
+++ src/ejabberd_update.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 27 Jan 2006 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -69,6 +69,7 @@
 
 %% OTP R14B03 and older provided release_handler_1:eval_script/3
 %% But OTP R14B04 and newer provide release_handler_1:eval_script/5
+%% Dialyzer reports a call to missing function; don't worry.
 eval_script(Script, Apps, LibDirs) ->
     case lists:member({eval_script, 5}, release_handler_1:module_info(exports)) of
 	true ->
@@ -141,21 +142,26 @@
 	release_handler_1:check_script(
 	  LowLevelScript,
 	  [{ejabberd, "", filename:join(Dir, "..")}]),
-    case Check of
-	ok -> 
-	    ?DEBUG("script: ~p~n", [Script]),
-	    ?DEBUG("low level script: ~p~n", [LowLevelScript]),
-	    ?DEBUG("check: ~p~n", [Check]);
-	{ok, []} ->
-	    ?DEBUG("script: ~p~n", [Script]),
-	    ?DEBUG("low level script: ~p~n", [LowLevelScript]),
-	    ?DEBUG("check: ~p~n", [Check]);
-	_ ->
-	    ?ERROR_MSG("script: ~p~n", [Script]),
-	    ?ERROR_MSG("low level script: ~p~n", [LowLevelScript]),
-	    ?ERROR_MSG("check: ~p~n", [Check])
-    end,
-    {Script, LowLevelScript, Check}.
+    Check1 = case Check of
+                 ok ->
+                     %% This clause is for OTP R14B03 and older.
+                     %% Newer Dialyzer reports a never match pattern; don't worry.
+                     ?DEBUG("script: ~p~n", [Script]),
+                     ?DEBUG("low level script: ~p~n", [LowLevelScript]),
+                     ?DEBUG("check: ~p~n", [Check]),
+                     ok;
+                 {ok, []} ->
+                     ?DEBUG("script: ~p~n", [Script]),
+                     ?DEBUG("low level script: ~p~n", [LowLevelScript]),
+                     ?DEBUG("check: ~p~n", [Check]),
+                     ok;
+                 _ ->
+                     ?ERROR_MSG("script: ~p~n", [Script]),
+                     ?ERROR_MSG("low level script: ~p~n", [LowLevelScript]),
+                     ?ERROR_MSG("check: ~p~n", [Check]),
+                     error
+             end,
+    {Script, LowLevelScript, Check1}.
 
 %% Copied from Erlang/OTP file: lib/sasl/src/systools.hrl
 -record(application, 

=== modified file 'src/ejabberd_zlib/Makefile.win32'
--- src/ejabberd_zlib/Makefile.win32	2009-01-15 19:44:58 +0000
+++ src/ejabberd_zlib/Makefile.win32	2014-07-10 22:50:00 +0000
@@ -29,8 +29,8 @@
 LD_FLAGS=-release -nologo -incremental:no -dll "$(EI_DIR)\lib\ei_md.lib" "$(EI_DIR)\lib\erl_interface_md.lib" "$(ZLIB_LIB)" MSVCRT.LIB kernel32.lib advapi32.lib gdi32.lib user32.lib comctl32.lib comdlg32.lib shell32.lib
 
 $(DLL) : $(OBJECT)
-	$(LD) $(LD_FLAGS) -out:$(DLL) $(OBJECT)
+	$(LD) $(LD_FLAGS) -out:$@ $<
 
 $(OBJECT) : $(SOURCE)
-    	$(CC) $(CC_FLAGS) -c -Fo$(OBJECT) $(SOURCE) 
+	$(CC) $(CC_FLAGS) -c -Fo$@ $<
 

=== modified file 'src/ejabberd_zlib/ejabberd_zlib.erl'
--- src/ejabberd_zlib/ejabberd_zlib.erl	2011-10-03 20:27:12 +0000
+++ src/ejabberd_zlib/ejabberd_zlib.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 19 Jan 2006 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberd_zlib/ejabberd_zlib_drv.c'
--- src/ejabberd_zlib/ejabberd_zlib_drv.c	2012-01-08 11:45:38 +0000
+++ src/ejabberd_zlib/ejabberd_zlib_drv.c	2014-07-10 22:50:00 +0000
@@ -1,5 +1,5 @@
 /*
- * ejabberd, Copyright (C) 2002-2011   ProcessOne
+ * ejabberd, Copyright (C) 2002-2013   ProcessOne
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

=== modified file 'src/ejabberdctl.template'
--- src/ejabberdctl.template	2011-10-03 20:27:12 +0000
+++ src/ejabberdctl.template	2014-07-10 22:50:00 +0000
@@ -143,6 +143,9 @@
 # start server
 start ()
 {
+    checknodenameusage
+    [ "$?" -eq 0 ] && echo "\nERROR: The node '$ERLANG_NODE' is already running." && return 1
+
     $EXEC_CMD "$ERL \
       $NAME $ERLANG_NODE \
       -noinput -detached \
@@ -189,6 +192,9 @@
 # start interactive server
 live ()
 {
+    checknodenameusage
+    [ "$?" -eq 0 ] && echo "\nERROR: The node '$ERLANG_NODE' is already running." && return 1
+
     echo "--------------------------------------------------------------------"
     echo ""
     echo "IMPORTANT: ejabberd is going to start in LIVE (interactive) mode."
@@ -362,6 +368,15 @@
     return $status
 }
 
+# check node name is used or not
+# $? --> 0=alreadyused 1=available
+checknodenameusage ()
+{
+    $EXEC_CMD "$ERL \
+      $NAME $ERLANG_NODE \
+	-s erlang halt | grep -c duplicate_name > /dev/null "
+}
+
 case $ARGS in
     ' start') start;;
     ' debug') debug;;

=== modified file 'src/ejd2odbc.erl'
--- src/ejd2odbc.erl	2011-09-11 16:16:55 +0000
+++ src/ejd2odbc.erl	2014-07-10 22:50:00 +0000
@@ -5,7 +5,7 @@
 %%% Created : 22 Aug 2005 by Alexey Shchepin <[e-mail]>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -34,15 +34,26 @@
 	 export_last/2,
 	 export_vcard/2,
 	 export_vcard_search/2,
-	 export_private_storage/2]).
+         export_vcard_xupdate/2,
+	 export_private_storage/2,
+         export_privacy/2,
+         export_motd/2,
+         export_motd_users/2,
+         export_irc_custom/2,
+         export_sr_group/2,
+         export_sr_user/2,
+         export_muc_room/2,
+         export_muc_registered/2]).
 
 -include("ejabberd.hrl").
 -include("jlib.hrl").
 -include("mod_roster.hrl").
+-include("mod_privacy.hrl").
 
 -record(offline_msg, {us, timestamp, expire, from, to, packet}).
 -record(last_activity, {us, timestamp, status}).
 -record(vcard, {us, vcard}).
+-record(vcard_xupdate, {us, hash}).
 -record(vcard_search, {us,
 		       user,     luser,
 		       fn,	 lfn,
@@ -58,6 +69,13 @@
 		       orgunit,	 lorgunit
 		      }).
 -record(private_storage, {usns, xml}).
+-record(irc_custom, {us_host, data}).
+-record(muc_room, {name_host, opts}).
+-record(muc_registered, {us_host, nick}).
+-record(sr_group, {group_host, opts}).
+-record(sr_user, {us, group_host}).
+-record(motd, {server, packet}).
+-record(motd_users, {us, dummy = []}).
 
 -define(MAX_RECORDS_PER_TRANSACTION, 1000).
 
@@ -74,7 +92,13 @@
 export_passwd(Server, Output) ->
     export_common(
       Server, passwd, Output,
-      fun(Host, {passwd, {LUser, LServer}, Password} = _R)
+      fun(_Host, {passwd, {LUser, LServer}, {scram, _, _, _, _}} = _R) ->
+	      ?INFO_MSG("You are trying to export the authentication "
+	                "information of the account ~s@~s, but his password "
+	                "is stored as SCRAM, and ejabberd ODBC authentication "
+	                "doesn't support SCRAM.", [LUser, LServer]),
+	      [];
+         (Host, {passwd, {LUser, LServer}, Password} = _R)
 	 when LServer == Host ->
 	      Username = ejabberd_odbc:escape(LUser),
 	      Pass = ejabberd_odbc:escape(Password),
@@ -250,6 +274,20 @@
 	      []
       end).
 
+export_vcard_xupdate(Server, Output) ->
+    export_common(
+      Server, vcard_xupdate, Output,
+      fun(Host, #vcard_xupdate{us = {LUser, LServer}, hash = Hash})
+            when LServer == Host ->
+	      Username = ejabberd_odbc:escape(LUser),
+	      SHash = ejabberd_odbc:escape(Hash),
+	      ["delete from vcard_xupdate where username='", Username, "';"
+	       "insert into vcard_xupdate(username, hash) "
+	       "values ('", Username, "', '", SHash, "');"];
+	 (_Host, _R) ->
+	      []
+      end).
+
 export_private_storage(Server, Output) ->
     export_common(
       Server, private_storage, Output,
@@ -265,6 +303,167 @@
       	      []
       end).
 
+export_muc_room(Server, Output) ->
+    export_common(
+      Server, muc_room, Output,
+      fun(Host, #muc_room{name_host = {Name, RoomHost}, opts = Opts}) ->
+              case lists:suffix(Host, RoomHost) of
+                  true ->
+                      SName = ejabberd_odbc:escape(Name),
+                      SRoomHost = ejabberd_odbc:escape(RoomHost),
+                      SOpts = ejabberd_odbc:encode_term(Opts),
+                      ["delete from muc_room where name='", SName,
+                       "' and host='", SRoomHost, "';",
+                       "insert into muc_room(name, host, opts) values (",
+                       "'", SName, "', '", SRoomHost, "', '", SOpts, "');"];
+                  false ->
+                      []
+              end
+      end).
+
+export_muc_registered(Server, Output) ->
+    export_common(
+      Server, muc_registered, Output,
+      fun(Host, #muc_registered{us_host = {{U, S}, RoomHost}, nick = Nick}) ->
+              case lists:suffix(Host, RoomHost) of
+                  true ->
+                      SJID = ejabberd_odbc:escape(
+                               jlib:jid_to_string(
+                                 jlib:make_jid(U, S, ""))),
+                      SNick = ejabberd_odbc:escape(Nick),
+                      SRoomHost = ejabberd_odbc:escape(RoomHost),
+                      ["delete from muc_registered where jid='", SJID,
+                       "' and host='", SRoomHost, "';"
+                       "insert into muc_registered(jid, host, nick) values ("
+                       "'", SJID, "', '", SRoomHost, "', '", SNick, "');"];
+                  false ->
+                      []
+              end
+      end).
+
+export_irc_custom(Server, Output) ->
+    export_common(
+      Server, irc_custom, Output,
+      fun(Host, #irc_custom{us_host = {{U, S}, IRCHost}, data = Data}) ->
+              case lists:suffix(Host, IRCHost) of
+                  true ->
+                      SJID = ejabberd_odbc:escape(
+                               jlib:jid_to_string(
+                                 jlib:make_jid(U, S, ""))),
+                      SIRCHost = ejabberd_odbc:escape(IRCHost),
+                      SData = ejabberd_odbc:encode_term(Data),
+                      ["delete from irc_custom where jid='", SJID,
+                       "' and host='", SIRCHost, "';"
+                       "insert into irc_custom(jid, host, data) values ("
+                       "'", SJID, "', '", SIRCHost, "', '", SData, "');"];
+                  false ->
+                      []
+              end
+      end).
+
+export_privacy(Server, Output) ->
+    case ejabberd_odbc:sql_query(
+           jlib:nameprep(Server),
+           ["select id from privacy_list order by id desc limit 1;"]) of
+        {selected, ["id"], [{I}]} ->
+            put(id, list_to_integer(I));
+        _ ->
+            put(id, 0)
+    end,
+    export_common(
+      Server, privacy, Output,
+      fun(Host, #privacy{us = {LUser, LServer},
+                         lists = Lists,
+                         default = Default}) when LServer == Host ->
+              Username = ejabberd_odbc:escape(LUser),
+              if Default /= none ->
+                      SDefault = ejabberd_odbc:escape(Default),
+                      ["delete from privacy_default_list where ",
+                       "username='", Username, "';",
+                       "insert into privacy_default_list(username, name) ",
+                       "values ('", Username, "', '", SDefault, "');"];
+                 true ->
+                      []
+              end ++
+                  lists:flatmap(
+                    fun({Name, List}) ->
+                            SName = ejabberd_odbc:escape(Name),
+                            RItems = lists:map(
+                                       fun mod_privacy:item_to_raw/1,
+                                       List),
+                            ID = integer_to_list(get_id()),
+                            ["delete from privacy_list "
+                             "where username='", Username, "' and name='", SName, "';"
+                             "insert into privacy_list(username, name, id) "
+                             "values ('", Username, "', '", SName, "', '", ID, "');",
+                             "delete from privacy_list_data where id='", ID, "';"
+                             |[["insert into privacy_list_data("
+                                "id, t, value, action, ord, match_all, match_iq, "
+                                "match_message, match_presence_in, "
+                                "match_presence_out) values ('", ID, "', '",
+                                string:join(Items, "', '"), "');"] || Items <- RItems]]
+                    end, Lists);
+         (_Host, _R) ->
+              []
+      end).
+
+export_sr_group(Server, Output) ->
+    export_common(
+      Server, sr_group, Output,
+      fun(Host, #sr_group{group_host = {Group, LServer}, opts = Opts})
+            when LServer == Host ->
+              SGroup = ejabberd_odbc:escape(Group),
+              SOpts = ejabberd_odbc:encode_term(Opts),
+              ["delete from sr_group where name='", Group, "';"
+               "insert into sr_group(name, opts) values ('",
+               SGroup, "', '", SOpts, "');"];
+         (_Host, _R) ->
+              []
+      end).
+
+export_sr_user(Server, Output) ->
+    export_common(
+      Server, sr_user, Output,
+      fun(Host, #sr_user{us = {U, S}, group_host = {Group, LServer}})
+            when LServer == Host ->
+              SGroup = ejabberd_odbc:escape(Group),
+              SJID = ejabberd_odbc:escape(
+                       jlib:jid_to_string(
+                         jlib:jid_tolower(
+                           jlib:make_jid(U, S, "")))),
+              ["delete from sr_user where jid='", SJID,
+               "'and grp='", Group, "';"
+               "insert into sr_user(jid, grp) values ('",
+               SJID, "', '", SGroup, "');"];
+         (_Host, _R) ->
+              []
+      end).
+
+export_motd(Server, Output) ->
+    export_common(
+      Server, motd, Output,
+      fun(Host, #motd{server = LServer, packet = El})
+            when LServer == Host ->
+              ["delete from motd where username='';"
+               "insert into motd(username, xml) values ('', '",
+               ejabberd_odbc:escape(xml:element_to_binary(El)), "');"];
+         (_Host, _R) ->
+              []
+      end).
+
+export_motd_users(Server, Output) ->
+    export_common(
+      Server, motd_users, Output,
+      fun(Host, #motd_users{us = {LUser, LServer}})
+            when LServer == Host, LUser /= "" ->
+              Username = ejabberd_odbc:escape(LUser),
+              ["delete from motd where username='", Username, "';"
+               "insert into motd(username, xml) values ('",
+               Username, "', '');"];
+         (_Host, _R) ->
+              []
+      end).
+
 %%%----------------------------------------------------------------------
 %%% Internal functions
 %%%----------------------------------------------------------------------
@@ -363,3 +562,8 @@
       "'", Username, "',"
       "'", SJID, "',"
       "'", ejabberd_odbc:escape(Group), "')"] || Group <- Groups].
+
+get_id() ->
+    ID = get(id),
+    put(id, ID+1),
+    ID+1.

=== modified file 'src/eldap/eldap.erl'
--- src/eldap/eldap.erl	2012-01-08 11:45:38 +0000
+++ src/eldap/eldap.erl	2014-07-10 22:50:00 +0000
@@ -439,6 +439,7 @@
     end;
 init({Hosts, Port, Rootdn, Passwd, Opts}) ->
     catch ssl:start(),
+    %% ssl:seed was removed in OTP R14B04, newer Dialyzer will complain
     catch ssl:seed(randoms:get_string()),
     Encrypt = case proplists:get_value(encrypt, Opts) of
 		  tls -> tls;
@@ -760,7 +761,6 @@
 %%  {'EXIT', Reason} - Broke
 %%-----------------------------------------------------------------------
 recvd_packet(Pkt, S) ->
-    check_tag(Pkt),
     case asn1rt:decode('ELDAPv3', 'LDAPMessage', Pkt) of
 	{ok,Msg} ->
 	    Op = Msg#'LDAPMessage'.protocolOp,
@@ -873,7 +873,6 @@
 %%  {'EXIT', Reason} - Broken packet
 %%-----------------------------------------------------------------------
 recvd_wait_bind_response(Pkt, S) ->
-    check_tag(Pkt),
     case asn1rt:decode('ELDAPv3', 'LDAPMessage', Pkt) of
 	{ok,Msg} ->
 	    ?DEBUG("~p", [Msg]),
@@ -906,12 +905,6 @@
     end.
 
 
-%%% Sanity check of received packet
-check_tag(Data) ->
-    {_Tag, Data1, _Rb} = asn1rt_ber_bin:decode_tag(Data),
-    {{_Len,_Data2}, _Rb2} = asn1rt_ber_bin:decode_length(Data1),
-    ok.
-
 close_and_retry(S, Timeout) ->
     catch (S#eldap.sockmod):close(S#eldap.fd),
     Queue = dict:fold(

=== modified file 'src/eldap/eldap.hrl'
--- src/eldap/eldap.hrl	2011-10-03 20:27:12 +0000
+++ src/eldap/eldap.hrl	2014-07-10 22:50:00 +0000
@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2011   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

=== modified file 'src/eldap/eldap_filter.erl'
--- src/eldap/eldap_filter.erl	2012-01-08 11:45:38 +0000
+++ src/eldap/eldap_filter.erl	2014-07-10 22:50:00 +0000
@@ -6,7 +6,7 @@