Rename feature to "Transport Post-Delivery Actions"

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

diff --git a/src/src/deliver.c b/src/src/deliver.c
index 5e4a2a1e17ddde8d719f5e442c070b960eda670c..a3030b5f023068d5b05a655194b107b69bf4fc77 100644 (file)
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -695,13 +695,13 @@ the log line, and reset the store afterwards. Remote deliveries should always
 have a pointer to the host item that succeeded; local deliveries can have a
 pointer to a single host item in their host list, for use by the transport. */
 
-#ifdef EXPERIMENTAL_DBL
-  dbl_delivery_ip = NULL;      /* presume no successful remote delivery */
-  dbl_delivery_port = 0;
-  dbl_delivery_fqdn = NULL;
-  dbl_delivery_local_part = NULL;
-  dbl_delivery_domain = NULL;
-  dbl_delivery_confirmation = NULL;
+#ifdef EXPERIMENTAL_TPDA
+  tpda_delivery_ip = NULL;     /* presume no successful remote delivery */
+  tpda_delivery_port = 0;
+  tpda_delivery_fqdn = NULL;
+  tpda_delivery_local_part = NULL;
+  tpda_delivery_domain = NULL;
+  tpda_delivery_confirmation = NULL;
 #endif
 
 s = reset_point = store_get(size);
@@ -752,8 +752,8 @@ if (addr->transport->info->local)
   if (addr->host_list != NULL)
     {
     s = string_append(s, &size, &ptr, 2, US" H=", addr->host_list->name);
-    #ifdef EXPERIMENTAL_DBL
-      dbl_delivery_fqdn = addr->host_list->name;
+    #ifdef EXPERIMENTAL_TPDA
+      tpda_delivery_fqdn = addr->host_list->name;
     #endif
     }
   if (addr->shadow_message != NULL)
@@ -775,13 +775,13 @@ else
     if (continue_sequence > 1)
       s = string_cat(s, &size, &ptr, US"*", 1);
 
-    #ifdef EXPERIMENTAL_DBL
-    dbl_delivery_ip =           addr->host_used->address;
-    dbl_delivery_port =         addr->host_used->port;
-    dbl_delivery_fqdn =         addr->host_used->name;
-    dbl_delivery_local_part =   addr->local_part;
-    dbl_delivery_domain =       addr->domain;
-    dbl_delivery_confirmation = addr->message;
+    #ifdef EXPERIMENTAL_TPDA
+    tpda_delivery_ip =           addr->host_used->address;
+    tpda_delivery_port =         addr->host_used->port;
+    tpda_delivery_fqdn =         addr->host_used->name;
+    tpda_delivery_local_part =   addr->local_part;
+    tpda_delivery_domain =       addr->domain;
+    tpda_delivery_confirmation = addr->message;
     #endif
     }
 
@@ -851,17 +851,16 @@ store we used to build the line after writing it. */
 s[ptr] = 0;
 log_write(0, flags, "%s", s);
 
-#ifdef EXPERIMENTAL_DBL
-if (addr->transport->dbl_delivery_query)
+#ifdef EXPERIMENTAL_TPDA
+if (addr->transport->tpda_delivery_action)
   {
   DEBUG(D_deliver)
-    {
-    debug_printf("  DBL(Delivery): dbl_delivery_query=|%s| dbl_delivery_IP=%s\n",
-      addr->transport->dbl_delivery_query, dbl_delivery_ip);
-    }
+    debug_printf("  TPDA(Delivery): tpda_deliver_action=|%s| tpda_delivery_IP=%s\n",
+      addr->transport->tpda_delivery_action, tpda_delivery_ip);
+
   router_name =    addr->router->name;
   transport_name = addr->transport->name;
-  expand_string(addr->transport->dbl_delivery_query);
+  expand_string(addr->transport->tpda_delivery_action);
   router_name = NULL;
   transport_name = NULL;
   }