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 | 603d0df6e2829a8d6dd5d359fd41e09b47469965 (patch) | |
| tree | be7cc75b1f7dba7e6b881c22d277c0f79401261f /core/sessionmanager.lua | |
| parent | 13edf3e093fd656d5110b277eca4c9805f3d925c (diff) | |
| parent | 51bef3673c57c5a2e323a7eb1424c85498905f53 (diff) | |
| download | prosody-603d0df6e2829a8d6dd5d359fd41e09b47469965.tar.gz prosody-603d0df6e2829a8d6dd5d359fd41e09b47469965.zip | |
Merge 0.9->0.10 again
Diffstat (limited to 'core/sessionmanager.lua')
| -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 }; |