Try to catch mysterious failures of the SASL library instead of

hanging.  From Brendan Cully.

diff --git a/imap/auth_sasl.c b/imap/auth_sasl.c
index b037f68939ff209fce361f57f00e839f1e2368af..55885e2c2872b325b1a09d40a294095e6318b20d 100644 (file)
--- a/imap/auth_sasl.c
+++ b/imap/auth_sasl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000 Brendan Cully <brendan@kublai.com>
+ * Copyright (C) 2000-1 Brendan Cully <brendan@kublai.com>
  * 
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -171,6 +171,12 @@ imap_auth_res_t imap_auth_sasl (IMAP_DATA* idata)
       strfcpy (buf + olen, "\r\n", sizeof (buf) - olen);
       mutt_socket_write (idata->conn, buf);
     }
+
+    /* If SASL has errored out, send an abort string to the server */
+    if (rc < 0)
+    {
+      mutt_socket_write (idata->conn, "*\r\n");
+    }
   }
 
   while (irc != IMAP_CMD_DONE)