X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_tls.lua;h=90985874f0954a6b0b912d188ab455cb85081671;hb=b6dfdd3762b43b153aeb2b9274ee88d30b4fb7e6;hp=15cdb3e3806bb39b9405295ffaa9e3e9e6805d08;hpb=5cea62e759df7bd72f0868f2459b6d2116c40708;p=prosody.git

diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index 15cdb3e3..90985874 100644
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -18,7 +18,7 @@ local global_ssl_ctx = prosody.global_ssl_ctx;
 
 module:hook("stanza/urn:ietf:params:xml:ns:xmpp-tls:starttls", function(event)
 	local origin = event.origin;
-	if origin.conn.starttls and origin.type == "c2s_unauthed" or origin.type == "s2sin_unauthed" then
+	if origin.conn.starttls then
 		(origin.sends2s or origin.send)(st.stanza("proceed", { xmlns = xmlns_starttls }));
 		origin:reset_stream();
 		local host = origin.to_host or origin.host;
@@ -27,8 +27,9 @@ module:hook("stanza/urn:ietf:params:xml:ns:xmpp-tls:starttls", function(event)
 		origin.log("info", "TLS negotiation started for %s...", origin.type);
 		origin.secure = false;
 	else
-		-- FIXME: What reply?
 		origin.log("warn", "Attempt to start TLS, but TLS is not available on this %s connection", origin.type);
+		(origin.sends2s or origin.send)(st.stanza("failure", { xmlns = xmlns_starttls }));
+		origin:close();
 	end
 	return true;
 end);