Try to fix IMAP-K4 yet again.

svn path=/trunk/; revision=1517

1 files changed, 9 insertions, 5 deletions

diff --git a/imap.c b/imap.c
index 53779e8d..043fe5e3 100644
--- a/imap.c
+++ b/imap.c
@@ -358,6 +358,15 @@ int imap_getauth(int sock, struct query *ctl, char *greeting)
 	    error(0, 0, "Protocol identified as IMAP4 rev 0");
     }
 
+    /* eat the tail of the CAPABILITY response (if any) */
+    if ((peek_capable = (imap_version >= IMAP4)))
+    {
+	char	scratchbuf[POPBUFSIZE];	/* don't clobber capabilities buffer */
+
+	if ((ok = gen_recv(sock, scratchbuf, sizeof(scratchbuf))))
+	    return(ok);
+    }
+
 #ifdef KERBEROS_V4
     if (strstr(capabilities, "AUTH=KERBEROS_V4"))
     {
@@ -384,11 +393,6 @@ int imap_getauth(int sock, struct query *ctl, char *greeting)
     }
 #endif /* KERBEROS_V4 */
 
-    /* eat the tail of the CAPABILITY response (if any) */
-    if ((peek_capable = (imap_version >= IMAP4)))
-	if ((ok = gen_recv(sock, capabilities, sizeof(capabilities))))
-	    return(ok);
-
     /* try to get authorized in the ordinary (AUTH=LOGIN) way */
     ok = gen_transact(sock, "LOGIN %s \"%s\"", ctl->remotename, ctl->password);
     if (ok)