Re: Connecting to imap on a Microsoft Exchange server with gsasl

[Simon Josefsson]

Simon Josefsson <address@hidden> writes:

> Yes that should work (although the code has changed since the version
> you use).

Sorry, I spoke too soon.  Please try this patch instead.  Maybe you get
a different error message now.  Your version would leave '+' in the
buffer going to the GSS-API layer, but it should be empty.

The current code looks different, I'll make it accept '+' in addition to
the proper '+ '.

/Simon

--- imap.c.orig 2012-09-12 14:09:34.686687749 +0200
+++ imap.c      2012-09-12 14:10:41.318689458 +0200
@@ -151,13 +151,16 @@
 
   if (!args_info.server_flag)
     {
-      if (p[0] != '+' || p[1] != ' ')
+      if (p[0] != '+')
        {
          fprintf (stderr, _("error: server did not return a token\n"));
          return 0;
        }
 
-      memmove (&p[0], &p[2], strlen (p) - 1);
+      if (strlen (p) > 1)
+       memmove (&p[0], &p[2], strlen (p) - 1);
+      else
+       p[0] = '\0';
     }
 
   if (p[strlen (p) - 1] == '\n')