Changeset 6e9ae72 for protocols/jabber

Timestamp:

2011-12-17T13:50:01Z (12 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.

Location:

protocols/jabber

Files:

• io.c (modified) (2 diffs)
• jabber.c (modified) (1 diff)
• s5bytestream.c (modified) (3 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 ) )

protocols/jabber/jabber.c

@@ -84 +84 @@
         s->flags |= ACC_SET_OFFLINE_ONLY;
         
+        s = set_add( &acc->set, "sasl", "true", set_eval_bool, acc );
+        s->flags |= ACC_SET_OFFLINE_ONLY | SET_HIDDEN_DEFAULT;
+
         s = set_add( &acc->set, "user_agent", "BitlBee", NULL, acc );
         

protocols/jabber/s5bytestream.c

@@ -877 +877 @@
 
         if( ( ( host = strchr( proxy, ',' ) ) == 0 ) ||
-             ( ( port = strchr( host+1, ',' ) ) == 0 ) ) {
+            ( ( port = strchr( host+1, ',' ) ) == 0 ) )
+        {
                 imcb_log( ic, "Error parsing proxy setting: \"%s\" (ignored)", proxy );
                 return NULL;
@@ -889 +890 @@
         sh->jid = g_strdup( jid );
         sh->host = g_strdup( host );
-        strcpy( sh->port, port );
+        g_snprintf( sh->port, sizeof( sh->port ), "%s", port );
 
         return sh;
@@ -915 +916 @@
                                 sh->jid = g_strdup( tf->ini_jid );
                                 sh->host = g_strdup( host );
-                                strcpy( sh->port, port );
+                                g_snprintf( sh->port, sizeof( sh->port ), "%s", port );
                                 bt->streamhosts = g_slist_append( bt->streamhosts, sh );