diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2005-06-17 10:20:30 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2005-06-17 10:20:30 +0000 |
| commit | 90e9ce597d563d233e6623a8cb59b67d55a91d03 (patch) | |
| tree | 91ad1dbfdf687b92052e1e892451ae6c85ad56d4 /src | |
| parent | 5bd022fe5bf43d79ed34753f637775defbad16a1 (diff) | |
Verify recipient with use_postmaster and random was losing
use_postmaster after the random test.
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/verify.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/src/verify.c b/src/src/verify.c index e346cf986..2936e7cbd 100644 --- a/src/src/verify.c +++ b/src/src/verify.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/verify.c,v 1.18 2005/05/31 10:58:18 ph10 Exp $ */ +/* $Cambridge: exim/src/src/verify.c,v 1.19 2005/06/17 10:20:30 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -537,7 +537,8 @@ for (host = host_list; host != NULL && !done; host = host->next) smtp_read_response(&inblock, responsebuffer, sizeof(responsebuffer), '2', callout) && - smtp_write_command(&outblock, FALSE, "MAIL FROM:<>\r\n") >= 0 && + smtp_write_command(&outblock, FALSE, "MAIL FROM:<%s>\r\n", + from_address) >= 0 && smtp_read_response(&inblock, responsebuffer, sizeof(responsebuffer), '2', callout); } @@ -615,7 +616,7 @@ for (host = host_list; host != NULL && !done; host = host->next) } } } /* Random not accepted */ - } /* MAIL FROM:<> accepted */ + } /* MAIL FROM: accepted */ /* For any failure of the main check, other than a negative response, we just close the connection and carry on. We can identify a negative response by the @@ -671,7 +672,7 @@ Otherwise, we looped through the hosts but couldn't complete the business. However, there may be domain-specific information to cache in both cases. The value of the result field in the new_domain record is ccache_unknown if -there was an error before or with MAIL FROM:<>, and errno was not zero, +there was an error before or with MAIL FROM:, and errno was not zero, implying some kind of I/O error. We don't want to write the cache in that case. Otherwise the value is ccache_accept or ccache_reject. */ |