Changeset 4be0e34

Timestamp:

2011-12-19T00:41:40Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

36533bf

Parents:

bf57cd1

Message:

Give a list of SASL mechanisms supported by a server when reporting we don't
support any of them.

Files:

• lib/oauth.c (modified) (1 diff)
• protocols/jabber/sasl.c (modified) (5 diffs)

lib/oauth.c

@@ -135 +135 @@
         
         if( params == NULL )
-                return NULL;
+                return;
         
         for( l = *params; l; l = n )

protocols/jabber/sasl.c

@@ -65 +65 @@
         int sup_plain = 0, sup_digest = 0, sup_gtalk = 0, sup_fb = 0, sup_ms = 0;
         int want_oauth = FALSE;
+        GString *mechs;
         
         if( !sasl_supported( ic ) )
@@ -83 +84 @@
         }
         
+        mechs = g_string_new( "" );
         c = node->children;
         while( ( c = xt_find_node( c, "mechanism" ) ) )
@@ -97 +99 @@
                         sup_ms = 1;
                 
+                if( c->text )
+                        g_string_append_printf( mechs, " %s", c->text );
+                
                 c = c->next;
         }
@@ -102 +107 @@
         if( !sup_plain && !sup_digest && !sup_gtalk && !sup_fb && !sup_ms )
         {
-                imcb_error( ic, "No known SASL authentication schemes supported" );
+                imcb_error( ic, "BitlBee does not support any of the offered SASL "
+                                "authentication schemes:%s", mechs->str );
                 imc_logout( ic, FALSE );
+                g_string_free( mechs, TRUE );
                 return XT_ABORT;
         }
+        g_string_free( mechs, TRUE );
         
         reply = xt_new_node( "auth", NULL, NULL );
@@ -537 +545 @@
                 ic->acc->pass = g_strdup_printf( "refresh_token=%s", refresh_token );
         }
+        /* Should do this, but only in the Facebook case where we get an access
+           token that never expires. Shouldn't overwrite a refresh token with
+           an access token.
+        else
+        {
+                g_free( ic->acc->pass );
+                ic->acc->pass = g_strdup_printf( "access_token=%s", access_token );
+        } */
         
         g_free( jd->oauth2_access_token );