X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/8523533c08c018ac4b750b0e0fab6cfe611e8a49..6a8de8541c16d12eceab2c6610cd209e7641217a:/src/src/globals.c diff --git a/src/src/globals.c b/src/src/globals.c index be70d489d..b4e24485c 100644 --- a/src/src/globals.c +++ b/src/src/globals.c @@ -1,10 +1,10 @@ -/* $Cambridge: exim/src/src/globals.c,v 1.9 2004/12/16 15:11:47 tom Exp $ */ +/* $Cambridge: exim/src/src/globals.c,v 1.87 2010/06/05 09:10:10 pdp Exp $ */ /************************************************* * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2004 */ +/* Copyright (c) University of Cambridge 1995 - 2009 */ /* 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, @@ -62,6 +66,10 @@ BOOL opt_perl_at_start = FALSE; BOOL opt_perl_started = FALSE; #endif +#ifdef EXPAND_DLFUNC +tree_node *dlobj_anchor = NULL; +#endif + #ifdef LOOKUP_IBASE uschar *ibase_servers = NULL; #endif @@ -83,6 +91,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 @@ -99,6 +111,11 @@ uschar *tls_on_connect_ports = NULL; uschar *tls_peerdn = NULL; #ifdef SUPPORT_TLS +BOOL gnutls_compat_mode = FALSE; +uschar *gnutls_require_mac = NULL; +uschar *gnutls_require_kx = NULL; +uschar *gnutls_require_proto = NULL; +uschar *openssl_options = NULL; const pcre *regex_STARTTLS = NULL; uschar *tls_advertise_hosts = NULL; /* This is deliberate */ uschar *tls_certificate = NULL; @@ -123,6 +140,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 @@ -154,11 +172,21 @@ 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 +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; +#ifndef DISABLE_DKIM +uschar *acl_smtp_dkim = NULL; +#endif uschar *acl_smtp_etrn = NULL; uschar *acl_smtp_expn = NULL; uschar *acl_smtp_helo = NULL; @@ -167,15 +195,17 @@ 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_C_MAX+ACL_M_MAX]; +tree_node *acl_var_c = NULL; +tree_node *acl_var_m = NULL; 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 @@ -184,9 +214,8 @@ error codes - keep in step with definitions of ACL_WHERE_xxxx in macros.h. */ uschar *acl_wherenames[] = { US"RCPT", US"MAIL", US"PREDATA", -#ifdef WITH_CONTENT_SCAN US"MIME", -#endif + US"DKIM", US"DATA", US"non-SMTP", US"AUTH", @@ -195,30 +224,33 @@ 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 */ -#ifdef WITH_CONTENT_SCAN - 550, /* MIME */ -#endif - 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", /* DKIM */ + 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; BOOL active_local_sender_retain = FALSE; BOOL accept_8bitmime = FALSE; @@ -279,6 +311,9 @@ address_item address_defaults = { NULL, /* errors_address */ NULL, /* extra_headers */ NULL, /* remove_headers */ +#ifdef EXPERIMENTAL_SRS + NULL, /* srs_sender */ +#endif } }; @@ -289,6 +324,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 */ @@ -306,10 +342,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 */ @@ -317,14 +355,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; @@ -353,9 +398,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; @@ -382,8 +428,21 @@ BOOL continue_more = FALSE; int continue_sequence = 1; uschar *continue_transport = NULL; +uschar *csa_status = NULL; + BOOL daemon_listen = FALSE; uschar *daemon_smtp_port = US"smtp"; +int daemon_startup_retries = 9; +int daemon_startup_sleep = 30; + +#ifdef EXPERIMENTAL_DCC +BOOL dcc_direct_add_header = FALSE; +uschar *dcc_header = NULL; +uschar *dcc_result = NULL; +uschar *dccifd_address = US"/usr/local/dcc/var/dccifd"; +uschar *dccifd_options = US"header"; +#endif + BOOL debug_daemon = FALSE; int debug_fd = -1; FILE *debug_file = NULL; @@ -423,7 +482,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; @@ -461,13 +525,32 @@ 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; +#ifndef DISABLE_DKIM +uschar *dkim_cur_signer = NULL; +uschar *dkim_signers = NULL; +uschar *dkim_signing_domain = NULL; +uschar *dkim_signing_selector = NULL; +uschar *dkim_verify_signers = US"$dkim_signers"; +BOOL dkim_collect_input = FALSE; +BOOL dkim_disable_verify = FALSE; +#endif + uschar *dns_again_means_nonexist = NULL; +int dns_csa_search_limit = 5; +BOOL dns_csa_use_reverse = TRUE; 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; @@ -475,6 +558,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; @@ -499,10 +583,11 @@ uschar *expand_string_message; BOOL extract_addresses_remove_arguments = TRUE; uschar *extra_local_interfaces = NULL; -#ifdef WITH_CONTENT_SCAN -BOOL fake_reject = FALSE; -uschar *fake_reject_text = US"Your message has been rejected but is being kept for evaluation.\nIf it was a legit message, it may still be delivered to the target recipient(s)."; -#endif +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)."; int filter_n[FILTER_VARIABLE_COUNT]; BOOL filter_running = FALSE; int filter_sn[FILTER_VARIABLE_COUNT]; @@ -516,6 +601,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; @@ -553,6 +639,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; @@ -561,6 +648,7 @@ BOOL host_checking_callout = FALSE; uschar *host_data = NULL; BOOL host_find_failed_syntax= FALSE; uschar *host_lookup = NULL; +BOOL host_lookup_deferred = FALSE; BOOL host_lookup_failed = FALSE; uschar *host_lookup_order = US"bydns:byaddr"; uschar *host_lookup_msg = US""; @@ -578,6 +666,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; @@ -617,7 +706,10 @@ 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 }, { US"all", L_all }, { US"all_parents", L_all_parents }, @@ -634,6 +726,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 }, @@ -644,25 +737,29 @@ 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 }, { 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 }, { 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); -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; @@ -672,10 +769,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; @@ -695,7 +794,7 @@ uschar *message_reference = NULL; /* MIME ACL expandables */ #ifdef WITH_CONTENT_SCAN -int mime_anomaly_level = NULL; +int mime_anomaly_level = 0; uschar *mime_anomaly_text = NULL; uschar *mime_boundary = NULL; uschar *mime_charset = NULL; @@ -734,6 +833,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; @@ -741,6 +841,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; @@ -751,6 +855,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; @@ -765,6 +870,9 @@ 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; uschar *raw_sender = NULL; uschar **raw_recipients = NULL; @@ -789,7 +897,7 @@ date will be automatically added on the end. */ uschar *received_header_text = US "Received: " "${if def:sender_rcvhost {from $sender_rcvhost\n\t}" - "{${if def:sender_ident {from $sender_ident }}" + "{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}" "${if def:sender_helo_name {(helo=$sender_helo_name)\n\t}}}}" "by $primary_hostname " "${if def:received_protocol {with $received_protocol}} " @@ -797,7 +905,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->"; @@ -816,8 +925,10 @@ 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_smtp_code = NULL; const pcre *regex_ismsgid = NULL; #ifdef WITH_CONTENT_SCAN uschar *regex_match_string = NULL; @@ -833,7 +944,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; @@ -848,7 +959,7 @@ router_instance router_defaults = { NULL, /* address_data */ #ifdef EXPERIMENTAL_BRIGHTMAIL NULL, /* bmi_rule */ -#endif +#endif NULL, /* cannot_route_message */ NULL, /* condition */ NULL, /* current_directory */ @@ -923,7 +1034,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"; @@ -952,6 +1063,10 @@ 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; uschar *sender_rcvhost = NULL; BOOL sender_set_untrusted = FALSE; uschar *sender_unqualified_hosts = NULL; @@ -960,6 +1075,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; @@ -974,12 +1091,16 @@ int smtp_accept_queue_per_connection = 10; int smtp_accept_reserve = 0; uschar *smtp_active_hostname = NULL; BOOL smtp_authenticated = FALSE; -uschar *smtp_banner = US"$primary_hostname ESMTP " +uschar *smtp_banner = US"$smtp_active_hostname ESMTP " "Exim $version_number $tod_full" "\0<---------------Space to patch smtp_banner->"; BOOL smtp_batched_input = FALSE; BOOL smtp_check_spool_space = TRUE; -uschar *smtp_command_argument = NULL; +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; @@ -993,6 +1114,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; @@ -1019,6 +1141,7 @@ uschar *spam_score = NULL; uschar *spam_score_int = NULL; #endif #ifdef EXPERIMENTAL_SPF +uschar *spf_guess = US"v=spf1 a/24 mx/24 ptr ?all"; uschar *spf_header_comment = NULL; uschar *spf_received = NULL; uschar *spf_result = NULL; @@ -1032,16 +1155,25 @@ uschar *spool_directory = US SPOOL_DIRECTORY uschar *srs_config = NULL; uschar *srs_db_address = NULL; uschar *srs_db_key = NULL; +int srs_hashlength = 6; +int srs_hashmin = -1; +int srs_maxage = 31; uschar *srs_orig_recipient = NULL; uschar *srs_orig_sender = NULL; uschar *srs_recipient = NULL; +uschar *srs_secrets = NULL; uschar *srs_status = NULL; -#endif +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; 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; @@ -1061,6 +1193,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; @@ -1122,6 +1255,7 @@ transport_instance transport_defaults = { int transport_count; uschar **transport_filter_argv = NULL; int transport_filter_timeout; +BOOL transport_filter_timed_out = FALSE; int transport_write_timeout= 0; tree_node *tree_dns_fails = NULL; @@ -1168,7 +1302,7 @@ uschar *warnmsg_delay = NULL; uschar *warnmsg_recipients = NULL; BOOL write_rejectlog = TRUE; -uschar *version_copyright = US"Copyright (c) University of Cambridge 2004"; +uschar *version_copyright = US"Copyright (c) University of Cambridge, 1995 - 2007"; uschar *version_date = US"?"; uschar *version_cnumber = US"????"; uschar *version_string = US"?";