diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-07-28 01:14:31 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-07-28 01:14:31 +0100 |
| commit | fbe75768718891167313bc0cbcffcd3a46042d31 (patch) | |
| tree | 2732225257e7b8ade28695dad7c0df3f7cea00b1 /plugins/mod_saslauth.lua | |
| parent | 8395775fc1bd1e72a8c83927003d2af1ed5f304a (diff) | |
| parent | f926338983c2f1dd0276d41e3c3d8e28cbef3d02 (diff) | |
| download | prosody-fbe75768718891167313bc0cbcffcd3a46042d31.tar.gz prosody-fbe75768718891167313bc0cbcffcd3a46042d31.zip | |
Merge with Florob
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 |