From: Phil Pennock <pdp@exim.org>
Date: Sun, 12 Jul 2015 23:28:30 +0000 (+0000)
Subject: Compile with DISABLE_PRDR set
X-Git-Tag: exim-4_86_RC5~2
X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=commitdiff_plain;h=a2b89db142e91c52edc890da5af33266577a3f67

Compile with DISABLE_PRDR set
---

diff --git a/src/src/acl.c b/src/src/acl.c
index 5a5abaebf..91ee57148 100644
--- 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 2f0c25dcd..476122045 100644
--- 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;