fix warnings in libev related codebase

[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 103362f15bc8e41b5380ac1c62db95ce01e85e94..1db154635cc84e30b92499d20a00e136b8401351 100644 (file)
--- a/citadel/modules/smtp/smtp_util.c
+++ b/citadel/modules/smtp/smtp_util.c
@@ -103,7 +103,8 @@ const char *smtp_get_Recipients(void)
  * instructions for "5" codes (permanent fatal errors) and produce/deliver
  * a "bounce" message (delivery status notification).
  */
-void smtp_do_bounce(char *instr) {
+void smtp_do_bounce(char *instr, StrBuf *OMsgTxt) 
+{
        int i;
        int lines;
        int status;
@@ -115,7 +116,6 @@ void smtp_do_bounce(char *instr) {
        StrBuf *boundary;
        int num_bounces = 0;
        int bounce_this = 0;
-       long bounce_msgid = (-1);
        time_t submitted = 0L;
        struct CtdlMessage *bmsg = NULL;
        int give_up = 0;
@@ -125,7 +125,7 @@ void smtp_do_bounce(char *instr) {
        StrBuf *BounceMB;
        long omsgid = (-1);
 
-       CtdlLogPrintf(CTDL_DEBUG, "smtp_do_bounce() called\n");
+       syslog(LOG_DEBUG, "smtp_do_bounce() called\n");
        strcpy(bounceto, "");
        boundary = NewStrBufPlain(HKEY("=_Citadel_Multipart_"));
        StrBufAppendPrintf(boundary, "%s_%04x%04x", config.c_fqdn, getpid(), ++seq);
@@ -194,8 +194,8 @@ void smtp_do_bounce(char *instr) {
                dsnlen = extract_token(dsn, buf, 3, '|', sizeof dsn);
                bounce_this = 0;
 
-               CtdlLogPrintf(CTDL_DEBUG, "key=<%s> addr=<%s> status=%d dsn=<%s>\n",
-                       key, addr, status, dsn);
+               syslog(LOG_DEBUG, "key=<%s> addr=<%s> status=%d dsn=<%s>\n",
+                      key, addr, status, dsn);
 
                if (!strcasecmp(key, "bounceto")) {
                        strcpy(bounceto, addr);
@@ -234,10 +234,15 @@ void smtp_do_bounce(char *instr) {
                StrBufAppendBufPlain(BounceMB, HKEY("Content-Disposition: inline\r\n"), 0);
                StrBufAppendBufPlain(BounceMB, HKEY("\r\n"), 0);
        
-               CC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
-               CtdlOutputMsg(omsgid, MT_RFC822, HEADERS_ALL, 0, 1, NULL, 0);
-               StrBufAppendBuf(BounceMB, CC->redirect_buffer, 0);
-               FreeStrBuf(&CC->redirect_buffer);
+               if (OMsgTxt == NULL) {
+                       CC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
+                       CtdlOutputMsg(omsgid, MT_RFC822, HEADERS_ALL, 0, 1, NULL, 0);
+                       StrBufAppendBuf(BounceMB, CC->redirect_buffer, 0);
+                       FreeStrBuf(&CC->redirect_buffer);
+               }
+               else {
+                       StrBufAppendBuf(BounceMB, OMsgTxt, 0);
+               }
        }
 
        /* Close the multipart MIME scope */
@@ -248,16 +253,14 @@ void smtp_do_bounce(char *instr) {
                free(bmsg->cm_fields['A']);
        bmsg->cm_fields['A'] = SmashStrBuf(&BounceMB);
        /* Deliver the bounce if there's anything worth mentioning */
-       CtdlLogPrintf(CTDL_DEBUG, "num_bounces = %d\n", num_bounces);
+       syslog(LOG_DEBUG, "num_bounces = %d\n", num_bounces);
        if (num_bounces > 0) {
 
                /* First try the user who sent the message */
-               CtdlLogPrintf(CTDL_DEBUG, "bounce to user? <%s>\n", bounceto);
-               if (IsEmptyStr(bounceto)) {
-                       CtdlLogPrintf(CTDL_ERR, "No bounce address specified\n");
-                       bounce_msgid = (-1L);
-               }
-
+               if (IsEmptyStr(bounceto)) 
+                       syslog(LOG_ERR, "No bounce address specified\n");
+               else
+                       syslog(LOG_DEBUG, "bounce to user <%s>\n", bounceto);
                /* Can we deliver the bounce to the original sender? */
                valid = validate_recipients(bounceto, smtp_get_Recipients (), 0);
                if (valid != NULL) {
@@ -279,5 +282,5 @@ void smtp_do_bounce(char *instr) {
        }
        FreeStrBuf(&boundary);
        CtdlFreeMessage(bmsg);
-       CtdlLogPrintf(CTDL_DEBUG, "Done processing bounces\n");
+       syslog(LOG_DEBUG, "Done processing bounces\n");
 }