# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1267459475 0
# Node ID 2d5ed733f324ddc8296e2d902f094a921d547944
# Parent  d9e3237ad30b1b287959e2243e798b702d828a5c# Parent  2781d063afa032fcf7ac65411cdb80807d70b922
Merge with 0.7

diff -r d9e3237ad30b -r 2d5ed733f324 plugins/mod_saslauth.lua
--- a/plugins/mod_saslauth.lua	Mon Mar 01 16:01:09 2010 +0000
+++ b/plugins/mod_saslauth.lua	Mon Mar 01 16:04:35 2010 +0000
@@ -36,7 +36,9 @@
 
 local new_sasl;
 if sasl_backend == "cyrus" then
+	prosody.unlock_globals();
 	local ok, cyrus = pcall(require, "util.sasl_cyrus");
+	prosody.lock_globals();
 	if ok then
 		local cyrus_new = cyrus.new;
 		new_sasl = function(realm)
diff -r d9e3237ad30b -r 2d5ed733f324 util/sasl_cyrus.lua
--- a/util/sasl_cyrus.lua	Mon Mar 01 16:01:09 2010 +0000
+++ b/util/sasl_cyrus.lua	Mon Mar 01 16:04:35 2010 +0000
@@ -87,6 +87,7 @@
 -- select a mechanism to use
 function method:select(mechanism)
 	self.mechanism = mechanism;
+	if not self.mechs then self:mechanisms(); end
 	return self.mechs[mechanism];
 end