Merge branch '4.next'

[exim.git] / src / src / configure.default

diff --git a/src/src/configure.default b/src/src/configure.default
index 733a37615e52455ec22eece67a705603fd1fba60..946137fc9ff838c9eff24b01bc12c51e8e9ea675 100644 (file)
--- a/src/src/configure.default
+++ b/src/src/configure.default
@@ -516,8 +516,8 @@ acl_check_rcpt:
   # examples of how you can get Exim to perform a DNS black list lookup at this
   # point. The first one denies, whereas the second just warns.
   #
-  # deny    message       = rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text
-  #         dnslists      = black.list.example
+  # deny    dnslists      = black.list.example
+  #         message       = rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text
   #
   # warn    dnslists      = black.list.example
   #         add_header    = X-Warning: $sender_host_address is in a black list at $dnslist_domain
@@ -587,9 +587,9 @@ acl_check_data:
   # Deny if the message contains an overlong line.  Per the standards
   # we should never receive one such via SMTP.
   #
-  deny    message    = maximum allowed line length is 998 octets, \
+  deny    condition  = ${if > {$max_received_linelength}{998}}
+          message    = maximum allowed line length is 998 octets, \
                        got $max_received_linelength
-          condition  = ${if > {$max_received_linelength}{998}}
 
   # Deny if the headers contain badly-formed addresses.
   #
@@ -815,9 +815,6 @@ remote_smtp:
   driver = smtp
 .ifdef _HAVE_TLS_RESUME
   tls_resumption_hosts = *
-#endif
-.ifdef _HAVE_PRDR
-  hosts_try_prdr = *
 .endif
 
 
@@ -859,9 +856,6 @@ smarthost_smtp:
   tls_resumption_hosts = *
 .endif
 .endif
-.ifdef _HAVE_PRDR
-  hosts_try_prdr = *
-.endif
 
 
 # This transport is used for local delivery to user mailboxes in traditional