X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsrc%2Fconfigure.default;h=946137fc9ff838c9eff24b01bc12c51e8e9ea675;hb=4f10c76912b0ac78397ea157306460c20f30689a;hp=7d54e11eb96e146b92e4e736fa351e53c92528ec;hpb=0de9945258c2e7910c35f715caf07c5e9270aa1b;p=user%2Fhenk%2Fcode%2Fexim.git

diff --git a/src/src/configure.default b/src/src/configure.default
index 7d54e11eb..946137fc9 100644
--- a/src/src/configure.default
+++ b/src/src/configure.default
@@ -176,7 +176,9 @@ tls_require_ciphers = ECDSA:RSA:!COMPLEMENTOFDEFAULT
 # Don't offer resumption to (most) MUAs, who we don't want to reuse
 # tickets.  Once the TLS extension for vended ticket numbers comes
 # though, re-examine since resumption on a single-use ticket is still a benefit.
+.ifdef _HAVE_TLS_RESUME
 tls_resumption_hosts = ${if inlist {$received_port}{587:465} {:}{*}}
+.endif
 
 # In order to support roaming users who wish to send email from anywhere,
 # you may want to make Exim listen on other ports as well as port 25, in
@@ -514,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
@@ -585,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.
   #
@@ -811,11 +813,8 @@ begin transports
 
 remote_smtp:
   driver = smtp
-.ifdef _HAVE_TLS
+.ifdef _HAVE_TLS_RESUME
   tls_resumption_hosts = *
-#endif
-.ifdef _HAVE_PRDR
-  hosts_try_prdr = *
 .endif
 
 
@@ -853,10 +852,9 @@ smarthost_smtp:
 .ifdef _HAVE_GNUTLS
   tls_require_ciphers = SECURE192:-VERS-SSL3.0:-VERS-TLS1.0:-VERS-TLS1.1
 .endif
+.ifdef _HAVE_TLS_RESUME
   tls_resumption_hosts = *
 .endif
-.ifdef _HAVE_PRDR
-  hosts_try_prdr = *
 .endif