prosody
289f68e704da%3A2781d063afa0
Software / code / prosody
Changeset
2722:2781d063afa0
Merge with 0.7/waqas
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 01 Mar 2010 16:03:37 +0000 |
| parents | 2721:cf97b85c27b5 (diff) 2720:289f68e704da (current diff) |
| children | 2723:2d5ed733f324 2724:3fcf1048a896 |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_saslauth.lua Mon Mar 01 18:37:47 2010 +0500 +++ b/plugins/mod_saslauth.lua Mon Mar 01 16:03:37 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)
--- a/prosody Mon Mar 01 18:37:47 2010 +0500 +++ b/prosody Mon Mar 01 16:03:37 2010 +0000 @@ -308,7 +308,7 @@ 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");
