Changeset 6e9ae72 for protocols/jabber/io.c

Timestamp:

2011-12-17T13:50:01Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

18c6d36

Parents:

87dddee (diff), 17f057d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Mainline merge.

File:

• protocols/jabber/io.c (modified) (2 diffs)

protocols/jabber/io.c

@@ -212 +212 @@
                                    this is an old server that can't do SASL
                                    authentication. */
-                                if( !sasl_supported( ic ) )
+                                if( !set_getbool( &ic->acc->set, "sasl") || !sasl_supported( ic ) )
                                 {
                                         /* If there's no version= tag, we suppose
@@ -375 +375 @@
            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( ic ) )
+        else if( !( jd->flags & JFLAG_AUTHENTICATED ) && set_getbool( &ic->acc->set, "sasl") && sasl_supported( ic ) )
         {
                 if( !jabber_init_iq_auth( ic ) )