diff options
| author | Matthew Wild <mwild1@gmail.com> | 2011-04-20 18:20:29 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2011-04-20 18:20:29 +0100 |
| commit | ea9555eec65548076e11ac0a9497dc17254f3db5 (patch) | |
| tree | 2ae520ecf1f70575b83532f368d96b9e10b2ee99 | |
| parent | 7fc81bfa420582ef490f78988db39941087e2e43 (diff) | |
| parent | 49fb45a07bff1f2364743eaae6860c5b3370ebec (diff) | |
| download | prosody-ea9555eec65548076e11ac0a9497dc17254f3db5.tar.gz prosody-ea9555eec65548076e11ac0a9497dc17254f3db5.zip | |
Merge 0.8->trunk
| -rw-r--r-- | plugins/mod_legacyauth.lua | 4 |
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"; |