X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/8669f003e82e39e578787d9ebc1b40f36c024332..c1d94452b1b7f3620ee3cc9aa197ad98821de79f:/src/src/globals.c diff --git a/src/src/globals.c b/src/src/globals.c index 4a75aed7c..9b77d876b 100644 --- a/src/src/globals.c +++ b/src/src/globals.c @@ -1,10 +1,10 @@ -/* $Cambridge: exim/src/src/globals.c,v 1.76 2007/06/27 11:01:52 ph10 Exp $ */ +/* $Cambridge: exim/src/src/globals.c,v 1.88 2010/06/12 15:21:26 jetmore Exp $ */ /************************************************* * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2007 */ +/* 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 @@ -111,9 +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; @@ -172,14 +174,19 @@ 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; +#ifndef DISABLE_DKIM +uschar *acl_smtp_dkim = NULL; +#endif uschar *acl_smtp_etrn = NULL; uschar *acl_smtp_expn = NULL; uschar *acl_smtp_helo = NULL; @@ -188,11 +195,13 @@ 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; tree_node *acl_var_c = NULL; tree_node *acl_var_m = NULL; @@ -206,6 +215,7 @@ uschar *acl_wherenames[] = { US"RCPT", US"MAIL", US"PREDATA", US"MIME", + US"DKIM", US"DATA", US"non-SMTP", US"AUTH", @@ -215,6 +225,7 @@ uschar *acl_wherenames[] = { US"RCPT", US"EHLO or HELO", US"MAILAUTH", US"non-SMTP-start", + US"NOTQUIT", US"QUIT", US"STARTTLS", US"VRFY" @@ -224,6 +235,7 @@ 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 */ @@ -233,6 +245,7 @@ uschar *acl_wherecodes[] = { US"550", /* RCPT */ 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 */ @@ -385,7 +398,7 @@ 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; @@ -421,6 +434,15 @@ 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; @@ -511,10 +533,14 @@ BOOL disable_fsync = FALSE; BOOL disable_ipv6 = FALSE; BOOL disable_logging = FALSE; -#ifdef EXPERIMENTAL_DOMAINKEYS -uschar *dk_signing_domain = NULL; -uschar *dk_signing_selector = NULL; -int dk_do_verify = 0; +#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; @@ -748,6 +774,7 @@ 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; @@ -919,6 +946,7 @@ int rewrite_existflags = 0; uschar *rfc1413_hosts = US"*"; int rfc1413_query_timeout = 5; /* BOOL rfc821_domains = FALSE; <<< on the way out */ +uid_t root_gid = ROOT_GID; uid_t root_uid = ROOT_UID; router_instance *routers = NULL; @@ -1087,6 +1115,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; @@ -1113,6 +1142,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; @@ -1164,6 +1194,9 @@ BOOL system_filter_uid_set = FALSE; BOOL system_filtering = FALSE; BOOL tcp_nodelay = TRUE; +#ifdef USE_TCP_WRAPPERS +uschar *tcp_wrappers_daemon_name = US TCP_WRAPPERS_DAEMON_NAME; +#endif int test_harness_load_avg = 0; int thismessage_size_limit = 0; int timeout_frozen_after = 0; @@ -1273,7 +1306,7 @@ uschar *warnmsg_delay = NULL; uschar *warnmsg_recipients = NULL; BOOL write_rejectlog = TRUE; -uschar *version_copyright = US"Copyright (c) University of Cambridge 2006"; +uschar *version_copyright = US"Copyright (c) University of Cambridge, 1995 - 2007"; uschar *version_date = US"?"; uschar *version_cnumber = US"????"; uschar *version_string = US"?";