X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/16ff981e58427ae8bd5e8420411a9978678841e4..d677b2f22abb3eb268e5cb15e4710ff5063049fe:/src/src/globals.c diff --git a/src/src/globals.c b/src/src/globals.c index 35cac0f6f..f12e8eb34 100644 --- a/src/src/globals.c +++ b/src/src/globals.c @@ -1,10 +1,10 @@ -/* $Cambridge: exim/src/src/globals.c,v 1.60 2006/10/16 15:44:36 ph10 Exp $ */ +/* $Cambridge: exim/src/src/globals.c,v 1.75 2007/06/22 14:38:58 ph10 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,6 +32,8 @@ 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, @@ -109,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; @@ -133,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 @@ -323,6 +329,7 @@ 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 */ @@ -496,6 +503,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; @@ -512,6 +524,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; @@ -519,6 +532,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; @@ -544,7 +558,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]; @@ -623,6 +640,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; @@ -662,6 +680,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 }, @@ -680,6 +700,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 }, @@ -696,6 +717,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 }, @@ -721,6 +743,7 @@ 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; @@ -783,6 +806,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; @@ -1023,6 +1047,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; @@ -1042,8 +1068,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;