Mercurial > dovecot > original-hg > dovecot-1.2
changeset 8701:db9989630e89 HEAD
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.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Mon, 02 Feb 2009 12:48:41 -0500 |
| parents | 02f72e7be270 |
| children | 8fb251e401e6 |
| files | src/deliver/deliver.c |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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 @@ 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 @@ 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"); }