Fixes so mutt at least compiles with Brendan's new SASL patch.

diff --git a/imap/auth_anon.c b/imap/auth_anon.c
index d9e48289e1b39075ab9c211333c20c2823a4794f..78d6f932042aba3cfc3491b20d2b374f477db237 100644 (file)
--- a/imap/auth_anon.c
+++ b/imap/auth_anon.c
@@ -56,13 +56,13 @@ imap_auth_res_t imap_auth_anon (IMAP_DATA* idata)
     rc = imap_cmd_step (idata);
   while (rc == IMAP_CMD_CONTINUE);
   
-  if (rc != IMAP_CMD_DONE)
+  if (rc != IMAP_CMD_OK)
   {
     dprint (1, (debugfile, "Error receiving server response.\n"));
     goto bail;
   }
 
-  if (imap_code (idata->buf))
+  if (imap_code (idata->cmd.buf))
     return IMAP_AUTH_SUCCESS;
 
  bail:

diff --git a/imap/auth_cram.c b/imap/auth_cram.c
index 0528ccf1304f74d29c9e18568b702c422d3f718f..07bf6e897a9f1b4f15a86cea8c93816fb330a4a1 100644 (file)
--- a/imap/auth_cram.c
+++ b/imap/auth_cram.c
@@ -67,7 +67,7 @@ imap_auth_res_t imap_auth_cram_md5 (IMAP_DATA* idata)
     goto bail;
   }
 
-  if ((len = mutt_from_base64 (obuf, idata->buf + 2)) == -1)
+  if ((len = mutt_from_base64 (obuf, idata->cmd.buf + 2)) == -1)
   {
     dprint (1, (debugfile, "Error decoding base64 response.\n"));
     goto bail;
@@ -111,13 +111,13 @@ imap_auth_res_t imap_auth_cram_md5 (IMAP_DATA* idata)
     rc = imap_cmd_step (idata);
   while (rc == IMAP_CMD_CONTINUE);
 
-  if (rc != IMAP_CMD_DONE)
+  if (rc != IMAP_CMD_OK)
   {
     dprint (1, (debugfile, "Error receiving server response.\n"));
     goto bail;
   }
 
-  if (imap_code (idata->buf))
+  if (imap_code (idata->cmd.buf))
     return IMAP_AUTH_SUCCESS;
 
  bail:

diff --git a/imap/auth_gss.c b/imap/auth_gss.c
index 3b14f361d11245431fa8f7047c2c9b2295426e99..10536aa976aa5ec96961113baa5e985355ed789d 100644 (file)
--- a/imap/auth_gss.c
+++ b/imap/auth_gss.c
@@ -233,7 +233,7 @@ imap_auth_res_t imap_auth_gss (IMAP_DATA* idata)
   do
     rc = imap_cmd_step (idata);
   while (rc == IMAP_CMD_CONTINUE);
-  if (rc != IMAP_CMD_DONE)
+  if (rc != IMAP_CMD_OK)
   {
     dprint (1, (debugfile, "Error receiving server response.\n"));
     mutt_socket_write(idata->conn, "*\r\n");