X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/861a7c51461a2df09f364f53d723edcd36cb1627..6c6d6e483411af2c087ff258f4041d38eb65e775:/src/src/acl.c

diff --git a/src/src/acl.c b/src/src/acl.c
index 5a5abaebf..f2e0ef28b 100644
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -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" */
@@ -4283,7 +4287,7 @@ while (acl != NULL)
     case ACL_WARN:
     if (cond == OK)
       acl_warn(where, *user_msgptr, *log_msgptr);
-    else if (cond == DEFER && (log_extra_selector & LX_acl_warn_skipped) != 0)
+    else if (cond == DEFER && LOGGING(acl_warn_skipped))
       log_write(0, LOG_MAIN, "%s Warning: ACL \"warn\" statement skipped: "
         "condition test deferred%s%s", host_and_ident(TRUE),
         (*log_msgptr == NULL)? US"" : US": ",