Final tidyout of EXPERIMENTAL_PRDR
authorJeremy Harris <jgh146exb@wizmail.org>
Tue, 20 May 2014 20:21:11 +0000 (21:21 +0100)
committerJeremy Harris <jgh146exb@wizmail.org>
Tue, 20 May 2014 20:21:11 +0000 (21:21 +0100)
src/src/acl.c
src/src/config.h.defaults
src/src/deliver.c

index e8a0657..6e635fb 100644 (file)
@@ -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
     ),
index 6f7295c..69df842 100644 (file)
@@ -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
index 6bdfbd4..7af101a 100644 (file)
@@ -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