X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/2fe1a124e7e7f496b39d9f348403dd5d5e69f01f..765b530f2cd79d66221ba9c3d33fe94040d6748c:/src/src/globals.c diff --git a/src/src/globals.c b/src/src/globals.c index b00b70dba..b9f5667e2 100644 --- a/src/src/globals.c +++ b/src/src/globals.c @@ -1,10 +1,10 @@ -/* $Cambridge: exim/src/src/globals.c,v 1.35 2005/09/07 10:15:33 ph10 Exp $ */ +/* $Cambridge: exim/src/src/globals.c,v 1.53 2006/03/06 16:05:12 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 @@ -162,6 +162,7 @@ int address_expansions_count = sizeof(address_expansions)/sizeof(uschar **); /* General global variables */ +header_line *acl_added_headers = NULL; tree_node *acl_anchor = NULL; uschar *acl_not_smtp = NULL; #ifdef WITH_CONTENT_SCAN @@ -184,9 +185,8 @@ 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; /* Names of SMTP places for use in ACL error messages, and corresponding SMTP @@ -299,6 +299,7 @@ tree_node *addresslist_anchor = NULL; int addresslist_count = 0; gid_t *admin_groups = NULL; BOOL admin_user = FALSE; +BOOL allow_auth_unadvertised= FALSE; BOOL allow_domain_literals = FALSE; BOOL allow_mx_to_ip = FALSE; BOOL allow_unqualified_recipient = TRUE; /* For local messages */ @@ -327,14 +328,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; @@ -363,9 +371,10 @@ int callout_cache_domain_negative_expire = 3*60*60; int callout_cache_positive_expire = 24*60*60; int callout_cache_negative_expire = 2*60*60; uschar *callout_random_local_part = US"$primary_hostname-$tod_epoch-testing"; -uschar *check_dns_names_pattern= US"(?i)^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$"; +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; @@ -475,6 +484,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 @@ -536,6 +546,7 @@ uschar *found_extension = NULL; #endif uid_t fixed_never_users[] = { FIXED_NEVER_USERS }; uschar *freeze_tell = NULL; +uschar *freeze_tell_config = NULL; uschar *fudged_queue_times = US""; uschar *gecos_name = NULL; @@ -640,6 +651,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 }, @@ -666,6 +678,7 @@ bit_table log_options[] = { { US"retry_defer", L_retry_defer }, { US"return_path_on_delivery", LX_return_path_on_delivery }, { US"sender_on_delivery", LX_sender_on_delivery }, + { US"sender_verify_fail", LX_sender_verify_fail }, { US"size_reject", L_size_reject }, { US"skip_delivery", L_skip_delivery }, { US"smtp_confirmation", LX_smtp_confirmation }, @@ -676,7 +689,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); @@ -826,6 +840,7 @@ uschar *received_header_text = US "${if def:tls_cipher {($tls_cipher)\n\t}}" #endif "(Exim $version_number)\n\t" + "${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->"; @@ -863,7 +878,7 @@ uschar *return_path = NULL; BOOL return_path_remove = TRUE; int rewrite_existflags = 0; uschar *rfc1413_hosts = US"*"; -int rfc1413_query_timeout = 30; +int rfc1413_query_timeout = 5; /* BOOL rfc821_domains = FALSE; <<< on the way out */ uid_t root_uid = ROOT_UID; @@ -1013,7 +1028,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; @@ -1083,6 +1099,7 @@ 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; @@ -1210,7 +1227,7 @@ uschar *warnmsg_delay = NULL; uschar *warnmsg_recipients = NULL; BOOL write_rejectlog = TRUE; -uschar *version_copyright = US"Copyright (c) University of Cambridge 2005"; +uschar *version_copyright = US"Copyright (c) University of Cambridge 2006"; uschar *version_date = US"?"; uschar *version_cnumber = US"????"; uschar *version_string = US"?";