Merge 0.7->0.8

[prosody.git] / plugins / mod_dialback.lua

diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua
index 91291e2404ff90de8df874b99f0125aa81bb9152..8c80dce6a57e87cd3d6bf158ca889b1404b40ec2 100644 (file)
--- a/plugins/mod_dialback.lua
+++ b/plugins/mod_dialback.lua
@@ -131,22 +131,12 @@ module:hook("stanza/jabber:server:dialback:result", function(event)
        end
 end);
 
-module:hook_stanza("urn:ietf:params:xml:ns:xmpp-sasl", "failure", function (origin, stanza)
-       if origin.external_auth == "failed" then
-               module:log("debug", "SASL EXTERNAL failed, falling back to dialback");
-               s2s_initiate_dialback(origin);
-               return true;
-       end
-end, 100);
-
 module:hook_stanza(xmlns_stream, "features", function (origin, stanza)
-       if not origin.external_auth or origin.external_auth == "failed" then
-               s2s_initiate_dialback(origin);
-               return true;
-       end
+       s2s_initiate_dialback(origin);
+       return true;
 end, 100);
 
 -- Offer dialback to incoming hosts
 module:hook("s2s-stream-features", function (data)
-       data.features:tag("dialback", { xmlns='urn:xmpp:features:dialback' }):up();
+       data.features:tag("dialback", { xmlns='urn:xmpp:features:dialback' }):tag("optional"):up():up();
 end);