git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TFO: use enum for client status
[exim.git]
/
src
/
src
/
globals.c
diff --git
a/src/src/globals.c
b/src/src/globals.c
index 340c45187c72e4b9e0296887f420f27243e449f8..fdeaebd642104eb65fa3c129b340a957d763da2c 100644
(file)
--- a/
src/src/globals.c
+++ b/
src/src/globals.c
@@
-770,9
+770,11
@@
int debug_fd = -1;
FILE *debug_file = NULL;
int debug_notall[] = {
Di_memory,
FILE *debug_file = NULL;
int debug_notall[] = {
Di_memory,
+ Di_noutf8,
-1
};
-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),
BIT_TABLE(D, acl),
BIT_TABLE(D, all),
BIT_TABLE(D, auth),
@@
-791,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, 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),
BIT_TABLE(D, pid),
BIT_TABLE(D, process_info),
BIT_TABLE(D, queue_run),
@@
-1184,10
+1187,10
@@
int process_info_len = 0;
uschar *process_log_path = NULL;
#if defined(SUPPORT_PROXY) || defined(SUPPORT_SOCKS)
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;
int proxy_external_port = 0;
-uschar *proxy_local_address =
US""
;
+uschar *proxy_local_address =
NULL
;
int proxy_local_port = 0;
#endif
int proxy_local_port = 0;
#endif
@@
-1516,7
+1519,7
@@
gid_t system_filter_gid = 0;
uid_t system_filter_uid = (uid_t)-1;
blob tcp_fastopen_nodata = { .data = NULL, .len = 0 };
uid_t system_filter_uid = (uid_t)-1;
blob tcp_fastopen_nodata = { .data = NULL, .len = 0 };
-
int tcp_out_fastopen = 0
;
+
tfo_state_t tcp_out_fastopen = TFO_NOT_USED
;
#ifdef USE_TCP_WRAPPERS
uschar *tcp_wrappers_daemon_name = US TCP_WRAPPERS_DAEMON_NAME;
#endif
#ifdef USE_TCP_WRAPPERS
uschar *tcp_wrappers_daemon_name = US TCP_WRAPPERS_DAEMON_NAME;
#endif