util.pluginloader: Remove unnecessary return value suppressing the real load error

[prosody.git] / util / sasl.lua

diff --git a/util/sasl.lua b/util/sasl.lua
index 11a25f3afa0c0bf01cea0520436057620862a236..a343d608727db0ab80c520b3068db906fafd0d6e 100644 (file)
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -41,7 +41,7 @@ local function new_plain(realm, password_handler)
                
                if authentication == nil or password == nil then return "failure", "malformed-request" end
                
-               local password_encoding, correct_password = self.password_handler(authentication, self.realm, "PLAIN")
+               local password_encoding, correct_password = self.password_handler(authentication, self.realm, self.realm, "PLAIN")
                
                if correct_password == nil then return "failure", "not-authorized"
                elseif correct_password == false then return "failure", "account-disabled" end
@@ -176,7 +176,7 @@ local function new_digest_md5(realm, password_handler)
                        if not response["qop"] then response["qop"] = "auth" end
                        
                        if response["realm"] == nil or response["realm"] == "" then
-                               response["realm"] = self.realm;
+                               response["realm"] = "";
                        elseif response["realm"] ~= self.realm then
                                return "failure", "not-authorized", "Incorrect realm value";
                        end
@@ -199,7 +199,7 @@ local function new_digest_md5(realm, password_handler)
                        
                        --TODO maybe realm support
                        self.username = response["username"];
-                       local password_encoding, Y = self.password_handler(response["username"], response["realm"], "DIGEST-MD5", decoder)
+                       local password_encoding, Y = self.password_handler(response["username"], domain, response["realm"], "DIGEST-MD5", decoder);
                        if Y == nil then return "failure", "not-authorized"
                        elseif Y == false then return "failure", "account-disabled" end
                        local A1 = "";