util.sasl, util.sasl_cyrus: Load mechanisms list early rather than lazily, as they are always loaded anyway.

2 files changed, 17 insertions, 24 deletions

diff --git a/util/sasl.lua b/util/sasl.lua
index 30e4b5df..3eb2db65 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -48,7 +48,15 @@ end
 
 -- create a new SASL object which can be used to authenticate clients
 function new(realm, profile)
-	return setmetatable({ profile = profile, realm = realm }, method);
+	local mechanisms = {};
+	for backend, f in pairs(profile) do
+		if backend_mechanism[backend] then
+			for _, mechanism in ipairs(backend_mechanism[backend]) do
+				mechanisms[mechanism] = true;
+			end
+		end
+	end
+	return setmetatable({ profile = profile, realm = realm, mechs = mechanisms }, method);
 end
 
 -- get a fresh clone with the same realm and profile
@@ -58,19 +66,7 @@ end
 
 -- get a list of possible SASL mechanims to use
 function method:mechanisms()
-	local mechanisms = self.mechs;
-	if not mechanisms then
-		mechanisms = {}
-		for backend, f in pairs(self.profile) do
-			if backend_mechanism[backend] then
-				for _, mechanism in ipairs(backend_mechanism[backend]) do
-					mechanisms[mechanism] = true;
-				end
-			end
-		end
-		self.mechs = mechanisms;
-	end
-	return mechanisms;
+	return self.mechs;
 end
 
 -- select a mechanism to use
diff --git a/util/sasl_cyrus.lua b/util/sasl_cyrus.lua
index aafd5455..1f901d57 100644
--- a/util/sasl_cyrus.lua
+++ b/util/sasl_cyrus.lua
@@ -100,6 +100,12 @@ function new(realm, service_name, app_name)
 	end
 
 	cyrussasl.setssf(sasl_i.cyrus, 0, 0xffffffff)
+	local mechanisms = {};
+	local cyrus_mechs = cyrussasl.listmech(sasl_i.cyrus, nil, "", " ", "");
+	for w in s_gmatch(cyrus_mechs, "[^ ]+") do
+		mechanisms[w] = true;
+	end
+	sasl_i.mechs = mechanisms;
 	return setmetatable(sasl_i, method);
 end
 
@@ -110,16 +116,7 @@ end
 
 -- get a list of possible SASL mechanims to use
 function method:mechanisms()
-	local mechanisms = self.mechs;
-	if not mechanisms then
-		mechanisms = {}
-		local cyrus_mechs = cyrussasl.listmech(self.cyrus, nil, "", " ", "")
-		for w in s_gmatch(cyrus_mechs, "[^ ]+") do
-			mechanisms[w] = true;
-		end
-		self.mechs = mechanisms
-	end
-	return mechanisms;
+	return self.mechs;
 end
 
 -- select a mechanism to use