X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/384152a6b0cce686255894a502e4b88743abd356..f78eb7c6264c5f1a4ec2fb24c39060e0686f7714:/src/src/globals.c diff --git a/src/src/globals.c b/src/src/globals.c index 2f6b5fdda..e609f3020 100644 --- a/src/src/globals.c +++ b/src/src/globals.c @@ -1,10 +1,10 @@ -/* $Cambridge: exim/src/src/globals.c,v 1.27 2005/05/24 08:15:02 tom Exp $ */ +/* $Cambridge: exim/src/src/globals.c,v 1.46 2006/02/10 14:25:43 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2005 */ +/* Copyright (c) University of Cambridge 1995 - 2006 */ /* See the file NOTICE for conditions of use and distribution. */ /* All the global variables are defined together in this one module, so @@ -87,6 +87,10 @@ uschar *oracle_servers = NULL; uschar *pgsql_servers = NULL; #endif +#ifdef LOOKUP_SQLITE +int sqlite_lock_timeout = 5; +#endif + #ifdef SUPPORT_MOVE_FROZEN_MESSAGES BOOL move_frozen_messages = FALSE; #endif @@ -180,7 +184,7 @@ uschar *acl_smtp_rcpt = NULL; uschar *acl_smtp_starttls = NULL; uschar *acl_smtp_vrfy = NULL; BOOL acl_temp_details = FALSE; -uschar *acl_var[ACL_C_MAX+ACL_M_MAX]; +uschar *acl_var[ACL_CVARS + ACL_MVARS]; uschar *acl_verify_message = NULL; header_line *acl_warn_headers = NULL; string_item *acl_warn_logged = NULL; @@ -323,14 +327,21 @@ auth_instance auth_defaults = { uschar *auth_defer_msg = US"reason not recorded"; uschar *auth_defer_user_msg = US""; +uschar *auth_vars[AUTH_VARS]; int auto_thaw = 0; #ifdef WITH_CONTENT_SCAN uschar *av_scanner = US"sophie:/var/run/sophie"; /* AV scanner */ #endif BOOL background_daemon = TRUE; + +#if BASE_62 == 62 uschar *base62_chars= US"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; +#else +uschar *base62_chars= US"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; +#endif + uschar *bi_command = NULL; uschar *big_buffer = NULL; int big_buffer_size = BIG_BUFFER_SIZE; @@ -362,6 +373,7 @@ uschar *callout_random_local_part = US"$primary_hostname-$tod_epoch-testing"; uschar *check_dns_names_pattern= US"(?i)^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$"; int check_log_inodes = 0; int check_log_space = 0; +BOOL check_rfc2047_length = TRUE; int check_spool_inodes = 0; int check_spool_space = 0; int clmacro_count = 0; @@ -392,6 +404,8 @@ uschar *csa_status = NULL; BOOL daemon_listen = FALSE; uschar *daemon_smtp_port = US"smtp"; +int daemon_startup_retries = 9; +int daemon_startup_sleep = 30; BOOL debug_daemon = FALSE; int debug_fd = -1; FILE *debug_file = NULL; @@ -469,6 +483,7 @@ int demime_errorlevel = 0; int demime_ok = 0; uschar *demime_reason = NULL; #endif +BOOL disable_ipv6 = FALSE; BOOL disable_logging = FALSE; #ifdef EXPERIMENTAL_DOMAINKEYS @@ -567,6 +582,7 @@ uschar *helo_allow_chars = US""; uschar *helo_lookup_domains = US"@ : @[]"; 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"; uschar *hold_domains = NULL; @@ -633,6 +649,7 @@ independently. This separation became necessary when the number of log selectors was getting close to filling a 32-bit word. */ bit_table log_options[] = { + { US"acl_warn_skipped", LX_acl_warn_skipped }, { US"address_rewrite", L_address_rewrite }, { US"all", L_all }, { US"all_parents", L_all_parents }, @@ -669,7 +686,8 @@ bit_table log_options[] = { { US"subject", LX_subject }, { US"tls_certificate_verified", LX_tls_certificate_verified }, { US"tls_cipher", LX_tls_cipher }, - { US"tls_peerdn", LX_tls_peerdn } + { US"tls_peerdn", LX_tls_peerdn }, + { US"unknown_in_list", LX_unknown_in_list } }; int log_options_count = sizeof(log_options)/sizeof(bit_table); @@ -756,6 +774,10 @@ BOOL print_topbitchars = FALSE; uschar process_info[PROCESS_INFO_SIZE]; uschar *process_log_path = NULL; BOOL prod_requires_admin = TRUE; +uschar *prvscheck_address = NULL; +uschar *prvscheck_keynum = NULL; +uschar *prvscheck_result = NULL; + uschar *qualify_domain_recipient = NULL; uschar *qualify_domain_sender = NULL; @@ -780,6 +802,7 @@ BOOL queue_smtp = FALSE; uschar *queue_smtp_domains = NULL; unsigned int random_seed = 0; +tree_node *ratelimiters_cmd = NULL; tree_node *ratelimiters_conn = NULL; tree_node *ratelimiters_mail = NULL; uschar *raw_active_hostname = NULL; @@ -814,7 +837,8 @@ uschar *received_header_text = US "${if def:tls_cipher {($tls_cipher)\n\t}}" #endif "(Exim $version_number)\n\t" - "id $message_id" + "${if def:sender_address {(envelope-from <$sender_address>)\n\t}}" + "id $message_exim_id" "${if def:received_for {\n\tfor $received_for}}" "\0<---------------Space to patch received_header_text->"; @@ -833,6 +857,7 @@ BOOL recipients_max_reject = FALSE; const pcre *regex_AUTH = NULL; const pcre *regex_check_dns_names = NULL; const pcre *regex_From = NULL; +const pcre *regex_IGNOREQUOTA = NULL; const pcre *regex_PIPELINING = NULL; const pcre *regex_SIZE = NULL; const pcre *regex_ismsgid = NULL; @@ -969,6 +994,7 @@ BOOL sender_host_notsocket = FALSE; BOOL sender_host_unknown = FALSE; uschar *sender_ident = NULL; BOOL sender_local = FALSE; +BOOL sender_name_forced = FALSE; uschar *sender_rate = NULL; uschar *sender_rate_limit = NULL; uschar *sender_rate_period = NULL; @@ -999,7 +1025,8 @@ uschar *smtp_banner = US"$smtp_active_hostname ESMTP " "\0<---------------Space to patch smtp_banner->"; BOOL smtp_batched_input = FALSE; BOOL smtp_check_spool_space = TRUE; -uschar *smtp_command_argument = NULL; +uschar *smtp_cmd_argument = NULL; +uschar *smtp_cmd_buffer = NULL; int smtp_connect_backlog = 20; double smtp_delay_mail = 0.0; double smtp_delay_rcpt = 0.0; @@ -1068,6 +1095,8 @@ BOOL strip_excess_angle_brackets = FALSE; BOOL strip_trailing_dot = FALSE; uschar *submission_domain = NULL; BOOL submission_mode = FALSE; +uschar *submission_name = NULL; +BOOL suppress_local_fixups = FALSE; BOOL synchronous_delivery = FALSE; BOOL syslog_duplication = TRUE; int syslog_facility = LOG_MAIL;