Log: more info in transport "line too long" error message. Bug 2871

diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index 594b42e1f3f0b1099bdd4dcd585d62aafeab3d2c..79bacfc31d56614138d309314d20fab3359f80eb 100644 (file)
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -5237,7 +5237,10 @@ if (max_received_linelength > ob->message_linelength_limit)
       addr->transport_return = PENDING_DEFER;
 
   set_errno_nohost(addrlist, ERRNO_SMTPFORMAT,
       addr->transport_return = PENDING_DEFER;
 
   set_errno_nohost(addrlist, ERRNO_SMTPFORMAT,

-    US"message has lines too long for transport", FAIL, TRUE, &now);
+    string_sprintf("message has lines too long for transport "
+                   "(received %d, limit %d)",
+                   max_received_linelength, ob->message_linelength_limit),
+                 FAIL, TRUE, &now);

   goto END_TRANSPORT;
   }
 
   goto END_TRANSPORT;
   }
 

diff --git a/test/log/0589 b/test/log/0589
index 6742764ca00943817adb28efe5fb838a05481ca1..81f7ff39fd042cc231d54cc377bfd11c0e04fad1 100644 (file)
--- a/test/log/0589
+++ b/test/log/0589
@@ -8,7 +8,7 @@
 2017-07-30 18:51:05.712 10HmaZ-000000005vi-0000 Completed
 2017-07-30 18:51:05.712 10HmaX-000000005vi-0000 => good@test.ex F=<CALLER@test.ex> R=smtp_try T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmaZ-000000005vi-0000"
 2017-07-30 18:51:05.712 10HmaX-000000005vi-0000 Completed
 2017-07-30 18:51:05.712 10HmaZ-000000005vi-0000 Completed
 2017-07-30 18:51:05.712 10HmaX-000000005vi-0000 => good@test.ex F=<CALLER@test.ex> R=smtp_try T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmaZ-000000005vi-0000"
 2017-07-30 18:51:05.712 10HmaX-000000005vi-0000 Completed

-2017-07-30 18:51:05.712 10HmaY-000000005vi-0000 ** bad@test.ex F=<CALLER@test.ex> R=smtp_try T=send_to_server: message has lines too long for transport
+2017-07-30 18:51:05.712 10HmaY-000000005vi-0000 ** bad@test.ex F=<CALLER@test.ex> R=smtp_try T=send_to_server: message has lines too long for transport (received 999, limit 998)

 2017-07-30 18:51:05.712 10HmbA-000000005vi-0000 <= <> R=10HmaY-000000005vi-0000 U=EXIMUSER P=local S=sss for CALLER@test.ex
 2017-07-30 18:51:05.712 10HmbA-000000005vi-0000 => :blackhole: <CALLER@test.ex> R=rx_dump
 2017-07-30 18:51:05.712 10HmbA-000000005vi-0000 Completed
 2017-07-30 18:51:05.712 10HmbA-000000005vi-0000 <= <> R=10HmaY-000000005vi-0000 U=EXIMUSER P=local S=sss for CALLER@test.ex
 2017-07-30 18:51:05.712 10HmbA-000000005vi-0000 => :blackhole: <CALLER@test.ex> R=rx_dump
 2017-07-30 18:51:05.712 10HmbA-000000005vi-0000 Completed