X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/71fafd9530395ba813bf8669340517a12700c769..f7572e5a358cd3d9581140b87e590d58b6c278f0:/src/src/globals.c diff --git a/src/src/globals.c b/src/src/globals.c index b9f5667e2..c46199da6 100644 --- a/src/src/globals.c +++ b/src/src/globals.c @@ -1,10 +1,10 @@ -/* $Cambridge: exim/src/src/globals.c,v 1.53 2006/03/06 16:05:12 ph10 Exp $ */ +/* $Cambridge: exim/src/src/globals.c,v 1.79 2007/09/28 12:21:57 tom Exp $ */ /************************************************* * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2006 */ +/* Copyright (c) University of Cambridge 1995 - 2007 */ /* See the file NOTICE for conditions of use and distribution. */ /* All the global variables are defined together in this one module, so @@ -32,12 +32,16 @@ static void dummy(int x) { dummy(x-1); } data blocks and hence have the opt_public flag set. */ optionlist optionlist_auths[] = { + { "client_condition", opt_stringptr | opt_public, + (void *)(offsetof(auth_instance, client_condition)) }, { "driver", opt_stringptr | opt_public, (void *)(offsetof(auth_instance, driver_name)) }, { "public_name", opt_stringptr | opt_public, (void *)(offsetof(auth_instance, public_name)) }, { "server_advertise_condition", opt_stringptr | opt_public, (void *)(offsetof(auth_instance, advertise_condition))}, + { "server_condition", opt_stringptr | opt_public, + (void *)(offsetof(auth_instance, server_condition)) }, { "server_debug_print", opt_stringptr | opt_public, (void *)(offsetof(auth_instance, server_debug_string)) }, { "server_mail_auth_condition", opt_stringptr | opt_public, @@ -107,6 +111,9 @@ uschar *tls_on_connect_ports = NULL; uschar *tls_peerdn = NULL; #ifdef SUPPORT_TLS +uschar *gnutls_require_mac = NULL; +uschar *gnutls_require_kx = NULL; +uschar *gnutls_require_proto = NULL; const pcre *regex_STARTTLS = NULL; uschar *tls_advertise_hosts = NULL; /* This is deliberate */ uschar *tls_certificate = NULL; @@ -131,6 +138,7 @@ int (*receive_getc)(void) = stdin_getc; int (*receive_ungetc)(int) = stdin_ungetc; int (*receive_feof)(void) = stdin_feof; int (*receive_ferror)(void) = stdin_ferror; +BOOL (*receive_smtp_buffered)(void) = NULL; /* Only used for SMTP */ #endif @@ -164,10 +172,13 @@ int address_expansions_count = sizeof(address_expansions)/sizeof(uschar **); header_line *acl_added_headers = NULL; tree_node *acl_anchor = NULL; + uschar *acl_not_smtp = NULL; #ifdef WITH_CONTENT_SCAN uschar *acl_not_smtp_mime = NULL; #endif +uschar *acl_not_smtp_start = NULL; + uschar *acl_smtp_auth = NULL; uschar *acl_smtp_connect = NULL; uschar *acl_smtp_data = NULL; @@ -179,13 +190,16 @@ uschar *acl_smtp_mailauth = NULL; #ifdef WITH_CONTENT_SCAN uschar *acl_smtp_mime = NULL; #endif +uschar *acl_smtp_notquit = NULL; uschar *acl_smtp_predata = NULL; uschar *acl_smtp_quit = NULL; uschar *acl_smtp_rcpt = NULL; uschar *acl_smtp_starttls = NULL; uschar *acl_smtp_vrfy = NULL; + BOOL acl_temp_details = FALSE; -uschar *acl_var[ACL_CVARS + ACL_MVARS]; +tree_node *acl_var_c = NULL; +tree_node *acl_var_m = NULL; uschar *acl_verify_message = NULL; string_item *acl_warn_logged = NULL; @@ -204,26 +218,30 @@ uschar *acl_wherenames[] = { US"RCPT", US"EXPN", US"EHLO or HELO", US"MAILAUTH", + US"non-SMTP-start", + US"NOTQUIT", US"QUIT", US"STARTTLS", US"VRFY" }; -int acl_wherecodes[] = { 550, /* RCPT */ - 550, /* MAIL */ - 550, /* PREDATA */ - 550, /* MIME */ - 550, /* DATA */ - 0, /* not SMTP; not relevant */ - 503, /* AUTH */ - 550, /* connect */ - 458, /* ETRN */ - 550, /* EXPN */ - 550, /* HELO/EHLO */ - 0, /* MAILAUTH; not relevant */ - 0, /* QUIT; not relevant */ - 550, /* STARTTLS */ - 252 /* VRFY */ +uschar *acl_wherecodes[] = { US"550", /* RCPT */ + US"550", /* MAIL */ + US"550", /* PREDATA */ + US"550", /* MIME */ + US"550", /* DATA */ + US"0", /* not SMTP; not relevant */ + US"503", /* AUTH */ + US"550", /* connect */ + US"458", /* ETRN */ + US"550", /* EXPN */ + US"550", /* HELO/EHLO */ + US"0", /* MAILAUTH; not relevant */ + US"0", /* not SMTP; not relevant */ + US"0", /* NOTQUIT; not relevant */ + US"0", /* QUIT; not relevant */ + US"550", /* STARTTLS */ + US"252" /* VRFY */ }; BOOL active_local_from_check = FALSE; @@ -317,10 +335,12 @@ auth_instance auth_defaults = { NULL, /* private options block pointer */ NULL, /* driver_name */ NULL, /* advertise_condition */ + NULL, /* client_condition */ NULL, /* public_name */ NULL, /* set_id */ NULL, /* server_mail_auth_condition */ NULL, /* server_debug_string */ + NULL, /* server_condition */ FALSE, /* client */ FALSE, /* server */ FALSE /* advertised */ @@ -446,7 +466,12 @@ bit_table debug_options[] = { int debug_options_count = sizeof(debug_options)/sizeof(bit_table); unsigned int debug_selector = 0; int delay_warning[DELAY_WARNING_SIZE] = { DELAY_WARNING_SIZE, 1, 24*60*60 }; -uschar *delay_warning_condition= US"${if match{$h_precedence:}{(?i)bulk|list|junk}{no}{yes}}"; +uschar *delay_warning_condition= + US"${if or {" + "{ !eq{$h_list-id:$h_list-post:$h_list-subscribe:}{} }" + "{ match{$h_precedence:}{(?i)bulk|list|junk} }" + "{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }" + "} {no}{yes}}"; BOOL delivery_date_remove = TRUE; uschar *deliver_address_data = NULL; int deliver_datafile = -1; @@ -484,6 +509,11 @@ int demime_errorlevel = 0; int demime_ok = 0; uschar *demime_reason = NULL; #endif +BOOL disable_callout_flush = FALSE; +BOOL disable_delay_flush = FALSE; +#ifdef ENABLE_DISABLE_FSYNC +BOOL disable_fsync = FALSE; +#endif BOOL disable_ipv6 = FALSE; BOOL disable_logging = FALSE; @@ -493,6 +523,12 @@ uschar *dk_signing_selector = NULL; int dk_do_verify = 0; #endif +#ifdef EXPERIMENTAL_DKIM +uschar *dkim_signing_domain = NULL; +uschar *dkim_signing_selector = NULL; +int dkim_do_verify = 0; +#endif + uschar *dns_again_means_nonexist = NULL; int dns_csa_search_limit = 5; BOOL dns_csa_use_reverse = TRUE; @@ -500,6 +536,7 @@ uschar *dns_ipv4_lookup = NULL; int dns_retrans = 0; int dns_retry = 0; uschar *dnslist_domain = NULL; +uschar *dnslist_matched = NULL; uschar *dnslist_text = NULL; uschar *dnslist_value = NULL; tree_node *domainlist_anchor = NULL; @@ -507,6 +544,7 @@ int domainlist_count = 0; BOOL dont_deliver = FALSE; BOOL dot_ends = TRUE; BOOL drop_cr = FALSE; /* No longer used */ +uschar *dsn_from = US DEFAULT_DSN_FROM; BOOL enable_dollar_recipients = FALSE; BOOL envelope_to_remove = TRUE; @@ -532,7 +570,10 @@ BOOL extract_addresses_remove_arguments = TRUE; uschar *extra_local_interfaces = NULL; int fake_response = OK; -uschar *fake_response_text = US"Your message has been rejected but is being kept for evaluation.\nIf it was a legitimate message, it may still be delivered to the target recipient(s)."; +uschar *fake_response_text = US"Your message has been rejected but is " + "being kept for evaluation.\nIf it was a " + "legitimate message, it may still be " + "delivered to the target recipient(s)."; int filter_n[FILTER_VARIABLE_COUNT]; BOOL filter_running = FALSE; int filter_sn[FILTER_VARIABLE_COUNT]; @@ -611,6 +652,7 @@ uschar *ignore_fromline_hosts = NULL; uschar *interface_address = NULL; int interface_port = -1; BOOL is_inetd = FALSE; +uschar *iterate_item = NULL; int journal_fd = -1; @@ -650,6 +692,8 @@ 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. */ +/* Note that this list must be in alphabetical order. */ + bit_table log_options[] = { { US"acl_warn_skipped", LX_acl_warn_skipped }, { US"address_rewrite", L_address_rewrite }, @@ -668,6 +712,7 @@ bit_table log_options[] = { { US"incoming_port", LX_incoming_port }, { US"lost_incoming_connection", L_lost_incoming_connection }, { US"outgoing_port", LX_outgoing_port }, + { US"pid", LX_pid }, { US"queue_run", L_queue_run }, { US"queue_time", LX_queue_time }, { US"queue_time_overall", LX_queue_time_overall }, @@ -684,6 +729,7 @@ bit_table log_options[] = { { US"smtp_confirmation", LX_smtp_confirmation }, { US"smtp_connection", L_smtp_connection }, { US"smtp_incomplete_transaction", L_smtp_incomplete_transaction }, + { US"smtp_no_mail", LX_smtp_no_mail }, { US"smtp_protocol_error", L_smtp_protocol_error }, { US"smtp_syntax_error", L_smtp_syntax_error }, { US"subject", LX_subject }, @@ -694,11 +740,12 @@ bit_table log_options[] = { }; int log_options_count = sizeof(log_options)/sizeof(bit_table); -unsigned int log_write_selector= L_default; +int log_reject_target = 0; uschar *log_selector_string = NULL; FILE *log_stderr = NULL; BOOL log_testing_mode = FALSE; BOOL log_timezone = FALSE; +unsigned int log_write_selector= L_default; uschar *login_sender_address = NULL; int lookup_open_max = 25; uschar *lookup_value = NULL; @@ -708,10 +755,12 @@ uschar *mailstore_basename = NULL; #ifdef WITH_CONTENT_SCAN uschar *malware_name = NULL; /* Virus Name */ #endif +int max_received_linelength= 0; int max_username_length = 0; int message_age = 0; uschar *message_body = NULL; uschar *message_body_end = NULL; +BOOL message_body_newlines = FALSE; int message_body_size = 0; int message_body_visible = 500; int message_ended = END_NOTSTARTED; @@ -770,6 +819,7 @@ BOOL parse_found_group = FALSE; uschar *percent_hack_domains = NULL; uschar *pid_file_path = US PID_FILE_PATH "\0<--------------Space to patch pid_file_path->"; +BOOL pipelining_enable = TRUE; uschar *pipelining_advertise_hosts = US"*"; BOOL preserve_message_logs = FALSE; uschar *primary_hostname = NULL; @@ -791,6 +841,7 @@ BOOL queue_list_requires_admin = TRUE; BOOL queue_only = FALSE; uschar *queue_only_file = NULL; int queue_only_load = -1; +BOOL queue_only_load_latch = TRUE; BOOL queue_only_override = TRUE; BOOL queue_only_policy = FALSE; BOOL queue_run_first_delivery = FALSE; @@ -863,6 +914,7 @@ const pcre *regex_From = NULL; const pcre *regex_IGNOREQUOTA = NULL; const pcre *regex_PIPELINING = NULL; const pcre *regex_SIZE = NULL; +const pcre *regex_smtp_code = NULL; const pcre *regex_ismsgid = NULL; #ifdef WITH_CONTENT_SCAN uschar *regex_match_string = NULL; @@ -968,7 +1020,7 @@ script that sets up a copy of Exim for running in the test harness. It seems that compilers are now clever, and share constant strings if they can. Elsewhere in Exim the string "<" is used. The compiler optimization seems to make use of the end of this string in order to save space. So the patching then -wrecks this. We default this optimization by adding some additional characters +wrecks this. We defeat this optimization by adding some additional characters onto the end of the string. */ uschar *running_status = US">>>running<<<" "\0EXTRA"; @@ -1009,6 +1061,8 @@ address_item *sender_verified_list = NULL; address_item *sender_verified_failed = NULL; int sender_verified_rc = -1; BOOL sender_verified_responded = FALSE; +uschar *sending_ip_address = NULL; +int sending_port = -1; volatile BOOL sigalrm_seen = FALSE; uschar **sighup_argv = NULL; int smtp_accept_count = 0; @@ -1028,8 +1082,11 @@ 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; +int smtp_ch_index = 0; uschar *smtp_cmd_argument = NULL; uschar *smtp_cmd_buffer = NULL; +time_t smtp_connection_start = 0; +uschar smtp_connection_had[SMTP_HBUFF_SIZE]; int smtp_connect_backlog = 20; double smtp_delay_mail = 0.0; double smtp_delay_rcpt = 0.0; @@ -1043,6 +1100,7 @@ uschar *smtp_etrn_command = NULL; BOOL smtp_etrn_serialize = TRUE; int smtp_max_synprot_errors= 3; int smtp_max_unknown_commands = 3; +uschar *smtp_notquit_reason = NULL; uschar *smtp_ratelimit_hosts = NULL; uschar *smtp_ratelimit_mail = NULL; uschar *smtp_ratelimit_rcpt = NULL; @@ -1093,6 +1151,7 @@ uschar *srs_status = NULL; BOOL srs_usehash = TRUE; BOOL srs_usetimestamp = TRUE; #endif +BOOL strict_acl_vars = FALSE; int string_datestamp_offset= -1; BOOL strip_excess_angle_brackets = FALSE; BOOL strip_trailing_dot = FALSE; @@ -1119,6 +1178,7 @@ BOOL system_filter_uid_set = FALSE; BOOL system_filtering = FALSE; BOOL tcp_nodelay = TRUE; +int test_harness_load_avg = 0; int thismessage_size_limit = 0; int timeout_frozen_after = 0; BOOL timestamps_utc = FALSE;