dovecot-1.1: mail_debug=yes: Log recipient/return-path when send...

dovecot at dovecot.org dovecot at dovecot.org
Sat Mar 8 04:40:41 EET 2008


details:   http://hg.dovecot.org/dovecot-1.1/rev/1570eb502366
changeset: 7378:1570eb502366
user:      Timo Sirainen <tss at iki.fi>
date:      Sat Mar 08 04:40:38 2008 +0200
description:
mail_debug=yes: Log recipient/return-path when sending rejects and forwards.

diffstat:

1 file changed, 12 insertions(+)
src/deliver/mail-send.c |   12 ++++++++++++

diffs (36 lines):

diff -r f435be3e3def -r 1570eb502366 src/deliver/mail-send.c
--- a/src/deliver/mail-send.c	Sat Mar 08 04:04:20 2008 +0200
+++ b/src/deliver/mail-send.c	Sat Mar 08 04:40:38 2008 +0200
@@ -15,6 +15,7 @@
 #include "deliver.h"
 #include "mail-send.h"
 
+#include <stdlib.h>
 #include <sys/wait.h>
 
 int global_outgoing_count = 0;
@@ -68,6 +69,11 @@ int mail_send_rejection(struct mail *mai
 		   orig_msgid == NULL ? "" : str_sanitize(orig_msgid, 80),
 		   str_sanitize(reason, 512));
 	    return 0;
+    }
+
+    if (getenv("DEBUG") != NULL) {
+	    i_info("Sending a rejection to %s: %s", recipient,
+		   str_sanitize(reason, 512));
     }
 
     smtp_client = smtp_client_open(return_addr, NULL, &f);
@@ -166,6 +172,12 @@ int mail_send_forward(struct mail *mail,
 
     if (mail_get_first_header(mail, "Return-Path", &return_path) <= 0)
 	    return_path = "";
+
+    if (getenv("DEBUG") != NULL) {
+	    i_info("Sending a forward to <%s> with return path <%s>",
+		   forwardto, return_path);
+    }
+
     smtp_client = smtp_client_open(forwardto, return_path, &f);
 
     input = i_stream_create_header_filter(input, HEADER_FILTER_EXCLUDE |


More information about the dovecot-cvs mailing list