X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fexim_monitor%2Fem_globals.c;h=46ad834daea4f561900b8da84bace937ff0191d1;hb=32dfdf8baa8ccf091a0d5d4d75e8627424898756;hp=918659d9867c65ceb9cf9a55fc8513d2e852bbb6;hpb=e91ad4a760cbf58e1f455d2ba226d80aa6c2da05;p=user%2Fhenk%2Fcode%2Fexim.git diff --git a/src/exim_monitor/em_globals.c b/src/exim_monitor/em_globals.c index 918659d98..46ad834da 100644 --- a/src/exim_monitor/em_globals.c +++ b/src/exim_monitor/em_globals.c @@ -2,7 +2,7 @@ * Exim Monitor * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2012 */ +/* Copyright (c) University of Cambridge 1995 - 2015 */ /* See the file NOTICE for conditions of use and distribution. */ @@ -145,10 +145,8 @@ BOOL dkim_disable_verify = FALSE; BOOL dont_deliver = FALSE; -#ifdef EXPERIMENTAL_DSN int dsn_ret = 0; uschar *dsn_envid = NULL; -#endif #ifdef WITH_CONTENT_SCAN int fake_response = OK; @@ -189,13 +187,15 @@ uid_t originator_uid; uschar *primary_hostname = NULL; +uschar *queue_name = US""; + int received_count = 0; uschar *received_protocol = NULL; -int received_time = 0; +struct timeval received_time = { 0, 0 }; int recipients_count = 0; recipient_item *recipients_list = NULL; int recipients_list_max = 0; -int running_in_test_harness=FALSE; +BOOL running_in_test_harness=FALSE; uschar *sender_address = NULL; uschar *sender_fullhost = NULL;