projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OpenSSL: clearer log message for TCP conn close at SSL_accept
[exim.git]
/
src
/
src
/
macros.h
diff --git
a/src/src/macros.h
b/src/src/macros.h
index e3f1f4c281b77e086ab18fd4db79e1b8adc308e8..e36c09c475ef97091b858eb02c982f026a805af6 100644
(file)
--- a/
src/src/macros.h
+++ b/
src/src/macros.h
@@
-84,7
+84,7
@@
as unsigned. */
/* 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. */
-#if
def SUPPORT
_TLS
+#if
ndef DISABLE
_TLS
#define mac_smtp_fflush() if (tls_in.active.sock < 0) fflush(smtp_out);
#else
#define mac_smtp_fflush() fflush(smtp_out);
#define mac_smtp_fflush() if (tls_in.active.sock < 0) fflush(smtp_out);
#else
#define mac_smtp_fflush() fflush(smtp_out);
@@
-110,13
+110,6
@@
don't make the file descriptors two-way. */
#define DEBUG(x) if (debug_selector & (x))
#define HDEBUG(x) if (host_checking || (debug_selector & (x)))
#define DEBUG(x) if (debug_selector & (x))
#define HDEBUG(x) if (host_checking || (debug_selector & (x)))
-#define PTR_CHK(ptr) \
-do { \
-if ((void *)ptr > (void *)store_get(0)) \
- debug_printf("BUG: ptr '%s' beyond arena at %s:%d\n", \
- mac_expanded_string(ptr), __FUNCTION__, __LINE__); \
-} while(0)
-
/* The default From: text for DSNs */
#define DEFAULT_DSN_FROM "Mail Delivery System <Mailer-Daemon@$qualify_domain>"
/* The default From: text for DSNs */
#define DEFAULT_DSN_FROM "Mail Delivery System <Mailer-Daemon@$qualify_domain>"
@@
-245,7
+238,7
@@
enum {
ERRMESS_TOOMANYRECIP, /* Too many recipients */
ERRMESS_LOCAL_SCAN, /* Rejected by local scan */
ERRMESS_LOCAL_ACL /* Rejected by non-SMTP ACL */
ERRMESS_TOOMANYRECIP, /* Too many recipients */
ERRMESS_LOCAL_SCAN, /* Rejected by local scan */
ERRMESS_LOCAL_ACL /* Rejected by non-SMTP ACL */
-#ifdef
EXPERIMENTAL
_DMARC
+#ifdef
SUPPORT
_DMARC
,ERRMESS_DMARC_FORENSIC /* DMARC Forensic Report */
#endif
};
,ERRMESS_DMARC_FORENSIC /* DMARC Forensic Report */
#endif
};
@@
-339,7
+332,7
@@
platforms, but this ensures bit vectors always work the same way. */
/* This macro is for single-word bit vectors: the debug selector,
and the first word of the log selector. */
/* This macro is for single-word bit vectors: the debug selector,
and the first word of the log selector. */
-#define BIT(n) (1U << (n))
+#define BIT(n) (1U
L
<< (n))
/* And these are for multi-word vectors. */
#define BITWORD(n) ( (n) / BITWORDSIZE)
/* And these are for multi-word vectors. */
#define BITWORD(n) ( (n) / BITWORDSIZE)
@@
-370,7
+363,7
@@
Exim's code assumes in a number of places that the debug_selector is one
word, and this is exposed in the local_scan ABI. The D_v and D_local_scan bit
masks are part of the local_scan API so are #defined in local_scan.h */
word, and this is exposed in the local_scan ABI. The D_v and D_local_scan bit
masks are part of the local_scan API so are #defined in local_scan.h */
-#define DEBUG_BIT(name) Di_##name = IOTA(Di_iota), D_##name = BIT(Di_##name)
+#define DEBUG_BIT(name) Di_##name = IOTA(Di_iota), D_##name =
(int)
BIT(Di_##name)
enum {
Di_all = -1,
enum {
Di_all = -1,
@@
-1037,10
+1030,11
@@
enum { FILTER_UNSET, FILTER_FORWARD, FILTER_EXIM, FILTER_SIEVE };
/* UTF-8 chars for line-drawing */
/* UTF-8 chars for line-drawing */
-#define UTF8_DOWN_RIGHT "\xE2\x94\x8c"
+#define UTF8_DOWN_RIGHT "\xE2\x95\xAD"
+#define UTF8_VERT "\xE2\x94\x82"
#define UTF8_HORIZ "\xE2\x94\x80"
#define UTF8_VERT_RIGHT "\xE2\x94\x9C"
#define UTF8_HORIZ "\xE2\x94\x80"
#define UTF8_VERT_RIGHT "\xE2\x94\x9C"
-#define UTF8_UP_RIGHT "\xE2\x9
4\x94
"
+#define UTF8_UP_RIGHT "\xE2\x9
5\xB0
"
#define UTF8_VERT_2DASH "\xE2\x95\x8E"
#define UTF8_VERT_2DASH "\xE2\x95\x8E"
@@
-1096,4
+1090,10
@@
should not be one active. */
": 0x18 :session resumed unasked: 0x1A :session resumed unasked" \
": 0x1C :session resumed: 0x1E :session resumed, also new ticket"
": 0x18 :session resumed unasked: 0x1A :session resumed unasked" \
": 0x1C :session resumed: 0x1E :session resumed, also new ticket"
+/* Flags for string_vformat */
+#define SVFMT_EXTEND BIT(0)
+#define SVFMT_REBUFFER BIT(1)
+#define SVFMT_TAINT_NOCHK BIT(2)
+
+
/* End of macros.h */
/* End of macros.h */