prosody
a4bb658d3fcb

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Changeset

3363:a4bb658d3fcb

SASL: Simplified sasl_handler:mechanisms() to return a set, and not an array.
author Waqas Hussain <waqas20@gmail.com>
date Wed, 14 Jul 2010 19:56:57 +0500
parents 3362:90bf162303f3
children 3364:6a5d77924949
files plugins/mod_saslauth.lua util/sasl.lua util/sasl_cyrus.lua
diffstat 3 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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