Change around the order of features offered as

part of the xmpp stream.  We have to offer non-SASL authentication.

diff --git a/citadel/modules/jabber/serv_xmpp.c b/citadel/modules/jabber/serv_xmpp.c
index 8de7350fe0b3129f7c187097f22bb6ea9e7ad5bf..a75d6e146974260aa291caadaa8e27d958ec0b3c 100644 (file)
--- a/citadel/modules/jabber/serv_xmpp.c
+++ b/citadel/modules/jabber/serv_xmpp.c
@@ -90,11 +90,10 @@ void xmpp_stream_start(void *data, const char *supplied_el, const char **attr)
                /* If we're not logged in yet, offer SASL as our feature set */
                xmpp_output_auth_mechs();
        }
-       else {
-               /* If we've logged in, now offer binding and sessions as our feature set */
-               cprintf("<bind xmlns=\"urn:ietf:params:xml:ns:xmpp-bind\"/>");
-               cprintf("<session xmlns=\"urn:ietf:params:xml:ns:xmpp-session\"/>");
-       }
+
+       /* Offer binding and sessions as part of our feature set */
+       cprintf("<bind xmlns=\"urn:ietf:params:xml:ns:xmpp-bind\"/>");
+       cprintf("<session xmlns=\"urn:ietf:params:xml:ns:xmpp-session\"/>");
 
        cprintf("</stream:features>");