git://git.exim.org
/
users
/
heiko
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fdd3478
)
Compile with DISABLE_PRDR set
author
Phil Pennock
<pdp@exim.org>
Sun, 12 Jul 2015 23:28:30 +0000
(23:28 +0000)
committer
Phil Pennock
<pdp@exim.org>
Sun, 12 Jul 2015 23:28:30 +0000
(23:28 +0000)
src/src/acl.c
patch
|
blob
|
history
src/src/smtp_in.c
patch
|
blob
|
history
diff --git
a/src/src/acl.c
b/src/src/acl.c
index 5a5abaebf1ba59e47079f0e61acee11f0388dcd4..91ee571481d942c0007abe55bb086faedd15fb7c 100644
(file)
--- a/
src/src/acl.c
+++ b/
src/src/acl.c
@@
-3372,7
+3372,11
@@
for (; cb != NULL; cb = cb->next)
break;
case CONTROL_CUTTHROUGH_DELIVERY:
+#ifndef DISABLE_PRDR
if (prdr_requested)
+#else
+ if (0)
+#endif
/* Too hard to think about for now. We might in future cutthrough
the case where both sides handle prdr and this-node prdr acl
is "accept" */
diff --git
a/src/src/smtp_in.c
b/src/src/smtp_in.c
index 2f0c25dcd26a8eae9713e709fffb9744ea4e5b7a..4761220451193e09209a4c40f9961ffe20c52589 100644
(file)
--- a/
src/src/smtp_in.c
+++ b/
src/src/smtp_in.c
@@
-1515,7
+1515,9
@@
sender_verified_list = NULL; /* No senders verified */
memset(sender_address_cache, 0, sizeof(sender_address_cache));
memset(sender_domain_cache, 0, sizeof(sender_domain_cache));
+#ifndef DISABLE_PRDR
prdr_requested = FALSE;
+#endif
/* Reset the DSN flags */
dsn_ret = 0;