[exim-cvs] Final tidyout of EXPERIMENTAL_PRDR

Gitweb: http://git.exim.org/exim.git/commitdiff/2e6afa4f11972312d3dbb9bb1d4f4bf585a3cdd2

Commit:     2e6afa4f11972312d3dbb9bb1d4f4bf585a3cdd2
Parent:     421aff8575b352ecb3711f12f86b9b4739684e80
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Tue May 20 21:21:11 2014 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Tue May 20 21:21:11 2014 +0100

    Final tidyout of EXPERIMENTAL_PRDR
---
 src/src/acl.c             |    2 +-
 src/src/config.h.defaults |    1 -
 src/src/deliver.c         |    2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/src/acl.c b/src/src/acl.c
index e8a0657..6e635fb 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 6f7295c..69df842 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 6bdfbd4..7af101a 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