# HG changeset patch
# User Timo Sirainen <tss@iki.fi>
# Date 1240244508 14400
# Node ID a3e0524e8af8a0bae3ee129ba2d33ca235e1703d
# Parent  3c8e0e094139dac3efcbb60f8508a29363da3c7c
deliver: When forwarding messages, use -f parameter as return path and fallback to normalized Return-Path: header.

diff -r 3c8e0e094139 -r a3e0524e8af8 src/lib-lda/mail-send.c
--- 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);