diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-07-05 17:40:12 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-07-05 17:40:12 +0100 |
| commit | d7fbc07ca4b77809e07fc47e60f4ca87a7e9f997 (patch) | |
| tree | d14b44262cee1dc74af32fbaa4658385b9552152 /plugins/mod_saslauth.lua | |
| parent | bb7fd8bb306ea2d2893bb7c5bc460ec2f9886687 (diff) | |
| parent | 02dc79e546ce19f54b858c102943ee6d80eec584 (diff) | |
| download | prosody-d7fbc07ca4b77809e07fc47e60f4ca87a7e9f997.tar.gz prosody-d7fbc07ca4b77809e07fc47e60f4ca87a7e9f997.zip | |
Merge 0.9->trunk
Diffstat (limited to 'plugins/mod_saslauth.lua')
| -rw-r--r-- | plugins/mod_saslauth.lua | 4 |
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 |