* Tried to fix breakage with MS Outlook

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 132b09e57dbef0090e6fa812328ad6277646f6d9..107dcccffda2d5f34e02e43ffebe6f76e191c6b5 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -1002,6 +1002,9 @@ int CtdlOutputMsg(long msg_num,           /* message number (local) to fetch */
        if (mode == MT_CITADEL)
                if (do_proto) cprintf("text\n");
        if (mode == MT_RFC822) {
+               if (TheMessage->cm_fields['U'] == NULL) {
+                       cprintf("Subject: FIX bogus subject FIX%s", nl);
+               }
                cprintf("%s", nl);
        }
 

diff --git a/citadel/serv_pop3.c b/citadel/serv_pop3.c
index dd193b7bf98965ca02c7a0e10488992261e818bd..808f10fac50df3b37e5ae2cd8b7cb0667155c35d 100644 (file)
--- a/citadel/serv_pop3.c
+++ b/citadel/serv_pop3.c
@@ -265,7 +265,7 @@ void pop3_stat(char *argbuf) {
  */
 void pop3_retr(char *argbuf) {
        int which_one;
-       int ch;
+       int ch = 0;
        size_t bytes_remaining;
 
        which_one = atoi(argbuf);
@@ -286,6 +286,9 @@ void pop3_retr(char *argbuf) {
                ch = getc(POP3->msgs[which_one - 1].temp);
                cprintf("%c", ch);
        }
+       if (ch != 10) {
+               lprintf(5, "Problem: message ends with 0x%2x, not 0x0a\n", ch);
+       }
        cprintf(".\r\n");
 }
 

diff --git a/citadel/serv_smtp.c b/citadel/serv_smtp.c
index b65c7012b340d81c8d588062122ba0c542f94383..61a5e5ef3476d3423462e9e58813a4be23b9130c 100644 (file)
--- a/citadel/serv_smtp.c
+++ b/citadel/serv_smtp.c
@@ -696,7 +696,8 @@ void smtp_try(char *key, char *addr, int *status, char *dsn, long msgnum)
        char mailfrom[1024];
        int lp, rp;
        FILE *msg_fp = NULL;
-       size_t msg_size, blocksize;
+       size_t msg_size;
+       size_t blocksize = 0;
        int scan_done;
 
        /* Parse out the host portion of the recipient address */
@@ -914,8 +915,13 @@ void smtp_try(char *key, char *addr, int *status, char *dsn, long msgnum)
                sock_write(sock, buf, blocksize);
                msg_size -= blocksize;
        }
+       if (buf[blocksize-1] != 10) {
+               lprintf(5, "Possible problem: message did not correctly "
+                       "terminate. (expecting 0x10, got 0x%02x)\n",
+                               buf[blocksize-1]);
+       }
 
-       sock_puts(sock, ".");
+       sock_write(sock, ".\r\n", 3);
        if (sock_gets(sock, buf) < 0) {
                *status = 4;
                strcpy(dsn, "Connection broken during SMTP conversation");