mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.8->trunk

Browse source
This commit is contained in:
Matthew Wild 2011-06-07 01:29:34 +01:00
commit 7d8433ac02
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/mod_dialback.lua
View file

@ -60,7 +60,7 @@ module:hook("stanza/jabber:server:dialback:result", function(event)
return true;
end
dialback_requests[attr.from] = origin;
dialback_requests[attr.from.."/"..origin.streamid] = origin;
if not origin.from_host then
-- Just used for friendlier logging
@ -83,8 +83,8 @@ module:hook("stanza/jabber:server:dialback:verify", function(event)
if origin.type == "s2sout_unauthed" or origin.type == "s2sout" then
local attr = stanza.attr;
local dialback_verifying = dialback_requests[attr.from];
if dialback_verifying then
local dialback_verifying = dialback_requests[attr.from.."/"..(attr.id or "")];
if dialback_verifying and attr.from == origin.to_host then
local valid;
if attr.type == "valid" then
s2s_make_authenticated(dialback_verifying, attr.from);
@ -101,7 +101,7 @@ module:hook("stanza/jabber:server:dialback:verify", function(event)
st.stanza("db:result", { from = attr.to, to = attr.from, id = attr.id, type = valid })
:text(dialback_verifying.hosts[attr.from].dialback_key));
end
dialback_requests[attr.from] = nil;
dialback_requests[attr.from.."/"..(attr.id or "")] = nil;
end
return true;
end