git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The use of forbid_filter_existstest now also locks out ${stat:
[users/heiko/exim.git]
/
src
/
src
/
globals.c
diff --git
a/src/src/globals.c
b/src/src/globals.c
index 9ad36daf132c1abd47c4f15e374c8da4a72d9af8..ff27aee7126530e6e1beeaad2a97eb85a4b7a6b0 100644
(file)
--- a/
src/src/globals.c
+++ b/
src/src/globals.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/globals.c,v 1.
26 2005/05/23 16:58:56 fanf2
Exp $ */
+/* $Cambridge: exim/src/src/globals.c,v 1.
31 2005/08/01 14:00:35 ph10
Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-282,6
+282,9
@@
address_item address_defaults = {
NULL, /* errors_address */
NULL, /* extra_headers */
NULL, /* remove_headers */
NULL, /* errors_address */
NULL, /* extra_headers */
NULL, /* remove_headers */
+#ifdef EXPERIMENTAL_SRS
+ NULL, /* srs_sender */
+#endif
}
};
}
};
@@
-389,6
+392,8
@@
uschar *csa_status = NULL;
BOOL daemon_listen = FALSE;
uschar *daemon_smtp_port = US"smtp";
BOOL daemon_listen = FALSE;
uschar *daemon_smtp_port = US"smtp";
+int daemon_startup_retries = 9;
+int daemon_startup_sleep = 30;
BOOL debug_daemon = FALSE;
int debug_fd = -1;
FILE *debug_file = NULL;
BOOL debug_daemon = FALSE;
int debug_fd = -1;
FILE *debug_file = NULL;
@@
-753,6
+758,10
@@
BOOL print_topbitchars = FALSE;
uschar process_info[PROCESS_INFO_SIZE];
uschar *process_log_path = NULL;
BOOL prod_requires_admin = TRUE;
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;
uschar *qualify_domain_recipient = NULL;
uschar *qualify_domain_sender = NULL;
@@
-777,6
+786,7
@@
BOOL queue_smtp = FALSE;
uschar *queue_smtp_domains = NULL;
unsigned int random_seed = 0;
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;
tree_node *ratelimiters_conn = NULL;
tree_node *ratelimiters_mail = NULL;
uschar *raw_active_hostname = NULL;
@@
-811,7
+821,7
@@
uschar *received_header_text = US
"${if def:tls_cipher {($tls_cipher)\n\t}}"
#endif
"(Exim $version_number)\n\t"
"${if def:tls_cipher {($tls_cipher)\n\t}}"
#endif
"(Exim $version_number)\n\t"
- "id $message_id"
+ "id $message_
exim_
id"
"${if def:received_for {\n\tfor $received_for}}"
"\0<---------------Space to patch received_header_text->";
"${if def:received_for {\n\tfor $received_for}}"
"\0<---------------Space to patch received_header_text->";
@@
-1049,10
+1059,16
@@
uschar *spool_directory = US SPOOL_DIRECTORY
uschar *srs_config = NULL;
uschar *srs_db_address = NULL;
uschar *srs_db_key = NULL;
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_orig_recipient = NULL;
uschar *srs_orig_sender = NULL;
uschar *srs_recipient = NULL;
+uschar *srs_secrets = NULL;
uschar *srs_status = NULL;
uschar *srs_status = NULL;
+BOOL srs_usehash = TRUE;
+BOOL srs_usetimestamp = TRUE;
#endif
int string_datestamp_offset= -1;
BOOL strip_excess_angle_brackets = FALSE;
#endif
int string_datestamp_offset= -1;
BOOL strip_excess_angle_brackets = FALSE;