Mercurial > lxmppd-hg-xmllex / changeset

--- a/plugins/mod_saslauth.lua	Wed Jul 14 19:49:43 2010 +0500
+++ b/plugins/mod_saslauth.lua	Wed Jul 14 19:56:57 2010 +0500
@@ -175,8 +175,8 @@
 			end
 		end
 		features:tag("mechanisms", mechanisms_attr);
-		for k, v in pairs(origin.sasl_handler:mechanisms()) do
-			features:tag("mechanism"):text(v):up();
+		for k in pairs(origin.sasl_handler:mechanisms()) do
+			features:tag("mechanism"):text(k):up();
 		end
 		features:up();
 	else

--- a/util/sasl.lua	Wed Jul 14 19:49:43 2010 +0500
+++ b/util/sasl.lua	Wed Jul 14 19:56:57 2010 +0500
@@ -99,7 +99,7 @@
 		end
 	end
 	self["possible_mechanisms"] = mechanisms;
-	return array.collect(keys(mechanisms));
+	return mechanisms;
 end
 
 -- select a mechanism to use

--- a/util/sasl_cyrus.lua	Wed Jul 14 19:49:43 2010 +0500
+++ b/util/sasl_cyrus.lua	Wed Jul 14 19:56:57 2010 +0500
@@ -135,7 +135,7 @@
 		mechanisms[w] = true;
 	end
 	self.mechs = mechanisms
-	return array.collect(keys(mechanisms));
+	return mechanisms;
 end
 
 -- select a mechanism to use