From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 12 Oct 2014 21:11:41 +0000 (+0100)
Subject: Make dnssec status available in tpda delivery event, for cutthrough
X-Git-Tag: exim-4_85_RC1~40^2~2
X-Git-Url: https://git.exim.org/users/jgh/exim.git/commitdiff_plain/b75960c88e72a4668f1658b90ac80251b0825f77?ds=inline;hp=-c

Make dnssec status available in tpda delivery event, for cutthrough
---

b75960c88e72a4668f1658b90ac80251b0825f77
diff --git a/src/src/deliver.c b/src/src/deliver.c
index 881c97733..c6339c62f 100644
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -3702,7 +3702,7 @@ if (size > 99999)
 /* two write() calls would increase the complexity of reading from pipe */
 
 /* convert size to human readable string prepended by id and subid */
-header_length = snprintf(writebuffer, PIPE_HEADER_SIZE+1, "%c%c%05d", id, subid, size);
+header_length = snprintf(CS writebuffer, PIPE_HEADER_SIZE+1, "%c%c%05d", id, subid, size);
 if (header_length != PIPE_HEADER_SIZE)
 {
   log_write(0, LOG_MAIN|LOG_PANIC_DIE, "header snprintf failed\n");
@@ -4341,9 +4341,9 @@ for (delivery_count = 0; addr_remote != NULL; delivery_count++)
 #ifndef DISABLE_PRDR
       if (addr->flags & af_prdr_used)
 	rmt_dlv_checked_write(fd, 'P', '0', NULL, 0);
-      #endif
+#endif
 
-      #ifdef EXPERIMENTAL_DSN
+#ifdef EXPERIMENTAL_DSN
       memcpy(big_buffer, &addr->dsn_aware, sizeof(addr->dsn_aware));
       rmt_dlv_checked_write(fd, 'D', '0', big_buffer, sizeof(addr->dsn_aware));
       DEBUG(D_deliver) debug_printf("DSN write: addr->dsn_aware = %d\n", addr->dsn_aware);
diff --git a/src/src/verify.c b/src/src/verify.c
index c25e6e257..29d7b1328 100644
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -1044,9 +1044,7 @@ else
       cutthrough_addr = *addr;		/* Save the address_item for later logging */
       cutthrough_addr.next =	  NULL;
       cutthrough_addr.host_used = store_get(sizeof(host_item));
-      cutthrough_addr.host_used->name =    host->name;
-      cutthrough_addr.host_used->address = host->address;
-      cutthrough_addr.host_used->port =    port;
+      *(cutthrough_addr.host_used) = *host;
       if (addr->parent)
         *(cutthrough_addr.parent = store_get(sizeof(address_item)))= *addr->parent;
       ctblock.buffer = ctbuffer;