Changeset

1376:13587cf24435

Adjust PLAIN and DIGEST-MD5 mechanisms to new password_handler API.
author Tobias Markmann <tm@ayena.de>
date Sat, 20 Jun 2009 22:19:24 +0200
parents 1375:50ee4b327f86
children 1377:ae88b9dc7890
files util/sasl.lua
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/util/sasl.lua	Sat Jun 20 19:34:30 2009 +0200
+++ b/util/sasl.lua	Sat Jun 20 22:19:24 2009 +0200
@@ -41,7 +41,7 @@
 		
 		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 @@
 			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 @@
 			
 			--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 = "";