Debug: noutf8 selector. Bug 2324

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

diff --git a/src/src/globals.c b/src/src/globals.c
index d834373b5cc7dd5e8c4ed8059462357b4b2ccbb3..cdf00e8107225674fb98109eeda8c268fe146a2c 100644 (file)
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -315,7 +315,6 @@ struct global_flags f =
        .really_exim            = TRUE,
        .receive_call_bombout   = FALSE,
        .recipients_discarded   = FALSE,
-/* BOOL    rfc821_domains         = FALSE;  <<< on the way out */
        .running_in_test_harness = FALSE,
 
        .search_find_defer      = FALSE,
@@ -325,7 +324,6 @@ struct global_flags f =
        .sender_local           = FALSE,
        .sender_name_forced     = FALSE,
        .sender_set_untrusted   = FALSE,
-/* BOOL    sender_verified_responded = FALSE; /* never used? */
        .smtp_authenticated     = FALSE,
        .smtp_in_pipelining_advertised = FALSE,
        .smtp_in_pipelining_used = FALSE,
@@ -772,9 +770,11 @@ int     debug_fd               = -1;
 FILE   *debug_file             = NULL;
 int     debug_notall[]         = {
   Di_memory,
+  Di_noutf8,
   -1
 };
-bit_table debug_options[]      = { /* must be in alphabetical order */
+bit_table debug_options[]      = { /* must be in alphabetical order and use
+                                only the enum values from macro.h */
   BIT_TABLE(D, acl),
   BIT_TABLE(D, all),
   BIT_TABLE(D, auth),
@@ -793,6 +793,7 @@ bit_table debug_options[]      = { /* must be in alphabetical order */
   BIT_TABLE(D, local_scan),
   BIT_TABLE(D, lookup),
   BIT_TABLE(D, memory),
+  BIT_TABLE(D, noutf8),
   BIT_TABLE(D, pid),
   BIT_TABLE(D, process_info),
   BIT_TABLE(D, queue_run),
@@ -1186,10 +1187,10 @@ int     process_info_len       = 0;
 uschar *process_log_path       = NULL;
 
 #if defined(SUPPORT_PROXY) || defined(SUPPORT_SOCKS)
-uschar *hosts_proxy            = US"";
-uschar *proxy_external_address = US"";
+uschar *hosts_proxy            = NULL;
+uschar *proxy_external_address = NULL;
 int     proxy_external_port    = 0;
-uschar *proxy_local_address    = US"";
+uschar *proxy_local_address    = NULL;
 int     proxy_local_port       = 0;
 #endif