[exim-cvs] Fix delivery $host in client authenticator in ver…

Commit:     00bff6f61e05faee0a5a76d3b882f6d1dd96537c
Parent:     2d571266c336367744f6b81b59483227557c3f46
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Thu May 29 22:46:48 2014 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Thu May 29 22:55:10 2014 +0100

    Fix delivery $host in client authenticator in verify/callout.  Bug 1476
---
 doc/doc-txt/ChangeLog |    3 +++
 src/src/verify.c      |    7 +++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index a1ef019..541eac7 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -126,6 +126,9 @@ JH/24 The OCSP stapling feature is moved from Experimental into the mainline.
 TL/12 Bug 1444: Fix improper \r\n sequence handling when writing spool
       file.  Patch from Wolfgang Breyha.

+JH/25 Expand the coverage of the delivery $host and $host_address to
+      client authenticators run in verify callout.  Bug 1476.
+

 Exim version 4.82
 -----------------
diff --git a/src/src/verify.c b/src/src/verify.c
index ea733b6..b1b9f29 100644
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -524,9 +524,6 @@ else
       else active_hostname = s;
       }

-    deliver_host = deliver_host_address = NULL;
-    deliver_domain = save_deliver_domain;
-
     /* Wait for initial response, and send HELO. The smtp_write_command()
     function leaves its command in big_buffer. This is used in error responses.
     Initialize it in case the connection is rejected. */
@@ -720,7 +717,6 @@ else
     ;
     /* Clear down of the TLS, SMTP and TCP layers on error is handled below.  */

-
     /* Failure to accept HELO is cached; this blocks the whole domain for all
     senders. I/O errors and defer responses are not cached. */

@@ -758,6 +754,9 @@ else
       smtp_read_response(&inblock, responsebuffer, sizeof(responsebuffer),
         '2', callout);

+    deliver_host = deliver_host_address = NULL;
+    deliver_domain = save_deliver_domain;
+
     /* If the host does not accept MAIL FROM:<>, arrange to cache this
     information, but again, don't record anything for an I/O error or a defer. Do
     not cache rejections of MAIL when a non-empty sender has been used, because