aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_legacyauth.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-04-20 18:20:29 +0100
committerMatthew Wild <mwild1@gmail.com>2011-04-20 18:20:29 +0100
commit4f90add96022e865d02b38ef8dfc6bcd9f7f486f (patch)
tree2ae520ecf1f70575b83532f368d96b9e10b2ee99 /plugins/mod_legacyauth.lua
parent080a1ab98c4c2aae06dee41148d919f9e6a8b644 (diff)
parent49fb45a07bff1f2364743eaae6860c5b3370ebec (diff)
downloadprosody-4f90add96022e865d02b38ef8dfc6bcd9f7f486f.tar.gz
prosody-4f90add96022e865d02b38ef8dfc6bcd9f7f486f.zip
Merge 0.8->trunk
Diffstat (limited to 'plugins/mod_legacyauth.lua')
-rw-r--r--plugins/mod_legacyauth.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/mod_legacyauth.lua b/plugins/mod_legacyauth.lua
index 47a8c0ab..a47f0223 100644
--- a/plugins/mod_legacyauth.lua
+++ b/plugins/mod_legacyauth.lua
@@ -11,7 +11,9 @@
local st = require "util.stanza";
local t_concat = table.concat;
-local secure_auth_only = module:get_option("c2s_require_encryption") or module:get_option("require_encryption");
+local secure_auth_only = module:get_option("c2s_require_encryption")
+ or module:get_option("require_encryption")
+ or not(module:get_option("allow_unencrypted_plain_auth"));
local sessionmanager = require "core.sessionmanager";
local usermanager = require "core.usermanager";