* Implemented the first of several steps required to fix the bug that causes mailing...

[citadel.git] / citadel / modules / smtp / serv_smtp.c

diff --git a/citadel/modules/smtp/serv_smtp.c b/citadel/modules/smtp/serv_smtp.c
index ee5ee10c777de9a3e4ab5f76e20700a1aa1ba644..5d520ae2bf5489603cf37fff3e153af3d77aee51 100644 (file)
--- a/citadel/modules/smtp/serv_smtp.c
+++ b/citadel/modules/smtp/serv_smtp.c
@@ -475,7 +475,7 @@ const char *smtp_get_Recipients(void)
 }
 
 /*
- * Implements the "MAIL From:" command
+ * Implements the "MAIL FROM:" command
  */
 void smtp_mail(char *argbuf) {
        char user[SIZ];
@@ -908,7 +908,7 @@ void smtp_command_loop(void) {
  *
  */
 void smtp_try(const char *key, const char *addr, int *status,
-             char *dsn, size_t n, long msgnum)
+             char *dsn, size_t n, long msgnum, char *envelope_from)
 {
        int sock = (-1);
        char mxhosts[1024];
@@ -927,9 +927,6 @@ void smtp_try(const char *key, const char *addr, int *status,
        char *ptr;
        size_t msg_size;
        int scan_done;
-       char *nextline;
-       char *chunk_to_send;
-       char prev_char;
        
        
        /* Parse out the host portion of the recipient address */
@@ -949,56 +946,59 @@ void smtp_try(const char *key, const char *addr, int *status,
        CC->redirect_len = 0;
        CC->redirect_alloc = 0;
 
-       /* Extract something to send later in the 'MAIL From:' command */
-       strcpy(mailfrom, "");
-       scan_done = 0;
-       ptr = msgtext;
-       do {
-               if (ptr = memreadline(ptr, buf, sizeof buf), *ptr == 0) {
-                       scan_done = 1;
-               }
-               if (!strncasecmp(buf, "From:", 5)) {
-                       safestrncpy(mailfrom, &buf[5], sizeof mailfrom);
-                       striplt(mailfrom);
-                       for (i=0; mailfrom[i]; ++i) {
-                               if (!isprint(mailfrom[i])) {
-                                       strcpy(&mailfrom[i], &mailfrom[i+1]);
-                                       i=0;
-                               }
-                       }
-
-                       /* Strip out parenthesized names */
-                       lp = (-1);
-                       rp = (-1);
-                       for (i=0; mailfrom[i]; ++i) {
-                               if (mailfrom[i] == '(') lp = i;
-                               if (mailfrom[i] == ')') rp = i;
-                       }
-                       if ((lp>0)&&(rp>lp)) {
-                               strcpy(&mailfrom[lp-1], &mailfrom[rp+1]);
+       /* If no envelope_from is supplied, extract one from the message */
+       if ( (envelope_from == NULL) || (IsEmptyStr(envelope_from)) ) {
+               strcpy(mailfrom, "");
+               scan_done = 0;
+               ptr = msgtext;
+               do {
+                       if (ptr = memreadline(ptr, buf, sizeof buf), *ptr == 0) {
+                               scan_done = 1;
                        }
-
-                       /* Prefer brokketized names */
-                       lp = (-1);
-                       rp = (-1);
-                       for (i=0; mailfrom[i]; ++i) {
-                               if (mailfrom[i] == '<') lp = i;
-                               if (mailfrom[i] == '>') rp = i;
-                       }
-                       if ( (lp>=0) && (rp>lp) ) {
-                               mailfrom[rp] = 0;
-                               strcpy(mailfrom, &mailfrom[lp]);
+                       if (!strncasecmp(buf, "From:", 5)) {
+                               safestrncpy(mailfrom, &buf[5], sizeof mailfrom);
+                               striplt(mailfrom);
+                               for (i=0; mailfrom[i]; ++i) {
+                                       if (!isprint(mailfrom[i])) {
+                                               strcpy(&mailfrom[i], &mailfrom[i+1]);
+                                               i=0;
+                                       }
+                               }
+       
+                               /* Strip out parenthesized names */
+                               lp = (-1);
+                               rp = (-1);
+                               for (i=0; mailfrom[i]; ++i) {
+                                       if (mailfrom[i] == '(') lp = i;
+                                       if (mailfrom[i] == ')') rp = i;
+                               }
+                               if ((lp>0)&&(rp>lp)) {
+                                       strcpy(&mailfrom[lp-1], &mailfrom[rp+1]);
+                               }
+       
+                               /* Prefer brokketized names */
+                               lp = (-1);
+                               rp = (-1);
+                               for (i=0; mailfrom[i]; ++i) {
+                                       if (mailfrom[i] == '<') lp = i;
+                                       if (mailfrom[i] == '>') rp = i;
+                               }
+                               if ( (lp>=0) && (rp>lp) ) {
+                                       mailfrom[rp] = 0;
+                                       strcpy(mailfrom, &mailfrom[lp]);
+                               }
+       
+                               scan_done = 1;
                        }
-
-                       scan_done = 1;
-               }
-       } while (scan_done == 0);
-       if (IsEmptyStr(mailfrom)) strcpy(mailfrom, "someone@somewhere.org");
-       stripallbut(mailfrom, '<', '>');
+               } while (scan_done == 0);
+               if (IsEmptyStr(mailfrom)) strcpy(mailfrom, "someone@somewhere.org");
+               stripallbut(mailfrom, '<', '>');
+               envelope_from = mailfrom;
+       }
 
        /* Figure out what mail exchanger host we have to connect to */
        num_mxhosts = getmx(mxhosts, node);
-       CtdlLogPrintf(CTDL_DEBUG, "Number of MX hosts for <%s> is %d\n", node, num_mxhosts);
+       CtdlLogPrintf(CTDL_DEBUG, "Number of MX hosts for <%s> is %d [%s]\n", node, num_mxhosts, mxhosts);
        if (num_mxhosts < 1) {
                *status = 5;
                snprintf(dsn, SIZ, "No MX hosts found for <%s>", node);
@@ -1134,8 +1134,8 @@ void smtp_try(const char *key, const char *addr, int *status,
                }
        }
 
-       /* previous command succeeded, now try the MAIL From: command */
-       snprintf(buf, sizeof buf, "MAIL From: <%s>\r\n", mailfrom);
+       /* previous command succeeded, now try the MAIL FROM: command */
+       snprintf(buf, sizeof buf, "MAIL FROM:<%s>\r\n", envelope_from);
        CtdlLogPrintf(CTDL_DEBUG, ">%s", buf);
        sock_write(sock, buf, strlen(buf));
        if (ml_sock_gets(sock, buf) < 0) {
@@ -1158,7 +1158,7 @@ void smtp_try(const char *key, const char *addr, int *status,
        }
 
        /* MAIL succeeded, now try the RCPT To: command */
-       snprintf(buf, sizeof buf, "RCPT To: <%s@%s>\r\n", user, node);
+       snprintf(buf, sizeof buf, "RCPT TO:<%s@%s>\r\n", user, node);
        CtdlLogPrintf(CTDL_DEBUG, ">%s", buf);
        sock_write(sock, buf, strlen(buf));
        if (ml_sock_gets(sock, buf) < 0) {
@@ -1519,6 +1519,7 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
        char key[1024];
        char addr[1024];
        char dsn[1024];
+       char envelope_from[1024];
        long text_msgid = (-1);
        int incomplete_deliveries_remaining;
        time_t attempted = 0L;
@@ -1526,6 +1527,7 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
        time_t retry = SMTP_RETRY_INTERVAL;
 
        CtdlLogPrintf(CTDL_DEBUG, "SMTP client: smtp_do_procmsg(%ld)\n", msgnum);
+       strcpy(envelope_from, "");
 
        msg = CtdlFetchMessage(msgnum, 1);
        if (msg == NULL) {
@@ -1555,6 +1557,9 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
                if (!strcasecmp(key, "msgid")) {
                        text_msgid = extract_long(buf, 1);
                }
+               if (!strcasecmp(key, "envelope_from")) {
+                       extract_token(envelope_from, buf, 1, '|', sizeof envelope_from);
+               }
                if (!strcasecmp(key, "retry")) {
                        /* double the retry interval after each attempt */
                        retry = extract_long(buf, 1) * 2L;
@@ -1615,7 +1620,7 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
                        --i;
                        --lines;
                        CtdlLogPrintf(CTDL_DEBUG, "SMTP client: Trying <%s>\n", addr);
-                       smtp_try(key, addr, &status, dsn, sizeof dsn, text_msgid);
+                       smtp_try(key, addr, &status, dsn, sizeof dsn, text_msgid, envelope_from);
                        if (status != 2) {
                                if (results == NULL) {
                                        results = malloc(1024);