changeset 8968:5317349a8dea HEAD

deliver: When forwarding messages, use -f parameter as return path and fallback to normalized Return-Path: header.
author Timo Sirainen <tss@iki.fi>
date Mon, 20 Apr 2009 12:17:59 -0400
parents 0dcb7e34a216
children 56732ef5ff96
files src/deliver/mail-send.c
diffstat 1 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/deliver/mail-send.c	Fri Apr 17 17:20:24 2009 -0400
+++ b/src/deliver/mail-send.c	Mon Apr 20 12:17:59 2009 -0400
@@ -175,9 +175,7 @@
     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);