aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/mod_saslauth.lua2
-rwxr-xr-xprosody2
2 files changed, 3 insertions, 1 deletions
diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index 0f4c8b4b..0f809bd8 100644
--- a/plugins/mod_saslauth.lua
+++ b/plugins/mod_saslauth.lua
@@ -36,7 +36,9 @@ local xmlns_stanzas ='urn:ietf:params:xml:ns:xmpp-stanzas';
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 --git a/prosody b/prosody
index 49580bd9..b13369a9 100755
--- a/prosody
+++ b/prosody
@@ -308,7 +308,7 @@ function init_data_store()
end
function prepare_to_start()
- log("debug", "Prosody is using the %s backend for connection handling", server.get_backend());
+ log("info", "Prosody is using the %s backend for connection handling", server.get_backend());
-- Signal to modules that we are ready to start
eventmanager.fire_event("server-starting");
prosody.events.fire_event("server-starting");