Experimental_XCLIENT. Bug 2702

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

diff --git a/src/src/globals.c b/src/src/globals.c
index a4b2c6a9c21816826176e73912c2425432134d78..9f4053937e0db3f16b58fea7c8715b43b219356d 100644 (file)
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -387,7 +387,7 @@ BOOL    mua_wrapper            = FALSE;
 BOOL    preserve_message_logs  = FALSE;
 BOOL    print_topbitchars      = FALSE;
 BOOL    prod_requires_admin    = TRUE;
 BOOL    preserve_message_logs  = FALSE;
 BOOL    print_topbitchars      = FALSE;
 BOOL    prod_requires_admin    = TRUE;

-#if defined(SUPPORT_PROXY) || defined(SUPPORT_SOCKS)
+#if defined(SUPPORT_PROXY) || defined(SUPPORT_SOCKS) || defined(EXPERIMETAL_XCLIENT)

 BOOL    proxy_session          = FALSE;
 #endif
 
 BOOL    proxy_session          = FALSE;
 #endif
 


@@ -995,11 +995,18 @@ uschar *host_lookup_msg        = US"";
 int     host_number            = 0;
 uschar *host_number_string     = NULL;
 uschar *host_reject_connection = NULL;
 int     host_number            = 0;
 uschar *host_number_string     = NULL;
 uschar *host_reject_connection = NULL;

-tree_node *hostlist_anchor     = NULL;
-int     hostlist_count         = 0;
+uschar *hosts_connection_nolog = NULL;
+#ifdef SUPPORT_PROXY
+uschar *hosts_proxy            = NULL;
+#endif

 uschar *hosts_treat_as_local   = NULL;
 uschar *hosts_require_helo     = US"*";
 uschar *hosts_treat_as_local   = NULL;
 uschar *hosts_require_helo     = US"*";

-uschar *hosts_connection_nolog = NULL;
+#ifdef EXPERIMENTAL_XCLIENT
+uschar *hosts_xclient         = NULL;
+#endif
+tree_node *hostlist_anchor     = NULL;
+int     hostlist_count         = 0;
+

 
 int     ignore_bounce_errors_after = 10*7*24*60*60;  /* 10 weeks */
 uschar *ignore_fromline_hosts  = NULL;
 
 int     ignore_bounce_errors_after = 10*7*24*60*60;  /* 10 weeks */
 uschar *ignore_fromline_hosts  = NULL;


@@ -1232,8 +1239,7 @@ int     process_info_len       = 0;
 uschar *process_log_path       = NULL;
 const uschar *process_purpose  = US"fresh-exec";
 
 uschar *process_log_path       = NULL;
 const uschar *process_purpose  = US"fresh-exec";
 

-#if defined(SUPPORT_PROXY) || defined(SUPPORT_SOCKS)
-uschar *hosts_proxy            = NULL;
+#if defined(SUPPORT_PROXY) || defined(SUPPORT_SOCKS) || defined(EXPERIMENTAL_XCLIENT)

 uschar *proxy_external_address = NULL;
 int     proxy_external_port    = 0;
 uschar *proxy_local_address    = NULL;
 uschar *proxy_external_address = NULL;
 int     proxy_external_port    = 0;
 uschar *proxy_local_address    = NULL;


@@ -1326,7 +1332,7 @@ const pcre2_code *regex_EARLY_PIPE   = NULL;
 int    regex_cachesize              = 0;
 const pcre2_code *regex_ismsgid      = NULL;
 const pcre2_code *regex_smtp_code    = NULL;
 int    regex_cachesize              = 0;
 const pcre2_code *regex_ismsgid      = NULL;
 const pcre2_code *regex_smtp_code    = NULL;

-const uschar *regex_vars[REGEX_VARS] = { 0 };;
+const uschar *regex_vars[REGEX_VARS] = { NULL };

 #ifdef WHITELIST_D_MACROS
 const pcre2_code *regex_whitelisted_macro = NULL;
 #endif
 #ifdef WHITELIST_D_MACROS
 const pcre2_code *regex_whitelisted_macro = NULL;
 #endif


@@ -1657,8 +1663,7 @@ uschar *version_string         = US"?";
 
 uschar *warn_message_file      = NULL;
 int     warning_count          = 0;
 
 uschar *warn_message_file      = NULL;
 int     warning_count          = 0;

-uschar *warnmsg_delay          = NULL;
-uschar *warnmsg_recipients     = NULL;
-
+const uschar *warnmsg_delay    = NULL;
+const uschar *warnmsg_recipients = NULL;

 
 /*  End of globals.c */
 
 /*  End of globals.c */