git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix no-ssl build
[users/jgh/exim.git]
/
src
/
src
/
acl.c
diff --git
a/src/src/acl.c
b/src/src/acl.c
index eb2211d60f3d0a38cdf03c924b20b7d1d9b91013..6e635fbf190c4a557f657087b4698ee673e57364 100644
(file)
--- a/
src/src/acl.c
+++ b/
src/src/acl.c
@@
-397,7
+397,7
@@
static unsigned int cond_forbids[] = {
(unsigned int)
~((1<<ACL_WHERE_MAIL)|(1<<ACL_WHERE_RCPT)| /* add_header */
(1<<ACL_WHERE_PREDATA)|(1<<ACL_WHERE_DATA)|
(unsigned int)
~((1<<ACL_WHERE_MAIL)|(1<<ACL_WHERE_RCPT)| /* add_header */
(1<<ACL_WHERE_PREDATA)|(1<<ACL_WHERE_DATA)|
- #if
def EXPERIMENTAL
_PRDR
+ #if
ndef DISABLE
_PRDR
(1<<ACL_WHERE_PRDR)|
#endif
(1<<ACL_WHERE_MIME)|(1<<ACL_WHERE_NOTSMTP)|
(1<<ACL_WHERE_PRDR)|
#endif
(1<<ACL_WHERE_MIME)|(1<<ACL_WHERE_NOTSMTP)|
@@
-412,7
+412,7
@@
static unsigned int cond_forbids[] = {
(1<<ACL_WHERE_AUTH)| /* bmi_optin */
(1<<ACL_WHERE_CONNECT)|(1<<ACL_WHERE_HELO)|
(1<<ACL_WHERE_DATA)|(1<<ACL_WHERE_MIME)|
(1<<ACL_WHERE_AUTH)| /* bmi_optin */
(1<<ACL_WHERE_CONNECT)|(1<<ACL_WHERE_HELO)|
(1<<ACL_WHERE_DATA)|(1<<ACL_WHERE_MIME)|
- #if
def EXPERIMENTAL
_PRDR
+ #if
ndef DISABLE
_PRDR
(1<<ACL_WHERE_PRDR)|
#endif
(1<<ACL_WHERE_ETRN)|(1<<ACL_WHERE_EXPN)|
(1<<ACL_WHERE_PRDR)|
#endif
(1<<ACL_WHERE_ETRN)|(1<<ACL_WHERE_EXPN)|
@@
-434,9
+434,9
@@
static unsigned int cond_forbids[] = {
#ifdef EXPERIMENTAL_DCC
(unsigned int)
~((1<<ACL_WHERE_DATA)| /* dcc */
#ifdef EXPERIMENTAL_DCC
(unsigned int)
~((1<<ACL_WHERE_DATA)| /* dcc */
- #if
def EXPERIMENTAL
_PRDR
+ #if
ndef DISABLE
_PRDR
(1<<ACL_WHERE_PRDR)|
(1<<ACL_WHERE_PRDR)|
- #endif
/* EXPERIMENTAL_PRDR */
+ #endif
(1<<ACL_WHERE_NOTSMTP)),
#endif
(1<<ACL_WHERE_NOTSMTP)),
#endif
@@
-450,9
+450,9
@@
static unsigned int cond_forbids[] = {
#ifdef WITH_OLD_DEMIME
(unsigned int)
~((1<<ACL_WHERE_DATA)| /* demime */
#ifdef WITH_OLD_DEMIME
(unsigned int)
~((1<<ACL_WHERE_DATA)| /* demime */
- #if
def EXPERIMENTAL
_PRDR
+ #if
ndef DISABLE
_PRDR
(1<<ACL_WHERE_PRDR)|
(1<<ACL_WHERE_PRDR)|
- #endif
/* EXPERIMENTAL_PRDR */
+ #endif
(1<<ACL_WHERE_NOTSMTP)),
#endif
(1<<ACL_WHERE_NOTSMTP)),
#endif
@@
-474,7
+474,7
@@
static unsigned int cond_forbids[] = {
(unsigned int)
~((1<<ACL_WHERE_RCPT) /* domains */
(unsigned int)
~((1<<ACL_WHERE_RCPT) /* domains */
- #if
def EXPERIMENTAL
_PRDR
+ #if
ndef DISABLE
_PRDR
|(1<<ACL_WHERE_PRDR)
#endif
),
|(1<<ACL_WHERE_PRDR)
#endif
),
@@
-491,7
+491,7
@@
static unsigned int cond_forbids[] = {
(unsigned int)
~((1<<ACL_WHERE_RCPT) /* local_parts */
(unsigned int)
~((1<<ACL_WHERE_RCPT) /* local_parts */
- #if
def EXPERIMENTAL
_PRDR
+ #if
ndef DISABLE
_PRDR
|(1<<ACL_WHERE_PRDR)
#endif
),
|(1<<ACL_WHERE_PRDR)
#endif
),
@@
-505,9
+505,9
@@
static unsigned int cond_forbids[] = {
#ifdef WITH_CONTENT_SCAN
(unsigned int)
~((1<<ACL_WHERE_DATA)| /* malware */
#ifdef WITH_CONTENT_SCAN
(unsigned int)
~((1<<ACL_WHERE_DATA)| /* malware */
- #if
def EXPERIMENTAL
_PRDR
+ #if
ndef DISABLE
_PRDR
(1<<ACL_WHERE_PRDR)|
(1<<ACL_WHERE_PRDR)|
- #endif
/* EXPERIMENTAL_PRDR */
+ #endif
(1<<ACL_WHERE_NOTSMTP)),
#endif
(1<<ACL_WHERE_NOTSMTP)),
#endif
@@
-526,9
+526,9
@@
static unsigned int cond_forbids[] = {
#ifdef WITH_CONTENT_SCAN
(unsigned int)
~((1<<ACL_WHERE_DATA)| /* regex */
#ifdef WITH_CONTENT_SCAN
(unsigned int)
~((1<<ACL_WHERE_DATA)| /* regex */
- #if
def EXPERIMENTAL
_PRDR
+ #if
ndef DISABLE
_PRDR
(1<<ACL_WHERE_PRDR)|
(1<<ACL_WHERE_PRDR)|
- #endif
/* EXPERIMENTAL_PRDR */
+ #endif
(1<<ACL_WHERE_NOTSMTP)|
(1<<ACL_WHERE_MIME)),
#endif
(1<<ACL_WHERE_NOTSMTP)|
(1<<ACL_WHERE_MIME)),
#endif
@@
-536,7
+536,7
@@
static unsigned int cond_forbids[] = {
(unsigned int)
~((1<<ACL_WHERE_MAIL)|(1<<ACL_WHERE_RCPT)| /* remove_header */
(1<<ACL_WHERE_PREDATA)|(1<<ACL_WHERE_DATA)|
(unsigned int)
~((1<<ACL_WHERE_MAIL)|(1<<ACL_WHERE_RCPT)| /* remove_header */
(1<<ACL_WHERE_PREDATA)|(1<<ACL_WHERE_DATA)|
- #if
def EXPERIMENTAL
_PRDR
+ #if
ndef DISABLE
_PRDR
(1<<ACL_WHERE_PRDR)|
#endif
(1<<ACL_WHERE_MIME)|(1<<ACL_WHERE_NOTSMTP)|
(1<<ACL_WHERE_PRDR)|
#endif
(1<<ACL_WHERE_MIME)|(1<<ACL_WHERE_NOTSMTP)|
@@
-559,9
+559,9
@@
static unsigned int cond_forbids[] = {
#ifdef WITH_CONTENT_SCAN
(unsigned int)
~((1<<ACL_WHERE_DATA)| /* spam */
#ifdef WITH_CONTENT_SCAN
(unsigned int)
~((1<<ACL_WHERE_DATA)| /* spam */
- #if
def EXPERIMENTAL
_PRDR
+ #if
ndef DISABLE
_PRDR
(1<<ACL_WHERE_PRDR)|
(1<<ACL_WHERE_PRDR)|
- #endif
/* EXPERIMENTAL_PRDR */
+ #endif
(1<<ACL_WHERE_NOTSMTP)),
#endif
(1<<ACL_WHERE_NOTSMTP)),
#endif
@@
-608,9
+608,9
@@
static unsigned int control_forbids[] = {
#ifndef DISABLE_DKIM
(1<<ACL_WHERE_DATA)|(1<<ACL_WHERE_NOTSMTP)| /* dkim_disable_verify */
#ifndef DISABLE_DKIM
(1<<ACL_WHERE_DATA)|(1<<ACL_WHERE_NOTSMTP)| /* dkim_disable_verify */
- #if
def EXPERIMENTAL
_PRDR
+ #if
ndef DISABLE
_PRDR
(1<<ACL_WHERE_PRDR)|
(1<<ACL_WHERE_PRDR)|
- #endif
/* EXPERIMENTAL_PRDR */
+ #endif
(1<<ACL_WHERE_NOTSMTP_START),
#endif
(1<<ACL_WHERE_NOTSMTP_START),
#endif
@@
-674,17
+674,17
@@
static unsigned int control_forbids[] = {
(unsigned int)
~((1<<ACL_WHERE_MAIL)|(1<<ACL_WHERE_RCPT)| /* fakedefer */
(1<<ACL_WHERE_PREDATA)|(1<<ACL_WHERE_DATA)|
(unsigned int)
~((1<<ACL_WHERE_MAIL)|(1<<ACL_WHERE_RCPT)| /* fakedefer */
(1<<ACL_WHERE_PREDATA)|(1<<ACL_WHERE_DATA)|
- #if
def EXPERIMENTAL
_PRDR
+ #if
ndef DISABLE
_PRDR
(1<<ACL_WHERE_PRDR)|
(1<<ACL_WHERE_PRDR)|
- #endif
/* EXPERIMENTAL_PRDR */
+ #endif
(1<<ACL_WHERE_MIME)),
(unsigned int)
~((1<<ACL_WHERE_MAIL)|(1<<ACL_WHERE_RCPT)| /* fakereject */
(1<<ACL_WHERE_PREDATA)|(1<<ACL_WHERE_DATA)|
(1<<ACL_WHERE_MIME)),
(unsigned int)
~((1<<ACL_WHERE_MAIL)|(1<<ACL_WHERE_RCPT)| /* fakereject */
(1<<ACL_WHERE_PREDATA)|(1<<ACL_WHERE_DATA)|
- #if
def EXPERIMENTAL
_PRDR
+ #if
ndef DISABLE
_PRDR
(1<<ACL_WHERE_PRDR)|
(1<<ACL_WHERE_PRDR)|
- #endif
/* EXPERIMENTAL_PRDR */
+ #endif
(1<<ACL_WHERE_MIME)),
(1<<ACL_WHERE_NOTSMTP)| /* no_multiline */
(1<<ACL_WHERE_MIME)),
(1<<ACL_WHERE_NOTSMTP)| /* no_multiline */
@@
-2992,12
+2992,14
@@
for (; cb != NULL; cb = cb->next)
if (cb->type == ACLC_MESSAGE)
{
if (cb->type == ACLC_MESSAGE)
{
+ HDEBUG(D_acl) debug_printf(" message: %s\n", cb->arg);
user_message = cb->arg;
continue;
}
if (cb->type == ACLC_LOG_MESSAGE)
{
user_message = cb->arg;
continue;
}
if (cb->type == ACLC_LOG_MESSAGE)
{
+ HDEBUG(D_acl) debug_printf("l_message: %s\n", cb->arg);
log_message = cb->arg;
continue;
}
log_message = cb->arg;
continue;
}
@@
-4317,7
+4319,7
@@
sender_verified_failed = NULL;
ratelimiters_cmd = NULL;
log_reject_target = LOG_MAIN|LOG_REJECT;
ratelimiters_cmd = NULL;
log_reject_target = LOG_MAIN|LOG_REJECT;
-#if
def EXPERIMENTAL
_PRDR
+#if
ndef DISABLE
_PRDR
if (where == ACL_WHERE_RCPT || where == ACL_WHERE_PRDR )
#else
if (where == ACL_WHERE_RCPT )
if (where == ACL_WHERE_RCPT || where == ACL_WHERE_PRDR )
#else
if (where == ACL_WHERE_RCPT )
@@
-4361,7
+4363,7
@@
If conn-failure, no action (and keep the spooled copy).
switch (where)
{
case ACL_WHERE_RCPT:
switch (where)
{
case ACL_WHERE_RCPT:
-#if
def EXPERIMENTAL
_PRDR
+#if
ndef DISABLE
_PRDR
case ACL_WHERE_PRDR:
#endif
if( rcpt_count > 1 )
case ACL_WHERE_PRDR:
#endif
if( rcpt_count > 1 )