Merge remote-tracking branch 'exim_github/pr/18'

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

diff --git a/src/src/globals.c b/src/src/globals.c
index d09903d650c95e8b1f5732160f3fb6b8ac6485d0..22bd69e0195d19af9ce8237162fcda93fb2b357e 100644 (file)
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -105,6 +105,7 @@ tls_support tls_in = {
  FALSE,/* tls_certificate_verified */
 #ifdef EXPERIMENTAL_DANE
  FALSE,/* dane_verified */
+ 0,    /* tlsa_usage */
 #endif
  NULL, /* tls_cipher */
  FALSE,/* tls_on_connect */
@@ -121,6 +122,7 @@ tls_support tls_out = {
  FALSE,/* tls_certificate_verified */
 #ifdef EXPERIMENTAL_DANE
  FALSE,/* dane_verified */
+ 0,    /* tlsa_usage */
 #endif
  NULL, /* tls_cipher */
  FALSE,/* tls_on_connect */
@@ -583,6 +585,7 @@ time_t  deliver_frozen_at      = 0;
 uschar *deliver_home           = NULL;
 uschar *deliver_host           = NULL;
 uschar *deliver_host_address   = NULL;
+int     deliver_host_port      = 0;
 uschar *deliver_in_buffer      = NULL;
 ino_t   deliver_inode          = 0;
 uschar *deliver_localpart      = NULL;
@@ -1335,13 +1338,9 @@ BOOL    timestamps_utc         = FALSE;
 
 #ifdef EXPERIMENTAL_TPDA
 int     tpda_defer_errno        = 0;
-uschar *tpda_defer_errstr       = NULL;
-uschar *tpda_delivery_ip        = NULL;
-int     tpda_delivery_port      = 0;
-uschar *tpda_delivery_fqdn      = NULL;
-uschar *tpda_delivery_local_part= NULL;
-uschar *tpda_delivery_domain    = NULL;
-uschar *tpda_delivery_confirmation = NULL;
+uschar *tpda_event              = NULL;        /* event name */
+uschar *tpda_data               = NULL;        /* auxilary data for event */
+uschar *delivery_event_action   = NULL;        /* expansion for delivery events */
 #endif
 
 transport_instance  *transports = NULL;
@@ -1397,7 +1396,7 @@ transport_instance  transport_defaults = {
     TRUE_UNSET                /* retry_use_local_part: BOOL, but set neither
                                  1 nor 0 so can detect unset */
 #ifdef EXPERIMENTAL_TPDA
-   ,NULL                     /* tpda_delivery_action */
+   ,NULL                     /* tpda_event_action */
 #endif
 };