diff core/sessionmanager.lua @ 6603:e702ae7aa3d9

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 26 Mar 2015 16:49:03 +0000
parents 61b6a4fc65f1
children 78d1706982b2
line wrap: on
line diff
--- a/core/sessionmanager.lua	Tue Mar 24 13:41:18 2015 +0000
+++ b/core/sessionmanager.lua	Thu Mar 26 16:49:03 2015 +0000
@@ -114,7 +114,7 @@
 -- 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 };