Added SASL PLAIN auth to jabber service.

diff --git a/citadel/modules/jabber/serv_xmpp.c b/citadel/modules/jabber/serv_xmpp.c
index 5569211fabb37bc970eb5f3c4112bc9a27ce3c3b..8e8a9f4cc59130708b80865f3c03a59b6dcdaf45 100644 (file)
--- a/citadel/modules/jabber/serv_xmpp.c
+++ b/citadel/modules/jabber/serv_xmpp.c
@@ -59,8 +59,6 @@ void xmpp_stream_start(void *data, const char *supplied_el, const char **attr)
 
        lprintf(CTDL_DEBUG, "New stream detected.\n");
 
-       if (CC->logged_in) logout(CC);  /* Client may try to log in twice.  Handle this. */
-
        while (*attr) {
                if (!strcasecmp(attr[0], "to")) {
                        safestrncpy(XMPP->server_name, attr[1], sizeof XMPP->server_name);

diff --git a/citadel/modules/jabber/xmpp_sasl_service.c b/citadel/modules/jabber/xmpp_sasl_service.c
index 2f05783f7cd44fd006153500e216945b2166e7d9..9e9aef6ff666328178c7cba8f0438666b2baf8d1 100644 (file)
--- a/citadel/modules/jabber/xmpp_sasl_service.c
+++ b/citadel/modules/jabber/xmpp_sasl_service.c
@@ -106,6 +106,8 @@ void xmpp_sasl_auth(char *sasl_auth_mech, char *authstring) {
                return;
        }
 
+        if (CC->logged_in) logout(CC);  /* Client may try to log in twice.  Handle this. */
+
        if (xmpp_auth_plain(authstring) == 0) {
                cprintf("<success xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\"/>");
        }