Merge branch 'debian' into hcoop_489

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

diff --git a/debian/debconf/conf.d/transport/30_exim4-config_remote_smtp b/debian/debconf/conf.d/transport/30_exim4-config_remote_smtp
index 11d72bb..42bd601 100644 (file)
--- a/debian/debconf/conf.d/transport/30_exim4-config_remote_smtp
+++ b/debian/debconf/conf.d/transport/30_exim4-config_remote_smtp
@@ -2,10 +2,16 @@
 ### transport/30_exim4-config_remote_smtp
 #################################
 # This transport is used for delivering messages over SMTP connections.
+# Refuse to send any message 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:
   debug_print = "T: remote_smtp for $local_part@$domain"
   driver = smtp
+.ifndef IGNORE_SMTP_LINE_LENGTH_LIMIT
+  message_size_limit = ${if > {$max_received_linelength}{998} {1}{0}}
+.endif
 .ifdef REMOTE_SMTP_HOSTS_AVOID_TLS
   hosts_avoid_tls = REMOTE_SMTP_HOSTS_AVOID_TLS
 .endif