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
OpenSSL: track shutdown calls. Bug 2864
[exim.git]
/
src
/
src
/
macros.h
diff --git
a/src/src/macros.h
b/src/src/macros.h
index ccdcc451f703a68e88af3ffb9af4747b8f409f2d..659a70f481f08557bb29c799cfd5bc0fae1814d1 100644
(file)
--- a/
src/src/macros.h
+++ b/
src/src/macros.h
@@
-3,7
+3,7
@@
*************************************************/
/* Copyright (c) University of Cambridge 1995 - 2018 */
*************************************************/
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020
- 2021
*/
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
@@
-79,11
+79,6
@@
as unsigned. */
((uschar)(c) > 127 && print_topbitchars))
((uschar)(c) > 127 && print_topbitchars))
-/* Convenience for testing strings */
-
-#define streqic(Foo, Bar) (strcmpic(Foo, Bar) == 0)
-
-
/* When built with TLS support, the act of flushing SMTP output becomes
a no-op once an SSL session is in progress. */
/* When built with TLS support, the act of flushing SMTP output becomes
a no-op once an SSL session is in progress. */
@@
-111,7
+106,7
@@
don't make the file descriptors two-way. */
/* Debugging control */
#define DEBUG(x) if (debug_selector & (x))
/* Debugging control */
#define DEBUG(x) if (debug_selector & (x))
-#define HDEBUG(x) if (host_checking ||
(debug_selector & (x)
))
+#define HDEBUG(x) if (host_checking ||
debug_selector & (x
))
/* The default From: text for DSNs */
/* The default From: text for DSNs */
@@
-202,8
+197,7
@@
record, and the max number of continuation records allowed. */
/* Macros for trivial functions */
/* Macros for trivial functions */
-#define mac_ismsgid(s) \
- (pcre_exec(regex_ismsgid,NULL,CS s,Ustrlen(s),0,PCRE_EOPT,NULL,0) >= 0)
+#define mac_ismsgid(s) (regex_match(regex_ismsgid, (s), -1, NULL))
/* Options for dns_next_rr */
/* Options for dns_next_rr */
@@
-428,6
+422,13
@@
enum {
D_timestamp | \
D_resolver))
D_timestamp | \
D_resolver))
+/* Bits for debug triggers */
+
+enum {
+ DTi_panictrigger,
+ DTi_pretrigger,
+};
+
/* Options bits for logging. Those that have values < BITWORDSIZE can be used
in calls to log_write(). The others are put into later words in log_selector
and are only ever tested independently, so they do not need bit mask
/* Options bits for logging. Those that have values < BITWORDSIZE can be used
in calls to log_write(). The others are put into later words in log_selector
and are only ever tested independently, so they do not need bit mask
@@
-491,9
+492,6
@@
enum logbit {
Li_smtp_mailauth,
Li_smtp_no_mail,
Li_subject,
Li_smtp_mailauth,
Li_smtp_no_mail,
Li_subject,
-#ifdef ALLOW_INSECURE_TAINTED_DATA
- Li_tainted,
-#endif
Li_tls_certificate_verified,
Li_tls_cipher,
Li_tls_peerdn,
Li_tls_certificate_verified,
Li_tls_cipher,
Li_tls_peerdn,
@@
-1053,9
+1051,10
@@
enum { FILTER_UNSET, FILTER_FORWARD, FILTER_EXIM, FILTER_SIEVE };
/* Options on tls_close */
/* Options on tls_close */
-#define TLS_NO_SHUTDOWN 0
-#define TLS_SHUTDOWN_NOWAIT 1
-#define TLS_SHUTDOWN_WAIT 2
+#define TLS_NO_SHUTDOWN 0 /* Just forget the context */
+#define TLS_SHUTDOWN_NOWAIT 1 /* Send alert; do not wait */
+#define TLS_SHUTDOWN_WAIT 2 /* Send alert & wait for peer's alert */
+#define TLS_SHUTDOWN_WONLY 3 /* only wait for peer's alert */
#ifdef COMPILE_UTILITY
#ifdef COMPILE_UTILITY
@@
-1076,8
+1075,8
@@
should not be one active. */
#define AUTHS_REGEX US"\\n250[\\s\\-]AUTH\\s+([\\-\\w \\t]+)(?:\\n|$)"
#define AUTHS_REGEX US"\\n250[\\s\\-]AUTH\\s+([\\-\\w \\t]+)(?:\\n|$)"
-#define EARLY_PIPE_FEATURE_NAME "PIPE
_
CONNECT"
-#define EARLY_PIPE_FEATURE_LEN 1
2
+#define EARLY_PIPE_FEATURE_NAME "PIPECONNECT"
+#define EARLY_PIPE_FEATURE_LEN 1
1
/* Flags for auth_client_item() */
/* Flags for auth_client_item() */