Merge 0.10->trunk

[prosody.git] / plugins / mod_legacyauth.lua

diff --git a/plugins/mod_legacyauth.lua b/plugins/mod_legacyauth.lua
index 54cbec24c2c20a6fed1ef7b3147a446112ca33d3..5edc26bb2567604348e42d33b00854f4f24db921 100644 (file)
--- a/plugins/mod_legacyauth.lua
+++ b/plugins/mod_legacyauth.lua
@@ -11,8 +11,8 @@
 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",
+       module:get_option("require_encryption"))
        or not(module:get_option("allow_unencrypted_plain_auth"));
 
 local sessionmanager = require "core.sessionmanager";