aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_saslauth.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-03-06 16:05:57 +0100
committerKim Alvefur <zash@zash.se>2017-03-06 16:05:57 +0100
commit12a94eee9180b0aa9d885bfe35b1cab651726511 (patch)
tree5a6ccfcd8d9fb6e2f2d1d35910732fba43e61132 /plugins/mod_saslauth.lua
parentfbb5d2716262098026125ab7ae1e2ca8b9bc147f (diff)
parent69990587c92aacfad843fa8f72d49af5870086f5 (diff)
downloadprosody-12a94eee9180b0aa9d885bfe35b1cab651726511.tar.gz
prosody-12a94eee9180b0aa9d885bfe35b1cab651726511.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_saslauth.lua')
-rw-r--r--plugins/mod_saslauth.lua8
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index ee468c17..8bbf6349 100644
--- a/plugins/mod_saslauth.lua
+++ b/plugins/mod_saslauth.lua
@@ -82,7 +82,7 @@ local function sasl_process_cdata(session, stanza)
return true;
end
-module:hook_stanza(xmlns_sasl, "success", function (session, stanza)
+module:hook_tag(xmlns_sasl, "success", function (session, stanza)
if session.type ~= "s2sout_unauthed" or session.external_auth ~= "attempting" then return; end
module:log("debug", "SASL EXTERNAL with %s succeeded", session.to_host);
session.external_auth = "succeeded"
@@ -93,7 +93,7 @@ module:hook_stanza(xmlns_sasl, "success", function (session, stanza)
return true;
end)
-module:hook_stanza(xmlns_sasl, "failure", function (session, stanza)
+module:hook_tag(xmlns_sasl, "failure", function (session, stanza)
if session.type ~= "s2sout_unauthed" or session.external_auth ~= "attempting" then return; end
local text = stanza:get_child_text("text");
@@ -105,7 +105,7 @@ module:hook_stanza(xmlns_sasl, "failure", function (session, stanza)
end
end
if text and condition then
- condition = connection .. ": " .. text;
+ condition = condition .. ": " .. text;
end
module:log("info", "SASL EXTERNAL with %s failed: %s", session.to_host, condition);
@@ -114,7 +114,7 @@ module:hook_stanza(xmlns_sasl, "failure", function (session, stanza)
return true;
end, 500)
-module:hook_stanza("http://etherx.jabber.org/streams", "features", function (session, stanza)
+module:hook_tag("http://etherx.jabber.org/streams", "features", function (session, stanza)
if session.type ~= "s2sout_unauthed" or not session.secure then return; end
local mechanisms = stanza:get_child("mechanisms", xmlns_sasl)