SASL: Simplified sasl_handler:mechanisms() to return a set, and not an array.

3 files changed, 4 insertions, 4 deletions

diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index 77040448..47c0fbb3 100644
--- a/plugins/mod_saslauth.lua
+++ b/plugins/mod_saslauth.lua
@@ -175,8 +175,8 @@ module:hook("stream-features", function(event)
 			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
diff --git a/util/sasl.lua b/util/sasl.lua
index c9225f0d..1b90086e 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -99,7 +99,7 @@ function method:mechanisms()
 		end
 	end
 	self["possible_mechanisms"] = mechanisms;
-	return array.collect(keys(mechanisms));
+	return mechanisms;
 end
 
 -- select a mechanism to use
diff --git a/util/sasl_cyrus.lua b/util/sasl_cyrus.lua
index 7d35b5e4..b03174f5 100644
--- a/util/sasl_cyrus.lua
+++ b/util/sasl_cyrus.lua
@@ -135,7 +135,7 @@ function method:mechanisms()
 		mechanisms[w] = true;
 	end
 	self.mechs = mechanisms
-	return array.collect(keys(mechanisms));
+	return mechanisms;
 end
 
 -- select a mechanism to use