Merging SASL buggy client workaround with current tip.

1 files changed, 2 insertions, 1 deletions

diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua
index 2fb976b5..7c34eefa 100644
--- a/plugins/mod_presence.lua
+++ b/plugins/mod_presence.lua
@@ -252,7 +252,7 @@ local function presence_handler(data)
 	if origin.type == "c2s" then

 		if to ~= nil and not(origin.roster[to_bare] and (origin.roster[to_bare].subscription == "both" or origin.roster[to_bare].subscription == "from")) then -- directed presence

 			origin.directed = origin.directed or {};

-			origin.directed[to] = true;

+			origin.directed[to] = true; -- FIXME does it make more sense to add to_bare rather than to?

 		end

 		if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" and stanza.attr.type ~= "error" then

 			handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza);

@@ -268,6 +268,7 @@ local function presence_handler(data)
 			core_route_stanza(origin, stanza);

 		end

 	end

+	return true;

 end

 

 local add_handler = require "core.eventmanager2".add_handler;