When restarting the XMPP stream after a successful

SASL authentication, don't offer SASL as a stream feature
again.  This causes the client to attempt re-authentication
and/or go into an error condition.

diff --git a/citadel/modules/jabber/serv_xmpp.c b/citadel/modules/jabber/serv_xmpp.c
index a2a0c3643117aa6849745912478b653ffbd1353d..7c19e509dbb47ea9e17373dd42d264db49e36217 100644 (file)
--- a/citadel/modules/jabber/serv_xmpp.c
+++ b/citadel/modules/jabber/serv_xmpp.c
@@ -85,7 +85,9 @@ void xmpp_stream_start(void *data, const char *supplied_el, const char **attr)
        cprintf("<session xmlns=\"urn:ietf:params:xml:ns:xmpp-session\"/>");
 
        /* A really bad SASL implementation... */
-       xmpp_output_auth_mechs();
+       if (!CC->logged_in) {
+               xmpp_output_auth_mechs();
+       }
 
        /* ...and the ability to close XML tags using angle brackets.  We should patent this. */
        cprintf("</stream:features>");