dovecot-1.2: deliver: If -f <sender> was specified and -a not, t...
dovecot at dovecot.org
dovecot at dovecot.org
Mon Feb 2 19:48:46 EET 2009
details: http://hg.dovecot.org/dovecot-1.2/rev/db9989630e89
changeset: 8701:db9989630e89
user: Timo Sirainen <tss at iki.fi>
date: Mon Feb 02 12:48:41 2009 -0500
description:
deliver: If -f <sender> was specified and -a not, the sender was used also as the destination.
%f in deliver_log_format was also expanded to the sender.
diffstat:
1 file changed, 3 insertions(+), 3 deletions(-)
src/deliver/deliver.c | 6 +++---
diffs (23 lines):
diff -r 02f72e7be270 -r db9989630e89 src/deliver/deliver.c
--- a/src/deliver/deliver.c Mon Feb 02 12:27:56 2009 -0500
+++ b/src/deliver/deliver.c Mon Feb 02 12:48:41 2009 -0500
@@ -84,9 +84,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(),
@@ -263,6 +260,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");
}
More information about the dovecot-cvs
mailing list