diff options
| author | Badlop <badlop@process-one.net> | 2011-08-17 19:33:08 +0200 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2011-08-17 19:44:56 +0200 |
| commit | fef8c3a1f301b65b2a011efc254af1256b6c2c63 (patch) | |
| tree | f1defb6b65494a984cb827b5508b95f73df05025 /doc/guide.tex | |
| parent | Fix problems detected by Dialyzer (diff) | |
New option resource_conflict defines server action (thanks to Lee Boynton)(EJAB-650)
Diffstat (limited to 'doc/guide.tex')
| -rw-r--r-- | doc/guide.tex | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/guide.tex b/doc/guide.tex index 890b1bff7..47bed9f72 100644 --- a/doc/guide.tex +++ b/doc/guide.tex @@ -1243,6 +1243,16 @@ defines in what format the users passwords are stored: This format allows clients to authenticate using: \term{SASL PLAIN} and \term{SASL SCRAM-SHA-1}. \end{description} +The option \option{resource\_conflict} defines the action when a client attempts to +login to an account with a resource that is already connected. +The option syntax is: +\esyntax{\{resource\_conflict, setresource|closenew|closeold\}.} +The possible values match exactly the three possibilities described in +\footahref{http://tools.ietf.org/html/rfc6120\#section-7.7.2.2}{XMPP Core: section 7.7.2.2}. +The default value is \term{closeold}. +If the client uses old Jabber Non-SASL authentication (\xepref{0078}), +then this option is not respected, and the action performed is \term{closeold}. + Examples: \begin{itemize} \item To use internal Mnesia storage with hashed passwords on all virtual hosts: |