aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_saslauth.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-10-07 12:56:53 +0200
committerKim Alvefur <zash@zash.se>2013-10-07 12:56:53 +0200
commita732f8846e7fcb81ca1e098b0f73fd394d11df54 (patch)
tree121f351fb160d4534449768e1c2808a66e05e74e /plugins/mod_saslauth.lua
parent8463f5b4978d92484f85cb3f3c3f08b4f7bb310e (diff)
parentc89ca6cad504e083f310f82177d32dea0e25f462 (diff)
downloadprosody-a732f8846e7fcb81ca1e098b0f73fd394d11df54.tar.gz
prosody-a732f8846e7fcb81ca1e098b0f73fd394d11df54.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_saslauth.lua')
-rw-r--r--plugins/mod_saslauth.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index f24eacf8..4513c511 100644
--- a/plugins/mod_saslauth.lua
+++ b/plugins/mod_saslauth.lua
@@ -242,7 +242,7 @@ module:hook("stream-features", function(event)
return;
end
origin.sasl_handler = usermanager_get_sasl_handler(module.host, origin);
- if origin.secure then
+ if origin.encrypted then
-- check wether LuaSec has the nifty binding to the function needed for tls-unique
-- FIXME: would be nice to have this check only once and not for every socket
if origin.conn:socket().getpeerfinished then