mod_saslauth: Pass session to usermanager.get_sasl_handler()
authorMatthew Wild <mwild1@gmail.com>
Wed, 4 Jul 2012 22:44:13 +0000 (23:44 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 4 Jul 2012 22:44:13 +0000 (23:44 +0100)
plugins/mod_saslauth.lua

index 804db5f9dc54d250aed08becbb734568fcf21c19..f6abd3b88838f34371ba7524cab26b378e07a63b 100644 (file)
@@ -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