projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DANE: fix build under LibreSSL. Bug 2020
[exim.git]
/
src
/
src
/
globals.c
diff --git
a/src/src/globals.c
b/src/src/globals.c
index df3696c33bebe0e53e4941f8dc89a537ebd8783a..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,10
+508,12
@@
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;
+#else
+gid_t config_gid = 0;
#endif
uschar *config_main_filelist = US CONFIGURE_FILE
"\0<-----------Space to patch configure_filename->";
#endif
uschar *config_main_filelist = US CONFIGURE_FILE
"\0<-----------Space to patch configure_filename->";
@@
-520,6
+522,8
@@
uschar *config_main_directory = NULL;
#ifdef CONFIGURE_OWNER
uid_t config_uid = CONFIGURE_OWNER;
#ifdef CONFIGURE_OWNER
uid_t config_uid = CONFIGURE_OWNER;
+#else
+uid_t config_uid = 0;
#endif
int connection_max_messages= -1;
#endif
int connection_max_messages= -1;
@@
-697,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
@@
-926,6
+930,7
@@
uschar *lookup_value = NULL;
macro_item *macros = NULL;
macro_item *mlast = NULL;
macro_item *macros = NULL;
macro_item *mlast = NULL;
+BOOL macros_builtin_created = FALSE;
uschar *mailstore_basename = NULL;
#ifdef WITH_CONTENT_SCAN
uschar *malware_name = NULL; /* Virus Name */
uschar *mailstore_basename = NULL;
#ifdef WITH_CONTENT_SCAN
uschar *malware_name = NULL; /* Virus Name */
@@
-985,6
+990,9
@@
BOOL no_mbox_unspool = FALSE;
#endif
BOOL no_multiline_responses = FALSE;
#endif
BOOL no_multiline_responses = FALSE;
+const int on = 1; /* for setsockopt */
+const int off = 0;
+
uid_t original_euid;
gid_t originator_gid;
uschar *originator_login = NULL;
uid_t original_euid;
gid_t originator_gid;
uschar *originator_login = NULL;
@@
-1376,6
+1384,7
@@
BOOL suppress_local_fixups_default = FALSE;
BOOL synchronous_delivery = FALSE;
BOOL syslog_duplication = TRUE;
int syslog_facility = LOG_MAIL;
BOOL synchronous_delivery = FALSE;
BOOL syslog_duplication = TRUE;
int syslog_facility = LOG_MAIL;
+BOOL syslog_pid = TRUE;
uschar *syslog_processname = US"exim";
BOOL syslog_timestamp = TRUE;
uschar *system_filter = NULL;
uschar *syslog_processname = US"exim";
BOOL syslog_timestamp = TRUE;
uschar *system_filter = NULL;