X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=blobdiff_plain;f=src%2Fsrc%2Fglobals.c;h=b68544e54d590335f6e644623c98409695c9a3b3;hp=9b77d876b202495e10c3a37cf928e2651a30abc3;hb=9ee44efbe7474892e931cd517195cb690e765ab6;hpb=c1d94452b1b7f3620ee3cc9aa197ad98821de79f diff --git a/src/src/globals.c b/src/src/globals.c index 9b77d876b..b68544e54 100644 --- a/src/src/globals.c +++ b/src/src/globals.c @@ -1,5 +1,3 @@ -/* $Cambridge: exim/src/src/globals.c,v 1.88 2010/06/12 15:21:26 jetmore Exp $ */ - /************************************************* * Exim - an Internet mail transport agent * *************************************************/ @@ -13,21 +11,6 @@ that they are easy to find. */ #include "exim.h" -/* The OSF1 linker puts out a worrying warning if any sections contain no -executable code. It says - -Warning: Linking some objects which contain exception information sections - and some which do not. This may cause fatal runtime exception handling - problems. - -As this may cause people to worry needlessly, include a dummy function here -to stop the message from appearing. Make it reference itself to stop picky -compilers complaining that it is unused, and put in a dummy argument to stop -even pickier compilers complaining about infinite loops. */ - -static void dummy(int x) { dummy(x-1); } - - /* Generic options for auths, all of which live inside auth_instance data blocks and hence have the opt_public flag set. */ @@ -75,8 +58,15 @@ uschar *ibase_servers = NULL; #endif #ifdef LOOKUP_LDAP +uschar *eldap_ca_cert_dir = NULL; +uschar *eldap_ca_cert_file = NULL; +uschar *eldap_cert_file = NULL; +uschar *eldap_cert_key = NULL; +uschar *eldap_cipher_suite = NULL; uschar *eldap_default_servers = NULL; +uschar *eldap_require_cert = NULL; int eldap_version = -1; +BOOL eldap_start_tls = FALSE; #endif #ifdef LOOKUP_MYSQL @@ -104,6 +94,7 @@ cluttered in several places (e.g. during logging) if we can always refer to them. Also, the tls_ variables are now always visible. */ BOOL tls_active = -1; +int tls_bits = 0; BOOL tls_certificate_verified = FALSE; uschar *tls_cipher = NULL; BOOL tls_on_connect = FALSE; @@ -125,6 +116,9 @@ BOOL tls_offered = FALSE; uschar *tls_privatekey = NULL; BOOL tls_remember_esmtp = FALSE; uschar *tls_require_ciphers = NULL; +#ifndef USE_GNUTLS +uschar *tls_sni = NULL; +#endif uschar *tls_try_verify_hosts = NULL; uschar *tls_verify_certificates= NULL; uschar *tls_verify_hosts = NULL; @@ -253,7 +247,7 @@ uschar *acl_wherecodes[] = { US"550", /* RCPT */ BOOL active_local_from_check = FALSE; BOOL active_local_sender_retain = FALSE; -BOOL accept_8bitmime = FALSE; +BOOL accept_8bitmime = TRUE; /* deliberately not RFC compliant */ address_item *addr_duplicate = NULL; address_item address_defaults = { @@ -358,6 +352,7 @@ uschar *auth_defer_user_msg = US""; uschar *auth_vars[AUTH_VARS]; int auto_thaw = 0; #ifdef WITH_CONTENT_SCAN +BOOL av_failed = FALSE; uschar *av_scanner = US"sophie:/var/run/sophie"; /* AV scanner */ #endif @@ -549,6 +544,7 @@ BOOL dns_csa_use_reverse = TRUE; uschar *dns_ipv4_lookup = NULL; int dns_retrans = 0; int dns_retry = 0; +int dns_use_edns0 = -1; /* <0 = not coerced */ uschar *dnslist_domain = NULL; uschar *dnslist_matched = NULL; uschar *dnslist_text = NULL; @@ -641,7 +637,7 @@ uschar *helo_try_verify_hosts = NULL; BOOL helo_verified = FALSE; BOOL helo_verify_failed = FALSE; uschar *helo_verify_hosts = NULL; -uschar *hex_digits = US"0123456789abcdef"; +const uschar *hex_digits = CUS"0123456789abcdef"; uschar *hold_domains = NULL; BOOL host_checking = FALSE; BOOL host_checking_callout = FALSE; @@ -663,6 +659,8 @@ uschar *hosts_connection_nolog = NULL; int ignore_bounce_errors_after = 10*7*24*60*60; /* 10 weeks */ BOOL ignore_fromline_local = FALSE; uschar *ignore_fromline_hosts = NULL; +BOOL inetd_wait_mode = FALSE; +int inetd_wait_timeout = -1; uschar *interface_address = NULL; int interface_port = -1; BOOL is_inetd = FALSE; @@ -701,7 +699,7 @@ uschar *log_file_path = US LOG_FILE_PATH /* Those log options with L_xxx identifiers have values less than 0x800000 and are the ones that get put into log_write_selector. They can be used in calls to log_write() to test for the bit. The options with LX_xxx identifiers have -values greater than 0x80000000 and are put int log_extra_selector (without the +values greater than 0x80000000 and are put into log_extra_selector (without the top bit). They are never used in calls to log_write(), but are tested independently. This separation became necessary when the number of log selectors was getting close to filling a 32-bit word. */ @@ -750,6 +748,7 @@ bit_table log_options[] = { { US"tls_certificate_verified", LX_tls_certificate_verified }, { US"tls_cipher", LX_tls_cipher }, { US"tls_peerdn", LX_tls_peerdn }, + { US"tls_sni", LX_tls_sni }, { US"unknown_in_list", LX_unknown_in_list } }; @@ -795,7 +794,7 @@ uschar *message_reference = NULL; /* MIME ACL expandables */ #ifdef WITH_CONTENT_SCAN int mime_anomaly_level = 0; -uschar *mime_anomaly_text = NULL; +const uschar *mime_anomaly_text = NULL; uschar *mime_boundary = NULL; uschar *mime_charset = NULL; uschar *mime_content_description = NULL; @@ -839,6 +838,7 @@ BOOL preserve_message_logs = FALSE; uschar *primary_hostname = NULL; BOOL print_topbitchars = FALSE; uschar process_info[PROCESS_INFO_SIZE]; +int process_info_len = 0; uschar *process_log_path = NULL; BOOL prod_requires_admin = TRUE; uschar *prvscheck_address = NULL; @@ -930,6 +930,9 @@ const pcre *regex_PIPELINING = NULL; const pcre *regex_SIZE = NULL; const pcre *regex_smtp_code = NULL; const pcre *regex_ismsgid = NULL; +#ifdef WHITELIST_D_MACROS +const pcre *regex_whitelisted_macro = NULL; +#endif #ifdef WITH_CONTENT_SCAN uschar *regex_match_string = NULL; #endif @@ -1078,7 +1081,7 @@ int sender_verified_rc = -1; BOOL sender_verified_responded = FALSE; uschar *sending_ip_address = NULL; int sending_port = -1; -volatile BOOL sigalrm_seen = FALSE; +SIGNAL_BOOL sigalrm_seen = FALSE; uschar **sighup_argv = NULL; int smtp_accept_count = 0; BOOL smtp_accept_keepalive = TRUE; @@ -1169,6 +1172,8 @@ BOOL srs_usetimestamp = TRUE; #endif BOOL strict_acl_vars = FALSE; int string_datestamp_offset= -1; +int string_datestamp_length= 0; +int string_datestamp_type = -1; BOOL strip_excess_angle_brackets = FALSE; BOOL strip_trailing_dot = FALSE; uschar *submission_domain = NULL; @@ -1189,7 +1194,7 @@ uschar *system_filter_reply_transport = NULL; gid_t system_filter_gid = 0; BOOL system_filter_gid_set = FALSE; -uid_t system_filter_uid = 0; +uid_t system_filter_uid = (uid_t)-1; BOOL system_filter_uid_set = FALSE; BOOL system_filtering = FALSE; @@ -1257,6 +1262,7 @@ transport_instance transport_defaults = { }; int transport_count; +int transport_newlines; uschar **transport_filter_argv = NULL; int transport_filter_timeout; BOOL transport_filter_timed_out = FALSE; @@ -1268,6 +1274,7 @@ tree_node *tree_nonrecipients = NULL; tree_node *tree_unusable = NULL; BOOL trusted_caller = FALSE; +BOOL trusted_config = TRUE; gid_t *trusted_groups = NULL; uid_t *trusted_users = NULL; uschar *timezone_string = US TIMEZONE_DEFAULT;