projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Track ACL context through ${acl expansions. Bug 1305.
[exim.git]
/
src
/
src
/
macros.h
diff --git
a/src/src/macros.h
b/src/src/macros.h
index 3ec94bc6da50920871a5005f87fbb15ebae49673..c9d990ada3ba8ab27ad407e247a43574a32a7f1a 100644
(file)
--- a/
src/src/macros.h
+++ b/
src/src/macros.h
@@
-409,6
+409,7
@@
set all the bits in a multi-word selector. */
#define LX_tls_peerdn 0x80400000
#define LX_tls_sni 0x80800000
#define LX_unknown_in_list 0x81000000
#define LX_tls_peerdn 0x80400000
#define LX_tls_sni 0x80800000
#define LX_unknown_in_list 0x81000000
+#define LX_8bitmime 0x82000000
#define L_default (L_connection_reject | \
L_delay_delivery | \
#define L_default (L_connection_reject | \
L_delay_delivery | \
@@
-424,6
+425,7
@@
set all the bits in a multi-word selector. */
#define LX_default ((LX_acl_warn_skipped | \
LX_rejected_header | \
LX_sender_verify_fail | \
#define LX_default ((LX_acl_warn_skipped | \
LX_rejected_header | \
LX_sender_verify_fail | \
+ LX_smtp_confirmation | \
LX_tls_cipher) & 0x7fffffff)
/* Private error numbers for delivery failures, set negative so as not
LX_tls_cipher) & 0x7fffffff)
/* Private error numbers for delivery failures, set negative so as not
@@
-824,7
+826,8
@@
enum { ACL_WHERE_RCPT, /* Some controls are for RCPT only */
ACL_WHERE_STARTTLS,
ACL_WHERE_VRFY,
ACL_WHERE_STARTTLS,
ACL_WHERE_VRFY,
- ACL_WHERE_EXPANSION /* Currently used by a ${acl:name} expansion */
+ ACL_WHERE_DELIVERY,
+ ACL_WHERE_UNKNOWN /* Currently used by a ${acl:name} expansion */
};
/* Situations for spool_write_header() */
};
/* Situations for spool_write_header() */