Import Debian changes 4.89-2+deb9u3~bpo8+1

[hcoop/debian/exim4.git] / debian / debconf / conf.d / transport / 30_exim4-config_remote_smtp_smarthost

diff --git a/debian/debconf/conf.d/transport/30_exim4-config_remote_smtp_smarthost b/debian/debconf/conf.d/transport/30_exim4-config_remote_smtp_smarthost
index b834249..9c18305 100644 (file)
--- a/debian/debconf/conf.d/transport/30_exim4-config_remote_smtp_smarthost
+++ b/debian/debconf/conf.d/transport/30_exim4-config_remote_smtp_smarthost
@@ -5,10 +5,16 @@
 # This transport is used for delivering messages over SMTP connections
 # to a smarthost. The local host tries to authenticate.
 # This transport is used for smarthost and satellite configurations.
+# Refuse to send any messsage with over-long lines, which could have
+# been received other than via SMTP. The use of message_size_limit to
+# enforce this is a red herring.
 
 remote_smtp_smarthost:
   debug_print = "T: remote_smtp_smarthost for $local_part@$domain"
   driver = smtp
+.ifndef IGNORE_SMTP_LINE_LENGTH_LIMIT
+  message_size_limit = ${if > {$max_received_linelength}{998} {1}{0}}
+.endif
   hosts_try_auth = <; ${if exists{CONFDIR/passwd.client} \
         {\
         ${lookup{$host}nwildlsearch{CONFDIR/passwd.client}{$host_address}}\
@@ -18,6 +24,9 @@ remote_smtp_smarthost:
 .ifdef REMOTE_SMTP_SMARTHOST_HOSTS_AVOID_TLS
   hosts_avoid_tls = REMOTE_SMTP_SMARTHOST_HOSTS_AVOID_TLS
 .endif
+.ifdef REMOTE_SMTP_SMARTHOST_HOSTS_REQUIRE_TLS
+  hosts_require_tls = REMOTE_SMTP_SMARTHOST_HOSTS_REQUIRE_TLS
+.endif
 .ifdef REMOTE_SMTP_HEADERS_REWRITE
   headers_rewrite = REMOTE_SMTP_HEADERS_REWRITE
 .endif