diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | imap.c | 19 |
2 files changed, 14 insertions, 7 deletions
@@ -23,6 +23,8 @@ fetchmail-5.0.6 (): * Detect Intermail server's "wait a few minutes" message and cope. * Patches for Heimdal implementation of GSSAPI from Leif Johansson <leifj@matematik.su.se>. Somebody should test this against the MIT version. +* Fix IMAP authentication code to not rely on the challenge code + accepting multiple writes; thanks to Kevin Turner <kevin.turner@oberlin.edu>. Warning: CompuServe changed their POP3 system on 31 July 1999. In doing so, they broke fetchmail's RPA support. Nobody has sent me either code that @@ -171,8 +171,10 @@ static int do_otp(int sock, struct query *ctl) if (outlevel >= O_MONITOR) report(stdout, "IMAP> %s\n", buffer); + + /* best not to count on the challenge code handling multiple writes */ + strcat(buffer, "\r\n"); SockWrite(sock, buffer, strlen(buffer)); - SockWrite(sock, "\r\n", 2); if (rval = gen_recv(sock, buffer, sizeof(buffer))) return rval; @@ -198,8 +200,8 @@ static int do_otp(int sock, struct query *ctl) if (outlevel >= O_MONITOR) report(stdout, "IMAP> %s\n", buffer); + strcat(buffer, "\r\n"); SockWrite(sock, buffer, strlen(buffer)); - SockWrite(sock, "\r\n", 2); if (rval = gen_recv(sock, buffer, sizeof(buffer))) return rval; @@ -349,8 +351,8 @@ static int do_rfc1731(int sock, char *truename) if (outlevel >= O_MONITOR) { report(stdout, "IMAP> %s\n", buf1); } + strcat(buf1, "\r\n"); SockWrite(sock, buf1, strlen(buf1)); - SockWrite(sock, "\r\n", 2); /* Upon decrypting and verifying the ticket and authenticator, the * server should verify that the contained checksum field equals @@ -432,8 +434,9 @@ static int do_rfc1731(int sock, char *truename) if (outlevel >= O_MONITOR) { report(stdout, "IMAP> %s\n", buf1); } + + strcat(buf1, "\r\n"); SockWrite(sock, buf1, strlen(buf1)); - SockWrite(sock, "\r\n", 2); if (result = gen_recv(sock, buf1, sizeof buf1)) return result; @@ -523,8 +526,8 @@ static int do_gssauth(int sock, char *hostname, char *username) } to64frombits(buf1, send_token.value, send_token.length); gss_release_buffer(&min_stat, &send_token); + strcat(buf1, "\r\n"); SockWrite(sock, buf1, strlen(buf1)); - SockWrite(sock, "\r\n", 2); if (outlevel >= O_MONITOR) report(stdout, "IMAP> %s\n", buf1); if (maj_stat == GSS_S_CONTINUE_NEEDED) { @@ -592,8 +595,8 @@ static int do_gssauth(int sock, char *hostname, char *username) report(stdout, _("Requesting authorisation as %s\n"), username); report(stdout, "IMAP> %s\n",buf1); } + strcat(buf1, "\r\n"); SockWrite(sock, buf1, strlen(buf1)); - SockWrite(sock, "\r\n", 2); /* we should be done. Get status and finish up */ if (result = gen_recv(sock, buf1, sizeof buf1)) @@ -731,8 +734,10 @@ static int do_cram_md5 (int sock, struct query *ctl) if (outlevel >= O_MONITOR) { report (stdout, "IMAP> %s\n", buf1); } + + /* PMDF5.2 IMAP has a bug that requires this to be a single write */ + strcat (buf1, "\r\n"); SockWrite (sock, buf1, strlen (buf1)); - SockWrite (sock, "\r\n", 2); if (result = gen_recv (sock, buf1, sizeof (buf1))) return result; |