aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_saslauth.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-03-22 14:22:46 +0000
committerMatthew Wild <mwild1@gmail.com>2013-03-22 14:22:46 +0000
commit4f7c31c0f98b9b4fd6ff12e8770dbdd5bff8cea2 (patch)
treeb1bb7539874dc7f64bb74173129613d40fe99e93 /plugins/mod_saslauth.lua
parent1f4c3c34e97e3def573619480115c6a02300af08 (diff)
parentb8efb428ea0ddea38732edc873281552ffe592e5 (diff)
downloadprosody-4f7c31c0f98b9b4fd6ff12e8770dbdd5bff8cea2.tar.gz
prosody-4f7c31c0f98b9b4fd6ff12e8770dbdd5bff8cea2.zip
Merge 0.9->trunk
Diffstat (limited to 'plugins/mod_saslauth.lua')
-rw-r--r--plugins/mod_saslauth.lua5
1 files changed, 2 insertions, 3 deletions
diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index 264ee967..b75b1844 100644
--- a/plugins/mod_saslauth.lua
+++ b/plugins/mod_saslauth.lua
@@ -11,7 +11,6 @@
local st = require "util.stanza";
local sm_bind_resource = require "core.sessionmanager".bind_resource;
local sm_make_authenticated = require "core.sessionmanager".make_authenticated;
-local s2s_make_authenticated = require "core.s2smanager".make_authenticated;
local base64 = require "util.encodings".base64;
local cert_verify_identity = require "util.x509".verify_identity;
@@ -90,7 +89,7 @@ module:hook_stanza(xmlns_sasl, "success", function (session, stanza)
session:reset_stream();
session:open_stream();
- s2s_make_authenticated(session, session.to_host);
+ module:fire_event("s2s-authenticated", { session = session, host = session.to_host });
return true;
end)
@@ -187,7 +186,7 @@ local function s2s_external_auth(session, stanza)
local domain = text ~= "" and text or session.from_host;
module:log("info", "Accepting SASL EXTERNAL identity from %s", domain);
- s2s_make_authenticated(session, domain);
+ module:fire_event("s2s-authenticated", { session = session, host = domain });
session:reset_stream();
return true
end