# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1303320029 -3600
# Node ID 36ac38fd9cbd03d624f1fc8e6786f7236b7d5e10
# Parent  8ff9a03e208b798d87111295f20e65b76a9fdbb4# Parent  ee445e6588486a61eaa5d6a5f37cc1c6f53916ac
Merge 0.8->trunk

diff -r 8ff9a03e208b -r 36ac38fd9cbd plugins/mod_legacyauth.lua
--- 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";