Compile with DISABLE_PRDR set
authorPhil Pennock <pdp@exim.org>
Sun, 12 Jul 2015 23:28:30 +0000 (23:28 +0000)
committerPhil Pennock <pdp@exim.org>
Sun, 12 Jul 2015 23:28:30 +0000 (23:28 +0000)
src/src/acl.c
src/src/smtp_in.c

index 5a5abae..91ee571 100644 (file)
@@ -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" */
index 2f0c25d..4761220 100644 (file)
@@ -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;