diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-03-22 14:22:46 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-03-22 14:22:46 +0000 |
commit | a2dec278161293bdb918050f2ef7c4f67ecec5b2 (patch) | |
tree | b1bb7539874dc7f64bb74173129613d40fe99e93 /plugins/mod_dialback.lua | |
parent | 35954e5ddec7de0d46c143ef53f36aec6b254fc2 (diff) | |
parent | 541f26b54247c37eed9889910435e35fbf0d9a24 (diff) | |
download | prosody-a2dec278161293bdb918050f2ef7c4f67ecec5b2.tar.gz prosody-a2dec278161293bdb918050f2ef7c4f67ecec5b2.zip |
Merge 0.9->trunk
Diffstat (limited to 'plugins/mod_dialback.lua')
-rw-r--r-- | plugins/mod_dialback.lua | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua index 34d8a2fb..9dcb0ed5 100644 --- a/plugins/mod_dialback.lua +++ b/plugins/mod_dialback.lua @@ -7,7 +7,6 @@ -- local hosts = _G.hosts; -local s2s_make_authenticated = require "core.s2smanager".make_authenticated; local log = module._log; @@ -110,7 +109,7 @@ module:hook("stanza/jabber:server:dialback:verify", function(event) if dialback_verifying and attr.from == origin.to_host then local valid; if attr.type == "valid" then - s2s_make_authenticated(dialback_verifying, attr.from); + module:fire_event("s2s-authenticated", { session = dialback_verifying, host = attr.from }); valid = "valid"; else -- Warn the original connection that is was not verified successfully @@ -146,7 +145,7 @@ module:hook("stanza/jabber:server:dialback:result", function(event) return true; end if stanza.attr.type == "valid" then - s2s_make_authenticated(origin, attr.from); + module:fire_event("s2s-authenticated", { session = origin, host = attr.from }); else origin:close("not-authorized", "dialback authentication failed"); end |