diff plugins/mod_saslauth.lua @ 1489:4da0131a5ccb

Merged with trunk
author Waqas Hussain <waqas20@gmail.com>
date Mon, 06 Jul 2009 01:40:43 +0500
parents 3e04efa8af7e
children 841d61be198f
line wrap: on
line diff
--- a/plugins/mod_saslauth.lua	Mon Jul 06 01:37:57 2009 +0500
+++ b/plugins/mod_saslauth.lua	Mon Jul 06 01:40:43 2009 +0500
@@ -12,7 +12,6 @@
 local sm_bind_resource = require "core.sessionmanager".bind_resource;
 local sm_make_authenticated = require "core.sessionmanager".make_authenticated;
 local base64 = require "util.encodings".base64;
-local to_unicode = require "util.encodings".idna.to_unicode;
 
 local datamanager_load = require "util.datamanager".load;
 local usermanager_validate_credentials = require "core.usermanager".validate_credentials;
@@ -66,13 +65,13 @@
 end
 
 local function password_callback(node, hostname, realm, mechanism, decoder)
-	local password = (datamanager_load(node, to_unicode(hostname), "accounts") or {}).password; -- FIXME handle hashed passwords
+	local password = (datamanager_load(node, hostname, "accounts") or {}).password; -- FIXME handle hashed passwords
 	local func = function(x) return x; end;
 	if password then
 		if mechanism == "PLAIN" then
 			return func, password;
 		elseif mechanism == "DIGEST-MD5" then
-			if decoder then node, hostname, password = decoder(node), decoder(hostname), decoder(password); end
+			if decoder then node, realm, password = decoder(node), decoder(realm), decoder(password); end
 			return func, md5(node..":"..realm..":"..password);
 		end
 	end