From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 8 Oct 2009 22:41:59 +0000 (+0100)
Subject: mod_tls: Catch s2s-stream-features and add starttls feature if possible
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=633e2e58562be1d4246e7972ac2de1f3d047aa6c;p=prosody.git

mod_tls: Catch s2s-stream-features and add starttls feature if possible
---

diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index c2f83a3a..09470083 100644
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -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();