Make transport name available in verify-callouts. Add verify_mode variable

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

diff --git a/src/src/globals.c b/src/src/globals.c
index 22bd69e0195d19af9ce8237162fcda93fb2b357e..1eae4a8306e726a915b6aba5eecaad6d3f16b188 100644 (file)
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -1336,11 +1336,11 @@ int     thismessage_size_limit = 0;
 int     timeout_frozen_after   = 0;
 BOOL    timestamps_utc         = FALSE;
 
-#ifdef EXPERIMENTAL_TPDA
-int     tpda_defer_errno        = 0;
-uschar *tpda_event              = NULL;        /* event name */
-uschar *tpda_data               = NULL;        /* auxilary data for event */
-uschar *delivery_event_action   = NULL;        /* expansion for delivery events */
+#ifdef EXPERIMENTAL_EVENT
+uschar *event_action             = NULL;       /* expansion for delivery events */
+uschar *event_data               = NULL;       /* auxilary data variable for event */
+int     event_defer_errno        = 0;
+uschar *event_name               = NULL;       /* event name variable */
 #endif
 
 transport_instance  *transports = NULL;
@@ -1395,8 +1395,8 @@ transport_instance  transport_defaults = {
     FALSE,                    /* log_defer_output */
     TRUE_UNSET                /* retry_use_local_part: BOOL, but set neither
                                  1 nor 0 so can detect unset */
-#ifdef EXPERIMENTAL_TPDA
-   ,NULL                     /* tpda_event_action */
+#ifdef EXPERIMENTAL_EVENT
+   ,NULL                     /* event_action */
 #endif
 };
 
@@ -1448,11 +1448,7 @@ uschar *uucp_from_pattern      = US
 
 uschar *uucp_from_sender       = US"$1";
 
-uschar *warn_message_file      = NULL;
-uschar *warnmsg_delay          = NULL;
-uschar *warnmsg_recipients     = NULL;
-BOOL    write_rejectlog        = TRUE;
-
+uschar *verify_mode           = NULL;
 uschar *version_copyright      =
  US"Copyright (c) University of Cambridge, 1995 - 2014\n"
    "(c) The Exim Maintainers and contributors in ACKNOWLEDGMENTS file, 2007 - 2014";
@@ -1460,6 +1456,11 @@ uschar *version_date           = US"?";
 uschar *version_cnumber        = US"????";
 uschar *version_string         = US"?";
 
+uschar *warn_message_file      = NULL;
 int     warning_count          = 0;
+uschar *warnmsg_delay          = NULL;
+uschar *warnmsg_recipients     = NULL;
+BOOL    write_rejectlog        = TRUE;
+
 
 /*  End of globals.c */