dovecot-1.1: deliver: If -f <sender> was specified, it was logge...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.1/rev/065f5a81b428
changeset: 8142:065f5a81b428
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Feb 02 12:47:01 2009 -0500
description:
deliver: If -f <sender> was specified, it was logged as the %f in deliver_log_format.

diffstat:

1 file changed, 3 insertions(+), 3 deletions(-)
src/deliver/deliver.c |    6 +++---

diffs (23 lines):

diff -r 27edac6bc1e6 -r 065f5a81b428 src/deliver/deliver.c
--- a/src/deliver/deliver.c	Mon Feb 02 12:27:39 2009 -0500
+++ b/src/deliver/deliver.c	Mon Feb 02 12:47:01 2009 -0500
@@ -85,9 +85,6 @@ static const char *deliver_get_address(s
 	struct message_address *addr;
 	const char *str;
 
-	if (explicit_envelope_sender != NULL)
-		return explicit_envelope_sender;
-
 	if (mail_get_first_header(mail, header, &str) <= 0)
 		return NULL;
 	addr = message_address_parse(pool_datastack_create(),
@@ -257,6 +254,9 @@ int deliver_save(struct mail_namespace *
 
 const char *deliver_get_return_address(struct mail *mail)
 {
+	if (explicit_envelope_sender != NULL)
+		return explicit_envelope_sender;
+
 	return deliver_get_address(mail, "Return-Path");
 }