# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1267460631 0
# Node ID f96394ad5ab746d563067ae1c849b5c2570f5534
# Parent  2d5ed733f324ddc8296e2d902f094a921d547944# Parent  3fcf1048a8962724b6da2a0e04f5acc6422c320f
Merge with 0.7

diff -r 2d5ed733f324 -r f96394ad5ab7 plugins/mod_saslauth.lua
--- a/plugins/mod_saslauth.lua	Mon Mar 01 16:04:35 2010 +0000
+++ b/plugins/mod_saslauth.lua	Mon Mar 01 16:23:51 2010 +0000
@@ -36,7 +36,8 @@
 
 local new_sasl;
 if sasl_backend == "cyrus" then
-	prosody.unlock_globals();
+	prosody.unlock_globals(); --FIXME: Figure out why this is needed and
+	                          -- why cyrussasl isn't caught by the sandbox
 	local ok, cyrus = pcall(require, "util.sasl_cyrus");
 	prosody.lock_globals();
 	if ok then