X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_tls.lua;h=09470083bd5143e15580546ddeaa41580d6161e7;hb=633e2e58562be1d4246e7972ac2de1f3d047aa6c;hp=61b8d6d96c5b771403cac771ad4185d67bb06f55;hpb=049dddf5d1b9fbf49dfce0f24413501d22633be5;p=prosody.git

diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index 61b8d6d9..09470083 100644
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -11,8 +11,8 @@ local st = require "util.stanza";
 local xmlns_stream = 'http://etherx.jabber.org/streams';
 local xmlns_starttls = 'urn:ietf:params:xml:ns:xmpp-tls';
 
-local secure_auth_only = module:get_option("require_encryption");
-local secure_s2s_only = module:get_option("require_s2s_encryption");
+local secure_auth_only = module:get_option("c2s_require_encryption") or module:get_option("require_encryption");
+local secure_s2s_only = module:get_option("s2s_require_encryption");
 
 module:add_handler("c2s_unauthed", "starttls", xmlns_starttls,
 		function (session, stanza)
@@ -56,11 +56,10 @@ module:add_event_hook("stream-features",
 			end
 		end);
 
-module:add_event_hook("s2s-stream-features", 
-		function (session, features)
-			-- This hook is possibly called once per host (at least if the
-			-- remote server does not specify a to/from.
-			if session.to_host and session.conn.starttls and not features:child_with_ns(xmlns_starttls) then
+module:hook("s2s-stream-features", 
+		function (data)
+			local session, features = data.session, data.features;
+			if session.to_host and session.conn.starttls then
 				features:tag("starttls", starttls_attr):up();
 				if secure_s2s_only then
 					features:tag("required"):up():up();
@@ -87,5 +86,6 @@ module:hook_stanza(xmlns_starttls, "proceed",
 			local format, to_host, from_host = string.format, session.to_host, session.from_host;
 			session:reset_stream();
 			session.conn.starttls(true);
+			session.secure = false;
 			return true;
 		end);