Fix compilation with -o2

[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 dae60b6daf14a8d46f2c457d9fbcfd69ddca4302..8609f91133bcd86e71d7c0f73ebeec569fe7fc8e 100644 (file)
--- a/citadel/modules/smtp/smtp_util.c
+++ b/citadel/modules/smtp/smtp_util.c
@@ -119,7 +119,7 @@ void smtp_do_bounce(char *instr, StrBuf *OMsgTxt)
        time_t submitted = 0L;
        struct CtdlMessage *bmsg = NULL;
        int give_up = 0;
-       struct recptypes *valid;
+       recptypes *valid;
        int successful_bounce = 0;
        static int seq = 0;
        StrBuf *BounceMB;
@@ -163,7 +163,7 @@ void smtp_do_bounce(char *instr, StrBuf *OMsgTxt)
        bmsg->cm_format_type = FMT_RFC822;
        CM_SetField(bmsg, eAuthor, HKEY("Citadel"));
        CM_SetField(bmsg, eOriginalRoom, HKEY(MAILROOM));
-       CM_SetField(bmsg, eNodeName, config.c_nodename, strlen(config.c_nodename));
+       CM_SetField(bmsg, eNodeName, CFG_KEY(c_nodename));
        CM_SetField(bmsg, eMsgSubject, HKEY("Delivery Status Notification (Failure)"));
        StrBufAppendBufPlain(
                BounceMB,
@@ -272,7 +272,7 @@ void smtp_do_bounce(char *instr, StrBuf *OMsgTxt)
                                      MT_RFC822,
                                      HEADERS_ALL,
                                      0, 1, NULL, 0,
-                                     NULL, NULL);
+                                     NULL, NULL, NULL);
 
                        StrBufAppendBuf(BounceMB, CC->redirect_buffer, 0);
                        FreeStrBuf(&CC->redirect_buffer);