projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Doc: correct minor typo
[exim.git]
/
src
/
src
/
acl.c
diff --git
a/src/src/acl.c
b/src/src/acl.c
index 17f55c2acf0553bfb9012fead09b8e5142bbcbc2..684b93bbb31641bb4e59784b1f3d9589e91f4e09 100644
(file)
--- a/
src/src/acl.c
+++ b/
src/src/acl.c
@@
-475,11
+475,14
@@
static unsigned int cond_forbids[] = {
~(1<<ACL_WHERE_DATA), /* dmarc_status */
#endif
~(1<<ACL_WHERE_DATA), /* dmarc_status */
#endif
- (1<<ACL_WHERE_NOTSMTP)| /* dnslists */
- (1<<ACL_WHERE_NOTSMTP_START),
+ /* Explicit key lookups can be made in non-smtp ACLs so pass
+ always and check in the verify processing itself. */
+
+ 0, /* dnslists */
(unsigned int)
~((1<<ACL_WHERE_RCPT) /* domains */
(unsigned int)
~((1<<ACL_WHERE_RCPT) /* domains */
+ |(1<<ACL_WHERE_VRFY)
#ifndef DISABLE_PRDR
|(1<<ACL_WHERE_PRDR)
#endif
#ifndef DISABLE_PRDR
|(1<<ACL_WHERE_PRDR)
#endif
@@
-497,6
+500,7
@@
static unsigned int cond_forbids[] = {
(unsigned int)
~((1<<ACL_WHERE_RCPT) /* local_parts */
(unsigned int)
~((1<<ACL_WHERE_RCPT) /* local_parts */
+ |(1<<ACL_WHERE_VRFY)
#ifndef DISABLE_PRDR
|(1<<ACL_WHERE_PRDR)
#endif
#ifndef DISABLE_PRDR
|(1<<ACL_WHERE_PRDR)
#endif
@@
-3567,7
+3571,7
@@
for (; cb != NULL; cb = cb->next)
#endif
case ACLC_DNSLISTS:
#endif
case ACLC_DNSLISTS:
- rc = verify_check_dnsbl(
&arg
);
+ rc = verify_check_dnsbl(
where, &arg, log_msgptr
);
break;
case ACLC_DOMAINS:
break;
case ACLC_DOMAINS:
@@
-4452,9
+4456,9
@@
ratelimiters_cmd = NULL;
log_reject_target = LOG_MAIN|LOG_REJECT;
#ifndef DISABLE_PRDR
log_reject_target = LOG_MAIN|LOG_REJECT;
#ifndef DISABLE_PRDR
-if (where
== ACL_WHERE_RCPT || where ==
ACL_WHERE_PRDR)
+if (where
==ACL_WHERE_RCPT || where==ACL_WHERE_VRFY || where==
ACL_WHERE_PRDR)
#else
#else
-if (where
== ACL_WHERE_RCPT
)
+if (where
==ACL_WHERE_RCPT || where==ACL_WHERE_VRFY
)
#endif
{
adb = address_defaults;
#endif
{
adb = address_defaults;