Mercurial > lxmppd-hg-xmllex / changeset
changeset
Merge with 0.7/waqas
Mon, 01 Mar 2010 16:03:37 +0000
- author
- Matthew Wild <mwild1@gmail.com>
- date
- Mon, 01 Mar 2010 16:03:37 +0000
- changeset 2722
- 2781d063afa0
- parent 2721
- cf97b85c27b5 (diff)
- parent 2720
- 289f68e704da (current diff)
- child 2723
- 2d5ed733f324
- child 2724
- 3fcf1048a896
Merge with 0.7/waqas
--- 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");
