Final tidyout of EXPERIMENTAL_PRDR

diff --git a/src/src/acl.c b/src/src/acl.c
index e8a0657f2f6787fa4719b1392fcabd7fd7b715aa..6e635fbf190c4a557f657087b4698ee673e57364 100644 (file)
--- 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 */
 
   (unsigned int)
   ~((1<<ACL_WHERE_RCPT)                             /* local_parts */

-  #ifdef EXPERIMENTAL_PRDR
+  #ifndef DISABLE_PRDR

     |(1<<ACL_WHERE_PRDR)
   #endif
     ),
     |(1<<ACL_WHERE_PRDR)
   #endif
     ),

diff --git a/src/src/config.h.defaults b/src/src/config.h.defaults
index 6f7295ca10b911ba24b97c9b7efcac258e9ef5f5..69df842e73281f3dfad7b094f8fd0f1a5fa81147 100644 (file)
--- 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_DCC
 #define EXPERIMENTAL_DMARC
 #define EXPERIMENTAL_OCSP

-#define EXPERIMENTAL_PRDR

 #define EXPERIMENTAL_PROXY
 #define EXPERIMENTAL_REDIS
 #define EXPERIMENTAL_SPF
 #define EXPERIMENTAL_PROXY
 #define EXPERIMENTAL_REDIS
 #define EXPERIMENTAL_SPF

diff --git a/src/src/deliver.c b/src/src/deliver.c
index 6bdfbd4da9894642cab94e3955ea82e39af5b8e4..7af101ac0587120ba4335a66c3c07cdf18642ebc 100644 (file)
--- 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);
        }
 
         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
       if (addr->flags & af_prdr_used)
        rmt_dlv_checked_write(fd, "P", 1);
       #endif