# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1368874983 -3600
# Node ID b9c836dc8f2a74a03265980c23ec43b33c5884d9
# Parent  98a485212592c9ca2aba82ddaec5e6bf0864bb51# Parent  ad66ee47b67445778088178a7375cf00bd7ea08c
Merge 0.9->trunk

diff -r 98a485212592 -r b9c836dc8f2a plugins/mod_s2s/mod_s2s.lua
--- a/plugins/mod_s2s/mod_s2s.lua	Fri May 17 18:28:05 2013 +0200
+++ b/plugins/mod_s2s/mod_s2s.lua	Sat May 18 12:03:03 2013 +0100
@@ -37,7 +37,7 @@
 local secure_auth = module:get_option_boolean("s2s_secure_auth", false); -- One day...
 local secure_domains, insecure_domains =
 	module:get_option_set("s2s_secure_domains", {})._items, module:get_option_set("s2s_insecure_domains", {})._items;
-local require_encryption = module:get_option_boolean("s2s_require_encryption", secure_auth);
+local require_encryption = module:get_option_boolean("s2s_require_encryption", false);
 
 local sessions = module:shared("sessions");
 
@@ -185,7 +185,7 @@
 function make_authenticated(event)
 	local session, host = event.session, event.host;
 	if not session.secure then
-		if require_encryption or secure_auth or secure_domains[host] then
+		if require_encryption or (secure_auth and not(insecure_domains[host])) or secure_domains[host] then
 			session:close({
 				condition = "policy-violation",
 				text = "Encrypted server-to-server communication is required but was not "