diff options
| author | Tony Finch <dot@dot.at> | 2005-09-22 12:02:21 +0000 |
|---|---|---|
| committer | Tony Finch <dot@dot.at> | 2005-09-22 12:02:21 +0000 |
| commit | 0154e85a4031b840fc35109a84ff32f55c802d97 (patch) | |
| tree | 7f7848fed14ee63625432ba734abd3d26bea97cb /src | |
| parent | 66afa40353d7dccfb7d35d6d67bf6408d46bbe8f (diff) | |
A tweak to change PH/13, so that verify=helo never defers (as in 4.52).
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/acl.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/src/acl.c b/src/src/acl.c index b582df7ea..c06707ec6 100644 --- a/src/src/acl.c +++ b/src/src/acl.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/acl.c,v 1.48 2005/09/13 18:06:30 fanf2 Exp $ */ +/* $Cambridge: exim/src/src/acl.c,v 1.49 2005/09/22 12:02:22 fanf2 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -1391,10 +1391,8 @@ occurred earlier. If not, we can attempt the verification now. */ if (strcmpic(ss, US"helo") == 0) { if (slash != NULL) goto NO_OPTIONS; - if (helo_verified) return OK; - if (helo_verify_failed) return FAIL; - if (smtp_verify_helo()) return helo_verified? OK : FAIL; - return DEFER; + if (!helo_verified && !helo_verify_failed) smtp_verify_helo(); + return helo_verified? OK : FAIL; } /* Do Client SMTP Authorization checks in a separate function, and turn the |