Mercurial > lxmppd-hg-xmllex / changeset
changeset
Merge with 0.7
Mon, 01 Mar 2010 16:04:35 +0000
- author
- Matthew Wild <mwild1@gmail.com>
- date
- Mon, 01 Mar 2010 16:04:35 +0000
- changeset 2723
- 2d5ed733f324
- parent 2719
- d9e3237ad30b (current diff)
- parent 2722
- 2781d063afa0 (diff)
- child 2725
- f96394ad5ab7
Merge with 0.7
--- a/plugins/mod_saslauth.lua Mon Mar 01 16:01:09 2010 +0000 +++ b/plugins/mod_saslauth.lua Mon Mar 01 16:04:35 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/util/sasl_cyrus.lua Mon Mar 01 16:01:09 2010 +0000 +++ b/util/sasl_cyrus.lua Mon Mar 01 16:04:35 2010 +0000 @@ -87,6 +87,7 @@ -- select a mechanism to use function method:select(mechanism) self.mechanism = mechanism; + if not self.mechs then self:mechanisms(); end return self.mechs[mechanism]; end
