diff options
| author | Kim Alvefur <zash@zash.se> | 2014-03-25 19:18:32 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-03-25 19:18:32 +0100 |
| commit | a479cb0e199235e6ba72de332f3994551cfa2cbb (patch) | |
| tree | 652efec3423f31c2562f4eab50e0bd3d48bf884c /util | |
| parent | f74e377a23600b3284f2cc9c4676c9836bae9d89 (diff) | |
| parent | f7d4b04bf17c8b634eae00e814a995a88c5ba6cb (diff) | |
| download | prosody-a479cb0e199235e6ba72de332f3994551cfa2cbb.tar.gz prosody-a479cb0e199235e6ba72de332f3994551cfa2cbb.zip | |
Merge 0.10->trunk
Diffstat (limited to 'util')
| -rw-r--r-- | util/sasl.lua | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/util/sasl.lua b/util/sasl.lua index c8490842..b91e29a6 100644 --- a/util/sasl.lua +++ b/util/sasl.lua @@ -100,14 +100,16 @@ end function method:mechanisms() local current_mechs = {}; for mech, _ in pairs(self.mechs) do - if mechanism_channelbindings[mech] and self.profile.cb then - local ok = false; - for cb_name, _ in pairs(self.profile.cb) do - if mechanism_channelbindings[mech][cb_name] then - ok = true; + if mechanism_channelbindings[mech] then + if self.profile.cb then + local ok = false; + for cb_name, _ in pairs(self.profile.cb) do + if mechanism_channelbindings[mech][cb_name] then + ok = true; + end end + if ok == true then current_mechs[mech] = true; end end - if ok == true then current_mechs[mech] = true; end else current_mechs[mech] = true; end |