Mercurial > dovecot > core-2.2

changeset 9139:a3e0524e8af8 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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:21:48 -0400
parents 3c8e0e094139
children 7be0a6c4bc6b
files src/lib-lda/mail-send.c
diffstat 1 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-lda/mail-send.c	Fri Apr 17 17:58:28 2009 -0400
+++ b/src/lib-lda/mail-send.c	Mon Apr 20 12:21:48 2009 -0400
@@ -178,9 +178,7 @@
     if (mail_get_stream(ctx->src_mail, NULL, NULL, &input) < 0)
 	    return -1;
 
-    if (mail_get_first_header(ctx->src_mail, "Return-Path", &return_path) <= 0)
-	    return_path = "";
-
+    return_path = mail_deliver_get_return_address(ctx);
     if (mailbox_get_settings(ctx->src_mail->box)->mail_debug) {
 	    i_info("Sending a forward to <%s> with return path <%s>",
 		   forwardto, return_path);