aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-03-27 22:11:58 +0000
committerMatthew Wild <mwild1@gmail.com>2015-03-27 22:11:58 +0000
commit29f906c30d10ce983b6c034d88bf7a3c8b576bb0 (patch)
tree05c689e53d3416f52f0e9c782cf05887e5fe14da /core
parent13edf3e093fd656d5110b277eca4c9805f3d925c (diff)
parent51bef3673c57c5a2e323a7eb1424c85498905f53 (diff)
downloadprosody-29f906c30d10ce983b6c034d88bf7a3c8b576bb0.tar.gz
prosody-29f906c30d10ce983b6c034d88bf7a3c8b576bb0.zip
Merge 0.9->0.10 (third time lucky)
Diffstat (limited to 'core')
-rw-r--r--core/sessionmanager.lua2
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 };