Support PIPECONNECT with helo_data using the local IP, when interface is known.

[exim.git] / src / src / verify.c

diff --git a/src/src/verify.c b/src/src/verify.c
index 12e39d6038760f85fce47c567d2a46fb14314f5d..ed0898c9b7316fd09b42c88d02e01774d987a40c 100644 (file)
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -661,6 +661,7 @@ coding means skipping this whole loop and doing the append separately.  */
     sx->conn_args.interface = interface;
     sx->helo_data = tf->helo_data;
     sx->conn_args.tblock = addr->transport;
+    sx->conn_args.sock = -1;
     sx->verify = TRUE;
 
 tls_retry_connection:
@@ -3546,13 +3547,13 @@ else
     if (n > 4)
       save_errno = (buf[1] << 24) | (buf[2] << 16) | (buf[3] << 8) | buf[4];
     if ((recipient_verify_failure = n > 5
-       ? string_copyn_taint(buf+5, n-5, FALSE) : NULL))
+       ? string_copyn_taint(buf+5, n-5, GET_UNTAINTED) : NULL))
       {
       int m;
       s = buf + 5 + Ustrlen(recipient_verify_failure) + 1;
       m = n - (s - buf);
       acl_verify_message = *msg =
-       m > 0 ? string_copyn_taint(s, m, FALSE) : NULL;
+       m > 0 ? string_copyn_taint(s, m, GET_UNTAINTED) : NULL;
       }
 
     DEBUG(D_verify) debug_printf_indent("verify call response:"