Make router_name and transport_name usable for the expansions

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

diff --git a/src/src/deliver.c b/src/src/deliver.c
index ac120451bd2681baaaf9e09fbd18b9e7a97c9810..29ce056537ca16b693a6fbc755f560b343d63a88 100644 (file)
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -841,12 +841,18 @@ 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)
+  {
+  DEBUG(D_deliver)
+    {
+    debug_printf("  DBL(Delivery): dbl_delivery_query=|%s| dbl_delivery_IP=%s\n", dbl_delivery_query, dbl_delivery_ip);
+    }
+  router_name = addr->router->name;
+  transport_name = addr->transport->name;
   expand_string(dbl_delivery_query);
+  router_name = NULL;
+  transport_name = NULL;
+  }
 #endif
 store_reset(reset_point);
 return;