diff options
| author | Kim Alvefur <zash@zash.se> | 2015-03-27 00:27:29 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-03-27 00:27:29 +0100 |
| commit | 9ec7962a94e3f7366effff95755cab2099fa8fea (patch) | |
| tree | be7cc75b1f7dba7e6b881c22d277c0f79401261f /core | |
| parent | 45e1b4d1da5e5c9825e23368d8de92c4c5c390de (diff) | |
| parent | 382cb50f5196dd4a935a09f5515904820a3ea286 (diff) | |
| download | prosody-9ec7962a94e3f7366effff95755cab2099fa8fea.tar.gz prosody-9ec7962a94e3f7366effff95755cab2099fa8fea.zip | |
Merge 0.9->0.10 again
Diffstat (limited to 'core')
| -rw-r--r-- | core/sessionmanager.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua index 476de931..8767e869 100644 --- a/core/sessionmanager.lua +++ b/core/sessionmanager.lua @@ -114,7 +114,7 @@ end -- returns nil, err_type, err, err_message on failure function bind_resource(session, resource) if not session.username then return nil, "auth", "not-authorized", "Cannot bind resource before authentication"; end - if session.resource then return nil, "cancel", "already-bound", "Cannot bind multiple resources on a single connection"; end + if session.resource then return nil, "cancel", "not-allowed", "Cannot bind multiple resources on a single connection"; end -- We don't support binding multiple resources local event_payload = { session = session, resource = resource }; |