dovecot-1.1: deliver: When forwarding messages, use -f parameter...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.1/rev/b217c085ba15
changeset: 8249:b217c085ba15
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Apr 20 12:17:59 2009 -0400
description:
deliver: When forwarding messages, use -f parameter as return path and fallback to normalized Return-Path: header.

diffstat:

1 file changed, 1 insertion(+), 3 deletions(-)
src/deliver/mail-send.c |    4 +---

diffs (14 lines):

diff -r 1591d3220f12 -r b217c085ba15 src/deliver/mail-send.c
--- a/src/deliver/mail-send.c	Fri Apr 17 12:56:14 2009 -0400
+++ b/src/deliver/mail-send.c	Mon Apr 20 12:17:59 2009 -0400
@@ -175,9 +175,7 @@ int mail_send_forward(struct mail *mail,
     if (mail_get_stream(mail, NULL, NULL, &input) < 0)
 	    return -1;
 
-    if (mail_get_first_header(mail, "Return-Path", &return_path) <= 0)
-	    return_path = "";
-
+    return_path = deliver_get_return_address(mail);
     if (getenv("DEBUG") != NULL) {
 	    i_info("Sending a forward to <%s> with return path <%s>",
 		   forwardto, return_path);