--- a/util/sasl.lua	Thu Nov 12 21:57:37 2009 +0100
+++ b/util/sasl.lua	Fri Nov 13 09:21:19 2009 +0100
@@ -30,6 +30,8 @@
 local print = print
 local setmetatable = setmetatable;
 local assert = assert;
+local dofile = dofile;
+local require = require;
 
 require "util.iterators"
 local keys = keys
@@ -120,8 +122,9 @@
 end
 
 -- load the mechanisms
-require "sasl.plain"
-require "sasl.digest-md5"
-require "sasl.scram"
+m = require "util.sasl.plain"
+m.init(registerMechanism)
+--dofile "util/sasl/digest-md5.lua"
+--dofile "util/sasl/scram.lua"
 
 return _M;