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
Add control=suppress_local_fixups to complete the quartet.
[exim.git]
/
src
/
src
/
globals.c
diff --git
a/src/src/globals.c
b/src/src/globals.c
index 43d5feeec046f27417f160f34871ea28cfd824f8..a4e37fb4e8131668b3388aab5f594688eef34686 100644
(file)
--- a/
src/src/globals.c
+++ b/
src/src/globals.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/globals.c,v 1.
28 2005/06/10 19:27:05 fanf2
Exp $ */
+/* $Cambridge: exim/src/src/globals.c,v 1.
36 2005/09/12 10:08:54 ph10
Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-87,6
+87,10
@@
uschar *oracle_servers = NULL;
uschar *pgsql_servers = NULL;
#endif
uschar *pgsql_servers = NULL;
#endif
+#ifdef LOOKUP_SQLITE
+int sqlite_lock_timeout = 5;
+#endif
+
#ifdef SUPPORT_MOVE_FROZEN_MESSAGES
BOOL move_frozen_messages = FALSE;
#endif
#ifdef SUPPORT_MOVE_FROZEN_MESSAGES
BOOL move_frozen_messages = FALSE;
#endif
@@
-392,6
+396,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;
@@
-567,6
+573,7
@@
uschar *helo_allow_chars = US"";
uschar *helo_lookup_domains = US"@ : @[]";
uschar *helo_try_verify_hosts = NULL;
BOOL helo_verified = FALSE;
uschar *helo_lookup_domains = US"@ : @[]";
uschar *helo_try_verify_hosts = NULL;
BOOL helo_verified = FALSE;
+BOOL helo_verify_failed = FALSE;
uschar *helo_verify_hosts = NULL;
uschar *hex_digits = US"0123456789abcdef";
uschar *hold_domains = NULL;
uschar *helo_verify_hosts = NULL;
uschar *hex_digits = US"0123456789abcdef";
uschar *hold_domains = NULL;
@@
-756,6
+763,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;
@@
-815,7
+826,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->";
@@
-834,6
+845,7
@@
BOOL recipients_max_reject = FALSE;
const pcre *regex_AUTH = NULL;
const pcre *regex_check_dns_names = NULL;
const pcre *regex_From = NULL;
const pcre *regex_AUTH = NULL;
const pcre *regex_check_dns_names = NULL;
const pcre *regex_From = NULL;
+const pcre *regex_IGNOREQUOTA = NULL;
const pcre *regex_PIPELINING = NULL;
const pcre *regex_SIZE = NULL;
const pcre *regex_ismsgid = NULL;
const pcre *regex_PIPELINING = NULL;
const pcre *regex_SIZE = NULL;
const pcre *regex_ismsgid = NULL;
@@
-970,6
+982,7
@@
BOOL sender_host_notsocket = FALSE;
BOOL sender_host_unknown = FALSE;
uschar *sender_ident = NULL;
BOOL sender_local = FALSE;
BOOL sender_host_unknown = FALSE;
uschar *sender_ident = NULL;
BOOL sender_local = FALSE;
+BOOL sender_name_forced = FALSE;
uschar *sender_rate = NULL;
uschar *sender_rate_limit = NULL;
uschar *sender_rate_period = NULL;
uschar *sender_rate = NULL;
uschar *sender_rate_limit = NULL;
uschar *sender_rate_period = NULL;
@@
-1069,6
+1082,8
@@
BOOL strip_excess_angle_brackets = FALSE;
BOOL strip_trailing_dot = FALSE;
uschar *submission_domain = NULL;
BOOL submission_mode = FALSE;
BOOL strip_trailing_dot = FALSE;
uschar *submission_domain = NULL;
BOOL submission_mode = FALSE;
+uschar *submission_name = NULL;
+BOOL suppress_local_fixups = FALSE;
BOOL synchronous_delivery = FALSE;
BOOL syslog_duplication = TRUE;
int syslog_facility = LOG_MAIL;
BOOL synchronous_delivery = FALSE;
BOOL syslog_duplication = TRUE;
int syslog_facility = LOG_MAIL;