projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Incorrect port was logged when an SRV record specified a special port.
[exim.git]
/
src
/
src
/
globals.c
diff --git
a/src/src/globals.c
b/src/src/globals.c
index ee0fb6e6508f3f8010d230171391448c3cceac96..fabfe1c249f8d911ba06f39b1c9e5192cd267766 100644
(file)
--- a/
src/src/globals.c
+++ b/
src/src/globals.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/globals.c,v 1.
29 2005/06/16 20:01:29 tom
Exp $ */
+/* $Cambridge: exim/src/src/globals.c,v 1.
34 2005/08/08 10:48:27 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;
@@
-819,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->";
@@
-838,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;