Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 20 Apr 2011 18:20:29 +0100
changeset 4259 36ac38fd9cbd
parent 4257 8ff9a03e208b (current diff)
parent 4258 ee445e658848 (diff)
child 4261 b980a4173c1a
Merge 0.8->trunk
--- a/plugins/mod_legacyauth.lua	Mon Apr 18 20:39:37 2011 +0100
+++ b/plugins/mod_legacyauth.lua	Wed Apr 20 18:20:29 2011 +0100
@@ -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";