X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/35edf2ff67ad9fa5fc0e83bde865d807c297864f..8e669ac162fe3b1040297f1d021de10778dce9d9:/src/src/globals.c diff --git a/src/src/globals.c b/src/src/globals.c index a206d4232..497fe3d8e 100644 --- a/src/src/globals.c +++ b/src/src/globals.c @@ -1,10 +1,10 @@ -/* $Cambridge: exim/src/src/globals.c,v 1.2 2004/10/18 09:16:57 ph10 Exp $ */ +/* $Cambridge: exim/src/src/globals.c,v 1.17 2005/02/17 11:58:26 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2004 */ +/* Copyright (c) University of Cambridge 1995 - 2005 */ /* See the file NOTICE for conditions of use and distribution. */ /* All the global variables are defined together in this one module, so @@ -164,6 +164,9 @@ uschar *acl_smtp_expn = NULL; uschar *acl_smtp_helo = NULL; uschar *acl_smtp_mail = NULL; uschar *acl_smtp_mailauth = NULL; +#ifdef WITH_CONTENT_SCAN +uschar *acl_smtp_mime = NULL; +#endif uschar *acl_smtp_predata = NULL; uschar *acl_smtp_quit = NULL; uschar *acl_smtp_rcpt = NULL; @@ -181,6 +184,9 @@ 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"DATA", US"non-SMTP", US"AUTH", @@ -197,6 +203,9 @@ uschar *acl_wherenames[] = { US"RCPT", 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 */ @@ -210,6 +219,8 @@ int acl_wherecodes[] = { 550, /* RCPT */ 252 /* VRFY */ }; +BOOL active_local_from_check = FALSE; +BOOL active_local_sender_retain = FALSE; BOOL accept_8bitmime = FALSE; address_item *addr_duplicate = NULL; @@ -307,6 +318,9 @@ auth_instance auth_defaults = { uschar *auth_defer_msg = US"reason not recorded"; uschar *auth_defer_user_msg = US""; int auto_thaw = 0; +#ifdef WITH_CONTENT_SCAN +uschar *av_scanner = US"sophie:/var/run/sophie"; /* AV scanner */ +#endif BOOL background_daemon = TRUE; uschar *base62_chars= @@ -314,6 +328,15 @@ uschar *base62_chars= uschar *bi_command = NULL; uschar *big_buffer = NULL; int big_buffer_size = BIG_BUFFER_SIZE; +#ifdef EXPERIMENTAL_BRIGHTMAIL +uschar *bmi_alt_location = NULL; +uschar *bmi_base64_tracker_verdict = NULL; +uschar *bmi_base64_verdict = NULL; +uschar *bmi_config_file = US"/opt/brightmail/etc/brightmail.cfg"; +int bmi_deliver = 1; +int bmi_run = 0; +uschar *bmi_verdicts = NULL; +#endif int body_linecount = 0; int body_zerocount = 0; uschar *bounce_message_file = NULL; @@ -361,6 +384,7 @@ uschar *continue_transport = NULL; BOOL daemon_listen = FALSE; uschar *daemon_smtp_port = US"smtp"; +BOOL debug_daemon = FALSE; int debug_fd = -1; FILE *debug_file = NULL; bit_table debug_options[] = { @@ -432,6 +456,11 @@ uschar *deliver_selectstring = NULL; BOOL deliver_selectstring_regex = FALSE; uschar *deliver_selectstring_sender = NULL; BOOL deliver_selectstring_sender_regex = FALSE; +#ifdef WITH_OLD_DEMIME +int demime_errorlevel = 0; +int demime_ok = 0; +uschar *demime_reason = NULL; +#endif BOOL disable_logging = FALSE; uschar *dns_again_means_nonexist = NULL; @@ -470,12 +499,19 @@ uschar *expand_string_message; BOOL extract_addresses_remove_arguments = TRUE; uschar *extra_local_interfaces = NULL; +BOOL fake_reject = FALSE; +uschar *fake_reject_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]; -uschar *filter_test = NULL; +int filter_test = FTEST_NONE; +uschar *filter_test_sfile = NULL; +uschar *filter_test_ufile = NULL; uschar *filter_thisaddress = NULL; int finduser_retries = 0; +#ifdef WITH_OLD_DEMIME +uschar *found_extension = NULL; +#endif uid_t fixed_never_users[] = { FIXED_NEVER_USERS }; uschar *freeze_tell = NULL; uschar *fudged_queue_times = US""; @@ -523,6 +559,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""; @@ -598,6 +635,7 @@ bit_table log_options[] = { { US"outgoing_port", LX_outgoing_port }, { US"queue_run", L_queue_run }, { US"queue_time", LX_queue_time }, + { US"queue_time_overall", LX_queue_time_overall }, { US"received_recipients", LX_received_recipients }, { US"received_sender", LX_received_sender }, { US"rejected_header", LX_rejected_header }, @@ -630,6 +668,9 @@ uschar *lookup_value = NULL; macro_item *macros = NULL; uschar *mailstore_basename = NULL; +#ifdef WITH_CONTENT_SCAN +uschar *malware_name = NULL; /* Virus Name */ +#endif int max_username_length = 0; int message_age = 0; uschar *message_body = NULL; @@ -650,9 +691,33 @@ int message_size = 0; uschar *message_size_limit = US"50M"; uschar message_subdir[2] = { 0, 0 }; uschar *message_reference = NULL; + +/* MIME ACL expandables */ +#ifdef WITH_CONTENT_SCAN +int mime_anomaly_level = 0; +uschar *mime_anomaly_text = NULL; +uschar *mime_boundary = NULL; +uschar *mime_charset = NULL; +uschar *mime_content_description = NULL; +uschar *mime_content_disposition = NULL; +uschar *mime_content_id = NULL; +unsigned int mime_content_size = 0; +uschar *mime_content_transfer_encoding = NULL; +uschar *mime_content_type = NULL; +uschar *mime_decoded_filename = NULL; +uschar *mime_filename = NULL; +int mime_is_multipart = 0; +int mime_is_coverletter = 0; +int mime_is_rfc822 = 0; +int mime_part_count = -1; +#endif + BOOL mua_wrapper = FALSE; uid_t *never_users = NULL; +#ifdef WITH_CONTENT_SCAN +BOOL no_mbox_unspool = FALSE; +#endif BOOL no_multiline_responses = FALSE; uid_t original_euid; @@ -723,7 +788,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}} " @@ -740,6 +805,7 @@ uschar *received_protocol = NULL; int received_time = 0; uschar *recipient_data = NULL; uschar *recipient_unqualified_hosts = NULL; +uschar *recipient_verify_failure = NULL; int recipients_count = 0; BOOL recipients_discarded = FALSE; recipient_item *recipients_list = NULL; @@ -752,6 +818,9 @@ const pcre *regex_From = NULL; const pcre *regex_PIPELINING = NULL; const pcre *regex_SIZE = NULL; const pcre *regex_ismsgid = NULL; +#ifdef WITH_CONTENT_SCAN +uschar *regex_match_string = NULL; +#endif int remote_delivery_count = 0; int remote_max_parallel = 2; uschar *remote_sort_domains = NULL; @@ -776,6 +845,9 @@ router_instance router_defaults = { NULL, /* driver name */ NULL, /* address_data */ +#ifdef EXPERIMENTAL_BRIGHTMAIL + NULL, /* bmi_rule */ +#endif NULL, /* cannot_route_message */ NULL, /* condition */ NULL, /* current_directory */ @@ -804,6 +876,11 @@ router_instance router_defaults = { NULL, /* transport_name */ TRUE, /* address_test */ +#ifdef EXPERIMENTAL_BRIGHTMAIL + FALSE, /* bmi_deliver_alternate */ + FALSE, /* bmi_deliver_default */ + FALSE, /* bmi_dont_deliver */ +#endif TRUE, /* expn */ FALSE, /* caseful_local_part */ FALSE, /* check_local_user */ @@ -857,6 +934,7 @@ BOOL search_find_defer = FALSE; uschar *self_hostname = NULL; uschar *sender_address = NULL; unsigned int sender_address_cache[(MAX_NAMED_LIST * 2)/32]; +uschar *sender_address_data = NULL; BOOL sender_address_forced = FALSE; uschar *sender_address_unrewritten = NULL; uschar *sender_data = NULL; @@ -876,6 +954,7 @@ BOOL sender_local = FALSE; uschar *sender_rcvhost = NULL; BOOL sender_set_untrusted = FALSE; uschar *sender_unqualified_hosts = NULL; +uschar *sender_verify_failure = NULL; address_item *sender_verified_list = NULL; address_item *sender_verified_failed = NULL; int sender_verified_rc = -1; @@ -894,7 +973,7 @@ 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; @@ -930,9 +1009,33 @@ int smtp_rlr_limit = 0; int smtp_rlr_threshold = INT_MAX; BOOL smtp_use_pipelining = FALSE; BOOL smtp_use_size = FALSE; + +#ifdef WITH_CONTENT_SCAN +uschar *spamd_address = US"127.0.0.1 783"; +uschar *spam_bar = NULL; +uschar *spam_report = NULL; +uschar *spam_score = NULL; +uschar *spam_score_int = NULL; +#endif +#ifdef EXPERIMENTAL_SPF +uschar *spf_header_comment = NULL; +uschar *spf_received = NULL; +uschar *spf_result = NULL; +uschar *spf_smtp_comment = NULL; +#endif + BOOL split_spool_directory = FALSE; uschar *spool_directory = US SPOOL_DIRECTORY "\0<--------------Space to patch spool_directory->"; +#ifdef EXPERIMENTAL_SRS +uschar *srs_config = NULL; +uschar *srs_db_address = NULL; +uschar *srs_db_key = NULL; +uschar *srs_orig_recipient = NULL; +uschar *srs_orig_sender = NULL; +uschar *srs_recipient = NULL; +uschar *srs_status = NULL; +#endif int string_datestamp_offset= -1; BOOL strip_excess_angle_brackets = FALSE; BOOL strip_trailing_dot = FALSE;