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
Builtin macros: note config trigger line in debug output
[exim.git]
/
src
/
src
/
globals.c
diff --git
a/src/src/globals.c
b/src/src/globals.c
index 79ac37f92acf684a2125a8ddf6871364cbc8afb9..d61e894f32b518017810607cb19f5df16eb409eb 100644
(file)
--- a/
src/src/globals.c
+++ b/
src/src/globals.c
@@
-470,6
+470,7
@@
int bmi_deliver = 1;
int bmi_run = 0;
uschar *bmi_verdicts = NULL;
#endif
int bmi_run = 0;
uschar *bmi_verdicts = NULL;
#endif
+int bsmtp_transaction_linecount = 0;
int body_8bitmime = 0;
int body_linecount = 0;
int body_zerocount = 0;
int body_8bitmime = 0;
int body_linecount = 0;
int body_zerocount = 0;
@@
-481,7
+482,7
@@
int bounce_return_linesize_limit = 998;
BOOL bounce_return_message = TRUE;
int bounce_return_size_limit = 100*1024;
uschar *bounce_sender_authentication = NULL;
BOOL bounce_return_message = TRUE;
int bounce_return_size_limit = 100*1024;
uschar *bounce_sender_authentication = NULL;
-
int bsmtp_transaction_linecount = 0
;
+
uschar *builtin_macros_create_trigger = NULL
;
uschar *callout_address = NULL;
int callout_cache_domain_positive_expire = 7*24*60*60;
uschar *callout_address = NULL;
int callout_cache_domain_positive_expire = 7*24*60*60;
@@
-529,6
+530,7
@@
uid_t config_uid = 0;
#endif
int connection_max_messages= -1;
#endif
int connection_max_messages= -1;
+uschar *continue_proxy_cipher = NULL;
uschar *continue_hostname = NULL;
uschar *continue_host_address = NULL;
BOOL continue_more = FALSE;
uschar *continue_hostname = NULL;
uschar *continue_host_address = NULL;
BOOL continue_more = FALSE;
@@
-537,8
+539,10
@@
uschar *continue_transport = NULL;
uschar *csa_status = NULL;
cut_t cutthrough = {
uschar *csa_status = NULL;
cut_t cutthrough = {
+ FALSE, /* verify-only: normal delivery */
FALSE, /* delivery: when to attempt */
FALSE, /* on defer: spool locally */
FALSE, /* delivery: when to attempt */
FALSE, /* on defer: spool locally */
+ FALSE, /* not a TLS conn yet */
-1, /* fd: open connection */
0, /* nrcpt: number of addresses */
};
-1, /* fd: open connection */
0, /* nrcpt: number of addresses */
};