diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-03-26 16:49:03 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-03-26 16:49:03 +0000 |
| commit | f52319aeb3d82d34fdf8699084cdff3460d43c5c (patch) | |
| tree | 5c9f629f0035697faa311531db3b3d0267e4f1e3 /core | |
| parent | 829b01aba17e13d75c13679fe6343171378e25d9 (diff) | |
| parent | 5cc3f03d5aab0516358addd949281c2e3fa70688 (diff) | |
| download | prosody-f52319aeb3d82d34fdf8699084cdff3460d43c5c.tar.gz prosody-f52319aeb3d82d34fdf8699084cdff3460d43c5c.zip | |
Merge 0.10->trunk
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 }; |