From 8049a9c15fdbf78f0284240ef532e90228e6d4ad Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Fri, 28 Jul 2017 23:45:05 +0100 Subject: sessionmanager: Revert session.type if binding fails due to roster load error --- core/sessionmanager.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua index f7f36ae3..6c9ecc24 100644 --- a/core/sessionmanager.lua +++ b/core/sessionmanager.lua @@ -187,10 +187,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; -- cgit v1.2.3