Mercurial > dovecot > original-hg > dovecot-1.2
changeset 6508:722bef1a0c4e HEAD
If -f parameter is given, use it for deliver_get_return_address() instead of
Return-Path: header.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Sun, 30 Sep 2007 16:13:50 +0300 |
| parents | 392a49f0c69a |
| children | d0689497bb11 |
| files | src/deliver/deliver.c |
| diffstat | 1 files changed, 5 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/deliver/deliver.c Sun Sep 30 15:52:26 2007 +0300 +++ b/src/deliver/deliver.c Sun Sep 30 16:13:50 2007 +0300 @@ -54,6 +54,7 @@ static bool saved_mail = FALSE; static bool tried_default_save = FALSE; static bool no_mailbox_autocreate = FALSE; +static const char *explicit_envelope_sender = NULL; static struct module *modules; static struct ioloop *ioloop; @@ -178,6 +179,9 @@ struct message_address *addr; const char *str; + if (explicit_envelope_sender != NULL) + return explicit_envelope_sender; + if (mail_get_first_header(mail, "Return-Path", &str) <= 0) return NULL; addr = message_address_parse(pool_datastack_create(), @@ -659,6 +663,7 @@ "Missing envelope argument"); } envelope_sender = argv[i]; + explicit_envelope_sender = argv[i]; } else if (argv[i][0] != '\0') { print_help(); i_fatal_status(EX_USAGE,