Fix generation of bounce messages; we would put the bounce body into the author field.

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

diff --git a/citadel/modules/smtp/smtp_util.c b/citadel/modules/smtp/smtp_util.c
index 861ee97636efe375be66af2fe15278f1a253832e..1c57d99595de161d134ac06a597fe3b5ac30c4a5 100644 (file)
--- a/citadel/modules/smtp/smtp_util.c
+++ b/citadel/modules/smtp/smtp_util.c
@@ -94,7 +94,7 @@ const char *smtp_get_Recipients(void)
 
        if (sSMTP == NULL)
                return NULL;
-       else return sSMTP->from;
+       else return ChrPtr(sSMTP->from);
 }
 
 
@@ -271,7 +271,8 @@ void smtp_do_bounce(char *instr, StrBuf *OMsgTxt)
                        CtdlOutputMsg(omsgid,
                                      MT_RFC822,
                                      HEADERS_ALL,
-                                     0, 1, NULL, 0);
+                                     0, 1, NULL, 0,
+                                     NULL, NULL);
 
                        StrBufAppendBuf(BounceMB, CC->redirect_buffer, 0);
                        FreeStrBuf(&CC->redirect_buffer);
@@ -285,9 +286,9 @@ void smtp_do_bounce(char *instr, StrBuf *OMsgTxt)
        StrBufAppendBufPlain(BounceMB, HKEY("--"), 0);
        StrBufAppendBuf(BounceMB, boundary, 0);
        StrBufAppendBufPlain(BounceMB, HKEY("--\r\n"), 0);
-       if (bmsg->cm_fields['A'] != NULL)
-               free(bmsg->cm_fields['A']);
-       bmsg->cm_fields['A'] = SmashStrBuf(&BounceMB);
+       if (bmsg->cm_fields['M'] != NULL)
+               free(bmsg->cm_fields['M']);
+       bmsg->cm_fields['M'] = SmashStrBuf(&BounceMB);
        /* Deliver the bounce if there's anything worth mentioning */
        syslog(LOG_DEBUG, "num_bounces = %d\n", num_bounces);
        if (num_bounces > 0) {