diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-03-27 22:11:58 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-03-27 22:11:58 +0000 |
| commit | eaf02c2e7fef247e6ff9c4eeb9fb3dfb1c28e5c1 (patch) | |
| tree | 05c689e53d3416f52f0e9c782cf05887e5fe14da /core | |
| parent | 45e1b4d1da5e5c9825e23368d8de92c4c5c390de (diff) | |
| parent | 382cb50f5196dd4a935a09f5515904820a3ea286 (diff) | |
| download | prosody-eaf02c2e7fef247e6ff9c4eeb9fb3dfb1c28e5c1.tar.gz prosody-eaf02c2e7fef247e6ff9c4eeb9fb3dfb1c28e5c1.zip | |
Merge 0.9->0.10 (third time lucky)
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 }; |