aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-07-04 23:44:13 +0100
committerMatthew Wild <mwild1@gmail.com>2012-07-04 23:44:13 +0100
commit02dc79e546ce19f54b858c102943ee6d80eec584 (patch)
tree7297343ac2028741ed144791e15411a840498c79 /plugins
parentc0dcd19718cf520511c8986a5cb73d3de9c49a4c (diff)
downloadprosody-02dc79e546ce19f54b858c102943ee6d80eec584.tar.gz
prosody-02dc79e546ce19f54b858c102943ee6d80eec584.zip
mod_saslauth: Pass session to usermanager.get_sasl_handler()
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_saslauth.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index 804db5f9..f6abd3b8 100644
--- a/plugins/mod_saslauth.lua
+++ b/plugins/mod_saslauth.lua
@@ -208,7 +208,7 @@ module:hook("stanza/urn:ietf:params:xml:ns:xmpp-sasl:auth", function(event)
session.sasl_handler = nil; -- allow starting a new SASL negotiation before completing an old one
end
if not session.sasl_handler then
- session.sasl_handler = usermanager_get_sasl_handler(module.host);
+ session.sasl_handler = usermanager_get_sasl_handler(module.host, session);
end
local mechanism = stanza.attr.mechanism;
if not session.secure and (secure_auth_only or (mechanism == "PLAIN" and not allow_unencrypted_plain_auth)) then
@@ -246,7 +246,7 @@ module:hook("stream-features", function(event)
if secure_auth_only and not origin.secure then
return;
end
- origin.sasl_handler = usermanager_get_sasl_handler(module.host);
+ origin.sasl_handler = usermanager_get_sasl_handler(module.host, origin);
local mechanisms = st.stanza("mechanisms", mechanisms_attr);
for mechanism in pairs(origin.sasl_handler:mechanisms()) do
if mechanism ~= "PLAIN" or origin.secure or allow_unencrypted_plain_auth then