aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2017-07-28 23:47:38 +0100
committerMatthew Wild <mwild1@gmail.com>2017-07-28 23:47:38 +0100
commite9d37d780b2e50e4f3ed34d3c355d651c0375cb2 (patch)
tree3d0d78194ab5828d67c07bac2f07209054155de9 /core
parenta65cd04e353b849f6a3cda6ca746378dd309ee28 (diff)
parent15ee257b357d532f7c8dc1de83b0379b57203268 (diff)
downloadprosody-e9d37d780b2e50e4f3ed34d3c355d651c0375cb2.tar.gz
prosody-e9d37d780b2e50e4f3ed34d3c355d651c0375cb2.zip
Merge 0.10 -> trunk
Diffstat (limited to 'core')
-rw-r--r--core/sessionmanager.lua4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index 9ec05539..e9771c58 100644
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -188,10 +188,14 @@ local function bind_resource(session, resource)
local err;
session.roster, err = rm_load_roster(session.username, session.host);
if err then
+ -- FIXME: Why is all this rollback down here, instead of just doing the roster test up above?
full_sessions[session.full_jid] = nil;
hosts[session.host].sessions[session.username].sessions[resource] = nil;
session.full_jid = nil;
session.resource = nil;
+ if session.type == "c2s" then
+ session.type = "c2s_unbound";
+ end
if next(bare_sessions[session.username..'@'..session.host].sessions) == nil then
bare_sessions[session.username..'@'..session.host] = nil;
hosts[session.host].sessions[session.username] = nil;