Changeset 501b4e0

Timestamp:

2006-10-02T16:42:32Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

995913b

Parents:

d9282b4

Message:

Added a useful error message for SASL negotiation failures and turned off
the little hack in jabber_write() for now because it breaks error handling.

Location:

protocols/jabber

Files:

• io.c (modified) (2 diffs)
• sasl.c (modified) (1 diff)

protocols/jabber/io.c

@@ -52 +52 @@
                    it via the event handler. If not, add the handler. (In
                    most cases it probably won't be necessary.) */
+                /* Disabling this trick for now because there's really not
+                   a good way to catch errors yet. :-(
                 if( jabber_write_callback( gc, jd->fd, GAIM_INPUT_WRITE ) )
+                */
                         jd->w_inpa = b_input_add( jd->fd, GAIM_INPUT_WRITE, jabber_write_callback, gc );
         }
@@ -64 +67 @@
         }
         
-        /* FIXME: write_callback could've generated a real error! */
+        /* FIXME: write_callback could've generated a real error! Have to
+           find a way to find out if we have to return 0 here. Looking for
+           ourselves in the linked list of connections is a possibility,
+           but it'd be too time-consuming... */
         return 1;
 }

protocols/jabber/sasl.c

@@ -64 +64 @@
         if( !sup_plain && !sup_digest )
         {
+                hide_login_progress( gc, "No known SASL authentication schemes supported" );
                 signoff( gc );
                 return XT_ABORT;