Merge branch 'master' into transp_logging_1031

[users/jgh/exim.git] / src / src / deliver.c

diff --git a/src/src/deliver.c b/src/src/deliver.c
index 23e63d553d188426538ad0e826a0b72d090812db..7ff25f22aa33231a1f7351bb0dc218e509001a84 100644 (file)
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -713,6 +713,9 @@ if ((log_extra_selector & LX_sender_on_delivery) != 0  ||  msg)
 if(addr->p.srs_sender)
   s = string_append(s, &size, &ptr, 3, US" SRS=<", addr->p.srs_sender, US">");
 #endif
+#ifdef EXPERIMENTAL_DBL
+  dbl_delivery_ip = NULL;      /* presume no successful remote delivery */
+#endif
 
 /* You might think that the return path must always be set for a successful
 delivery; indeed, I did for some time, until this statement crashed. The case
@@ -827,6 +830,14 @@ store we used to build the line after writing it. */
 
 s[ptr] = 0;
 log_write(0, flags, "%s", s);
+#ifdef EXPERIMENTAL_DBL
+DEBUG(D_deliver)
+  {
+  debug_printf("  DBL(Delivery): dbl_delivery_query=|%s| dbl_delivery_IP=%s\n", dbl_delivery_query, dbl_delivery_ip);
+  }
+if (dbl_delivery_ip != NULL && dbl_delivery_query != NULL)
+  expand_string(dbl_delivery_query);
+#endif
 store_reset(reset_point);
 return;
 }