Changeset 88591fd for protocols

Timestamp:

2006-10-01T16:15:46Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

c1ed6527

Parents:

0e2d97f

Message:

Better fix for servers that report to comply with XMPP 1.0 but don't offer
SASL authentication options. Previous fix tried to do IQ authentication
even after successful SASL authentications.

File:

• protocols/jabber/io.c (modified) (1 diff)

protocols/jabber/io.c

@@ -305 +305 @@
                         return XT_ABORT;
         }
-        else
-        {
-                /* If the server *SEEMS* to support SASL authentication but
-                   doesn't support it after all, we should try to do
-                   authentication the other way. jabber.com doesn't seem to
-                   do SASL while it pretends to be XMPP 1.0 compliant! */
-                if( sasl_supported( gc ) )
-                        if( !jabber_start_iq_auth( gc ) )
-                                return XT_ABORT;
+        /* If the server *SEEMS* to support SASL authentication but doesn't
+           support it after all, we should try to do authentication the
+           other way. jabber.com doesn't seem to do SASL while it pretends
+           to be XMPP 1.0 compliant! */
+        else if( !( jd->flags & JFLAG_AUTHENTICATED ) && sasl_supported( gc ) )
+        {
+                if( !jabber_start_iq_auth( gc ) )
+                        return XT_ABORT;
         }