Merge with 0.6 (into 0.7, namely mod_compression fixes)

[prosody.git] / plugins / mod_saslauth.lua

diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index 0f809bd8bb7da2644fa86c04c83646596d7c95d7..0cae5833e099ff1bb0891a73bc18d3b8181f261e 100644 (file)
--- a/plugins/mod_saslauth.lua
+++ b/plugins/mod_saslauth.lua
@@ -36,7 +36,8 @@ local xmlns_stanzas ='urn:ietf:params:xml:ns:xmpp-stanzas';
 
 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