From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Tue, 20 May 2014 20:21:11 +0000 (+0100)
Subject: Final tidyout of EXPERIMENTAL_PRDR
X-Git-Tag: exim-4_83_RC1~15
X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=commitdiff_plain;h=2e6afa4f11972312d3dbb9bb1d4f4bf585a3cdd2

Final tidyout of EXPERIMENTAL_PRDR
---

diff --git a/src/src/acl.c b/src/src/acl.c
index e8a0657f2..6e635fbf1 100644
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -491,7 +491,7 @@ static unsigned int cond_forbids[] = {
 
   (unsigned int)
   ~((1<<ACL_WHERE_RCPT)                             /* local_parts */
-  #ifdef EXPERIMENTAL_PRDR
+  #ifndef DISABLE_PRDR
     |(1<<ACL_WHERE_PRDR)
   #endif
     ),
diff --git a/src/src/config.h.defaults b/src/src/config.h.defaults
index 6f7295ca1..69df842e7 100644
--- a/src/src/config.h.defaults
+++ b/src/src/config.h.defaults
@@ -168,7 +168,6 @@ it's a default value. */
 #define EXPERIMENTAL_DCC
 #define EXPERIMENTAL_DMARC
 #define EXPERIMENTAL_OCSP
-#define EXPERIMENTAL_PRDR
 #define EXPERIMENTAL_PROXY
 #define EXPERIMENTAL_REDIS
 #define EXPERIMENTAL_SPF
diff --git a/src/src/deliver.c b/src/src/deliver.c
index 6bdfbd4da..7af101ac0 100644
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -4187,7 +4187,7 @@ for (delivery_count = 0; addr_remote != NULL; delivery_count++)
         rmt_dlv_checked_write(fd, big_buffer, ptr - big_buffer);
 	}
 
-      #ifdef EXPERIMENTAL_PRDR
+      #ifndef DISABLE_PRDR
       if (addr->flags & af_prdr_used)
 	rmt_dlv_checked_write(fd, "P", 1);
       #endif