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
Fix DKIM verify when used with CHUNKING. Bug 2016
[exim.git]
/
src
/
src
/
globals.c
diff --git
a/src/src/globals.c
b/src/src/globals.c
index b862015a2d073f7210b8bbe6d4034e98197b2993..bb5acb6fcca562b3d1b21605250fef4924aa4e93 100644
(file)
--- a/
src/src/globals.c
+++ b/
src/src/globals.c
@@
-153,7
+153,7
@@
that's the interop problem which has been observed: GnuTLS suggesting a higher
bit-count as "NORMAL" (2432) and Thunderbird dropping connection. */
int tls_dh_max_bits = 2236;
uschar *tls_dhparam = NULL;
bit-count as "NORMAL" (2432) and Thunderbird dropping connection. */
int tls_dh_max_bits = 2236;
uschar *tls_dhparam = NULL;
-uschar *tls_eccurve = US"
prime256v1
";
+uschar *tls_eccurve = US"
auto
";
# ifndef DISABLE_OCSP
uschar *tls_ocsp_file = NULL;
# endif
# ifndef DISABLE_OCSP
uschar *tls_ocsp_file = NULL;
# endif
@@
-183,9
+183,9
@@
incoming TCP/IP. The defaults use stdin. We never need these for any
stand-alone tests. */
#ifndef STAND_ALONE
stand-alone tests. */
#ifndef STAND_ALONE
-int (*lwr_receive_getc)(
void)
= stdin_getc;
+int (*lwr_receive_getc)(
unsigned)
= stdin_getc;
int (*lwr_receive_ungetc)(int) = stdin_ungetc;
int (*lwr_receive_ungetc)(int) = stdin_ungetc;
-int (*receive_getc)(
void)
= stdin_getc;
+int (*receive_getc)(
unsigned)
= stdin_getc;
void (*receive_get_cache)(void)= NULL;
int (*receive_ungetc)(int) = stdin_ungetc;
int (*receive_feof)(void) = stdin_feof;
void (*receive_get_cache)(void)= NULL;
int (*receive_ungetc)(int) = stdin_ungetc;
int (*receive_feof)(void) = stdin_feof;
@@
-508,7
+508,7
@@
int clmacro_count = 0;
uschar *clmacros[MAX_CLMACROS];
BOOL config_changed = FALSE;
FILE *config_file = NULL;
uschar *clmacros[MAX_CLMACROS];
BOOL config_changed = FALSE;
FILE *config_file = NULL;
-
uschar *config_filename
= NULL;
+
const uschar *config_filename
= NULL;
int config_lineno = 0;
#ifdef CONFIGURE_GROUP
gid_t config_gid = CONFIGURE_GROUP;
int config_lineno = 0;
#ifdef CONFIGURE_GROUP
gid_t config_gid = CONFIGURE_GROUP;
@@
-701,7
+701,7
@@
uschar *errors_reply_to = NULL;
int errors_sender_rc = EXIT_FAILURE;
#ifndef DISABLE_EVENT
uschar *event_action = NULL; /* expansion for delivery events */
int errors_sender_rc = EXIT_FAILURE;
#ifndef DISABLE_EVENT
uschar *event_action = NULL; /* expansion for delivery events */
-uschar *event_data = NULL; /* auxilary data variable for event */
+uschar *event_data = NULL; /* auxil
i
ary data variable for event */
int event_defer_errno = 0;
const uschar *event_name = NULL; /* event name variable */
#endif
int event_defer_errno = 0;
const uschar *event_name = NULL; /* event name variable */
#endif