git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update all copyright messages to cover 1995 - 2009. Remove tab from exim_checkaccess.src
[exim.git]
/
src
/
src
/
globals.c
diff --git
a/src/src/globals.c
b/src/src/globals.c
index c46199da66cc5ccf02cadc52833068fd27d4f34d..3e1e76cff96b14cfa88fae669b7775144f41c97d 100644
(file)
--- a/
src/src/globals.c
+++ b/
src/src/globals.c
@@
-1,10
+1,10
@@
-/* $Cambridge: exim/src/src/globals.c,v 1.
79 2007/09/28 12:21:57 tom
Exp $ */
+/* $Cambridge: exim/src/src/globals.c,v 1.
86 2009/11/16 19:50:37 nm4
Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 200
7
*/
+/* Copyright (c) University of Cambridge 1995 - 200
9
*/
/* See the file NOTICE for conditions of use and distribution. */
/* All the global variables are defined together in this one module, so
/* See the file NOTICE for conditions of use and distribution. */
/* All the global variables are defined together in this one module, so
@@
-111,6
+111,7
@@
uschar *tls_on_connect_ports = NULL;
uschar *tls_peerdn = NULL;
#ifdef SUPPORT_TLS
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 *gnutls_require_mac = NULL;
uschar *gnutls_require_kx = NULL;
uschar *gnutls_require_proto = NULL;
@@
-182,6
+183,9
@@
uschar *acl_not_smtp_start = NULL;
uschar *acl_smtp_auth = NULL;
uschar *acl_smtp_connect = NULL;
uschar *acl_smtp_data = 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;
uschar *acl_smtp_etrn = NULL;
uschar *acl_smtp_expn = NULL;
uschar *acl_smtp_helo = NULL;
@@
-210,6
+214,7
@@
uschar *acl_wherenames[] = { US"RCPT",
US"MAIL",
US"PREDATA",
US"MIME",
US"MAIL",
US"PREDATA",
US"MIME",
+ US"DKIM",
US"DATA",
US"non-SMTP",
US"AUTH",
US"DATA",
US"non-SMTP",
US"AUTH",
@@
-229,6
+234,7
@@
uschar *acl_wherecodes[] = { US"550", /* RCPT */
US"550", /* MAIL */
US"550", /* PREDATA */
US"550", /* MIME */
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", /* DATA */
US"0", /* not SMTP; not relevant */
US"503", /* AUTH */
@@
-391,7
+397,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";
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_log_inodes = 0;
int check_log_space = 0;
BOOL check_rfc2047_length = TRUE;
@@
-427,6
+433,15
@@
BOOL daemon_listen = FALSE;
uschar *daemon_smtp_port = US"smtp";
int daemon_startup_retries = 9;
int daemon_startup_sleep = 30;
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;
BOOL debug_daemon = FALSE;
int debug_fd = -1;
FILE *debug_file = NULL;
@@
-517,16
+532,14
@@
BOOL disable_fsync = FALSE;
BOOL disable_ipv6 = FALSE;
BOOL disable_logging = 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;
-#endif
-
-#ifdef EXPERIMENTAL_DKIM
+#ifndef DISABLE_DKIM
+uschar *dkim_cur_signer = NULL;
+uschar *dkim_signers = NULL;
uschar *dkim_signing_domain = NULL;
uschar *dkim_signing_selector = NULL;
uschar *dkim_signing_domain = NULL;
uschar *dkim_signing_selector = NULL;
-int dkim_do_verify = 0;
+uschar *dkim_verify_signers = US"$dkim_signers";
+BOOL dkim_collect_input = FALSE;
+BOOL dkim_disable_verify = FALSE;
#endif
uschar *dns_again_means_nonexist = NULL;
#endif
uschar *dns_again_means_nonexist = NULL;
@@
-1127,6
+1140,7
@@
uschar *spam_score = NULL;
uschar *spam_score_int = NULL;
#endif
#ifdef EXPERIMENTAL_SPF
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;
uschar *spf_header_comment = NULL;
uschar *spf_received = NULL;
uschar *spf_result = NULL;
@@
-1287,7
+1301,7
@@
uschar *warnmsg_delay = NULL;
uschar *warnmsg_recipients = NULL;
BOOL write_rejectlog = TRUE;
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"?";
uschar *version_date = US"?";
uschar *version_cnumber = US"????";
uschar *version_string = US"?";