--- a/util/sasl.lua	Tue Aug 03 17:11:40 2010 +0500
+++ b/util/sasl.lua	Tue Aug 03 18:19:45 2010 +0500
@@ -48,9 +48,7 @@
 
 -- create a new SASL object which can be used to authenticate clients
 function new(realm, profile)
-	local sasl_i = {profile = profile};
-	sasl_i.realm = realm;
-	return setmetatable(sasl_i, method);
+	return setmetatable({ profile = profile, realm = realm }, method);
 end
 
 -- get a fresh clone with the same realm and profile
@@ -92,11 +90,9 @@
 end
 
 -- load the mechanisms
-local load_mechs = {"plain", "digest-md5", "anonymous", "scram"}
-for _, mech in ipairs(load_mechs) do
-	local name = "util.sasl."..mech;
-	local m = require(name);
-	m.init(registerMechanism)
-end
+require "util.sasl.plain"     .init(registerMechanism);
+require "util.sasl.digest-md5".init(registerMechanism);
+require "util.sasl.anonymous" .init(registerMechanism);
+require "util.sasl.scram"     .init(registerMechanism);
 
 return _M;