diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2005-06-23 10:02:13 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2005-06-23 10:02:13 +0000 |
| commit | 5417f6d1692158318d419c8931bfe34e53d87f36 (patch) | |
| tree | 5bc01e0f1e27c88f7028e82c0d9f6808a686651d /src | |
| parent | ff790e47f2de6f4d6d48148e1d5a67da8e93c446 (diff) | |
Fix crash when callout to an address routed by a verify_only router with
no transport.
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/verify.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/src/verify.c b/src/src/verify.c index cdf5bb78d..9d99c69cd 100644 --- a/src/src/verify.c +++ b/src/src/verify.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/verify.c,v 1.20 2005/06/22 10:17:23 ph10 Exp $ */ +/* $Cambridge: exim/src/src/verify.c,v 1.21 2005/06/23 10:02:13 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -550,10 +550,14 @@ for (host = host_list; host != NULL && !done; host = host->next) if (new_domain_record.random_result != ccache_accept && done) { + /* Get the rcpt_include_affixes flag from the transport if there is one, + but assume FALSE if there is not. */ + done = smtp_write_command(&outblock, FALSE, "RCPT TO:<%.1000s>\r\n", transport_rcpt_address(addr, - addr->transport->rcpt_include_affixes)) >= 0 && + (addr->transport == NULL)? FALSE : + addr->transport->rcpt_include_affixes)) >= 0 && smtp_read_response(&inblock, responsebuffer, sizeof(responsebuffer), '2', callout); |