Log additional command-history on too-many-syntax-errors

diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index 4c3d995d62db40ff8eeb9d86aed7e06fb4f9de7a..526164c4699370d00cdbb685232ceb044c004b8b 100644 (file)
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -1816,6 +1816,29 @@ return g;
 }
 #endif
 
 }
 #endif
 

+
+
+static gstring *
+s_connhad_log(gstring * g)
+{
+uschar * sep = smtp_connection_had[SMTP_HBUFF_SIZE-1] != SCH_NONE
+  ? US" C=..." : US" C=";
+
+for (int i = smtp_ch_index; i < SMTP_HBUFF_SIZE; i++)
+  if (smtp_connection_had[i] != SCH_NONE)
+    {
+    g = string_append(g, 2, sep, smtp_names[smtp_connection_had[i]]);
+    sep = US",";
+    }
+for (int i = 0; i < smtp_ch_index; i++)
+  {
+  g = string_append(g, 2, sep, smtp_names[smtp_connection_had[i]]);
+  sep = US",";
+  }
+return g;
+}
+
+

 /*************************************************
 *      Log lack of MAIL if so configured         *
 *************************************************/
 /*************************************************
 *      Log lack of MAIL if so configured         *
 *************************************************/


@@ -1831,7 +1854,7 @@ Returns:     nothing
 void
 smtp_log_no_mail(void)
 {
 void
 smtp_log_no_mail(void)
 {

-uschar * sep, * s;
+uschar * s;

 gstring * g = NULL;
 
 if (smtp_mailcmd_count > 0 || !LOGGING(smtp_no_mail))
 gstring * g = NULL;
 
 if (smtp_mailcmd_count > 0 || !LOGGING(smtp_no_mail))


@@ -1847,20 +1870,7 @@ if (sender_host_authenticated)
 g = s_tlslog(g);
 #endif
 
 g = s_tlslog(g);
 #endif
 

-sep = smtp_connection_had[SMTP_HBUFF_SIZE-1] != SCH_NONE ?  US" C=..." : US" C=";
-
-for (int i = smtp_ch_index; i < SMTP_HBUFF_SIZE; i++)
-  if (smtp_connection_had[i] != SCH_NONE)
-    {
-    g = string_append(g, 2, sep, smtp_names[smtp_connection_had[i]]);
-    sep = US",";
-    }
-
-for (int i = 0; i < smtp_ch_index; i++)
-  {
-  g = string_append(g, 2, sep, smtp_names[smtp_connection_had[i]]);
-  sep = US",";
-  }
+g = s_connhad_log(g);

 
 if (!(s = string_from_gstring(g))) s = US"";
 
 
 if (!(s = string_from_gstring(g))) s = US"";
 


@@ -3102,15 +3112,17 @@ synprot_error(int type, int code, uschar *data, uschar *errmess)
 int yield = -1;
 
 log_write(type, LOG_MAIN, "SMTP %s error in \"%s\" %s %s",
 int yield = -1;
 
 log_write(type, LOG_MAIN, "SMTP %s error in \"%s\" %s %s",

-  (type == L_smtp_syntax_error)? "syntax" : "protocol",
+  type == L_smtp_syntax_error ? "syntax" : "protocol",

   string_printing(smtp_cmd_buffer), host_and_ident(TRUE), errmess);
 
 if (++synprot_error_count > smtp_max_synprot_errors)
   {
   yield = 1;
   log_write(0, LOG_MAIN|LOG_REJECT, "SMTP call from %s dropped: too many "
   string_printing(smtp_cmd_buffer), host_and_ident(TRUE), errmess);
 
 if (++synprot_error_count > smtp_max_synprot_errors)
   {
   yield = 1;
   log_write(0, LOG_MAIN|LOG_REJECT, "SMTP call from %s dropped: too many "

-    "syntax or protocol errors (last command was \"%s\")",
-    host_and_ident(FALSE), string_printing(smtp_cmd_buffer));
+    "syntax or protocol errors (last command was \"%s\", %s)",
+    host_and_ident(FALSE), string_printing(smtp_cmd_buffer),
+    string_from_gstring(s_connhad_log(NULL))
+    );

   }
 
 if (code > 0)
   }
 
 if (code > 0)


@@ -4158,8 +4170,10 @@ while (done <= 0)
        if (++synprot_error_count > smtp_max_synprot_errors)
          {
          log_write(0, LOG_MAIN|LOG_REJECT, "SMTP call from %s dropped: too many "
        if (++synprot_error_count > smtp_max_synprot_errors)
          {
          log_write(0, LOG_MAIN|LOG_REJECT, "SMTP call from %s dropped: too many "

-           "syntax or protocol errors (last command was \"%s\")",
-           host_and_ident(FALSE), string_printing(smtp_cmd_buffer));
+           "syntax or protocol errors (last command was \"%s\", %s)",
+           host_and_ident(FALSE), string_printing(smtp_cmd_buffer),
+           string_from_gstring(s_connhad_log(NULL))
+           );

          done = 1;
          }
 
          done = 1;
          }
 

diff --git a/test/log/0453 b/test/log/0453
index 5a2a8915545658dd9e2e5f1460da1c7ec6de750a..4ca61142b89986566d53d2fb997cff9d1b2bf75c 100644 (file)
--- a/test/log/0453
+++ b/test/log/0453
@@ -2,5 +2,5 @@
 1999-03-02 09:44:33 rejected HELO from CALLER: syntactically invalid argument(s): (no argument given)
 1999-03-02 09:44:33 rejected HELO from CALLER: syntactically invalid argument(s): (no argument given)
 1999-03-02 09:44:33 rejected HELO from CALLER: syntactically invalid argument(s): (no argument given)
 1999-03-02 09:44:33 rejected HELO from CALLER: syntactically invalid argument(s): (no argument given)
 1999-03-02 09:44:33 rejected HELO from CALLER: syntactically invalid argument(s): (no argument given)
 1999-03-02 09:44:33 rejected HELO from CALLER: syntactically invalid argument(s): (no argument given)

-1999-03-02 09:44:33 SMTP call from CALLER dropped: too many syntax or protocol errors (last command was "helo")
-1999-03-02 09:44:33 SMTP call from CALLER dropped: too many syntax or protocol errors (last command was "mail from:<>")
+1999-03-02 09:44:33 SMTP call from CALLER dropped: too many syntax or protocol errors (last command was "helo",  C=HELO,HELO,HELO,HELO)
+1999-03-02 09:44:33 SMTP call from CALLER dropped: too many syntax or protocol errors (last command was "mail from:<>",  C=MAIL,MAIL,MAIL)

diff --git a/test/log/0566 b/test/log/0566
index 0922615b32f17cd1a503e6373c295afac3890d8d..119b2d264190058a52907328336ccec963c21f51 100644 (file)
--- a/test/log/0566
+++ b/test/log/0566
@@ -12,4 +12,4 @@
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss M8S=8
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@test.ex> R=r2 T=local_delivery
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss M8S=8
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@test.ex> R=r2 T=local_delivery
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed

-1999-03-02 09:44:33 SMTP call from CALLER dropped: too many syntax or protocol errors (last command was "foo")
+1999-03-02 09:44:33 SMTP call from CALLER dropped: too many syntax or protocol errors (last command was "foo",  C=EHLO,MAIL,RCPT,DATA)

diff --git a/test/log/0901 b/test/log/0901
index af07e730cf1a3cd95bc94a533bd8c6d3fea9125a..e4bb6a243159033bd610dd5327611d6a93ad5ae2 100644 (file)
--- a/test/log/0901
+++ b/test/log/0901
@@ -11,5 +11,5 @@
 1999-03-02 09:44:33 SMTP connection from (tester) [127.0.0.1] lost while reading message data
 1999-03-02 09:44:33 10HmbD-0005vi-00 <= someone8@some.domain H=(tester) [127.0.0.1] P=esmtp K S=sss for CALLER@test.ex
 1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was not advertised): rejected "BDAT 1" H=(tester) [127.0.0.1] next input="BDAT 87 last\r\no: Susan@random.co"...
 1999-03-02 09:44:33 SMTP connection from (tester) [127.0.0.1] lost while reading message data
 1999-03-02 09:44:33 10HmbD-0005vi-00 <= someone8@some.domain H=(tester) [127.0.0.1] P=esmtp K S=sss for CALLER@test.ex
 1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was not advertised): rejected "BDAT 1" H=(tester) [127.0.0.1] next input="BDAT 87 last\r\no: Susan@random.co"...

-1999-03-02 09:44:33 SMTP call from (tester) [127.0.0.1] dropped: too many syntax or protocol errors (last command was "From: Sam@random.com")
+1999-03-02 09:44:33 SMTP call from (tester) [127.0.0.1] dropped: too many syntax or protocol errors (last command was "From: Sam@random.com",  C=EHLO,MAIL,RCPT,BDAT)

 1999-03-02 09:44:33 SMTP connection from (tester) [127.0.0.1] lost while reading message data (header)
 1999-03-02 09:44:33 SMTP connection from (tester) [127.0.0.1] lost while reading message data (header)

diff --git a/test/rejectlog/0453 b/test/rejectlog/0453
index 5a2a8915545658dd9e2e5f1460da1c7ec6de750a..4ca61142b89986566d53d2fb997cff9d1b2bf75c 100644 (file)
--- a/test/rejectlog/0453
+++ b/test/rejectlog/0453
@@ -2,5 +2,5 @@
 1999-03-02 09:44:33 rejected HELO from CALLER: syntactically invalid argument(s): (no argument given)
 1999-03-02 09:44:33 rejected HELO from CALLER: syntactically invalid argument(s): (no argument given)
 1999-03-02 09:44:33 rejected HELO from CALLER: syntactically invalid argument(s): (no argument given)
 1999-03-02 09:44:33 rejected HELO from CALLER: syntactically invalid argument(s): (no argument given)
 1999-03-02 09:44:33 rejected HELO from CALLER: syntactically invalid argument(s): (no argument given)
 1999-03-02 09:44:33 rejected HELO from CALLER: syntactically invalid argument(s): (no argument given)

-1999-03-02 09:44:33 SMTP call from CALLER dropped: too many syntax or protocol errors (last command was "helo")
-1999-03-02 09:44:33 SMTP call from CALLER dropped: too many syntax or protocol errors (last command was "mail from:<>")
+1999-03-02 09:44:33 SMTP call from CALLER dropped: too many syntax or protocol errors (last command was "helo",  C=HELO,HELO,HELO,HELO)
+1999-03-02 09:44:33 SMTP call from CALLER dropped: too many syntax or protocol errors (last command was "mail from:<>",  C=MAIL,MAIL,MAIL)

diff --git a/test/rejectlog/0566 b/test/rejectlog/0566
index 7a420d042386720a7d466b8499c700ce0a0f3301..bb4af83efc46d6a7e090fbde344de9d6b2e4556c 100644 (file)
--- a/test/rejectlog/0566
+++ b/test/rejectlog/0566
@@ -1,3 +1,3 @@
 1999-03-02 09:44:33 U=CALLER F=<x@y> rejected RCPT <userx@test.ex>: SIZE value too big
 1999-03-02 09:44:33 U=CALLER F=<x@y> rejected RCPT <userx@test.ex>: SIZE value too big
 1999-03-02 09:44:33 U=CALLER F=<x@y> rejected RCPT <userx@test.ex>: SIZE value too big
 1999-03-02 09:44:33 U=CALLER F=<x@y> rejected RCPT <userx@test.ex>: SIZE value too big

-1999-03-02 09:44:33 SMTP call from CALLER dropped: too many syntax or protocol errors (last command was "foo")
+1999-03-02 09:44:33 SMTP call from CALLER dropped: too many syntax or protocol errors (last command was "foo",  C=EHLO,MAIL,RCPT,DATA)

diff --git a/test/rejectlog/0901 b/test/rejectlog/0901
index a4185a966bc0f0c3db1f3c893b131e2cae1bb997..79ecb9650e0c5400d46a024518feeba4982a2844 100644 (file)
--- a/test/rejectlog/0901
+++ b/test/rejectlog/0901
@@ -3,6 +3,6 @@
 1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was not advertised): rejected "BDAT 1" H=(tester) [127.0.0.1] next input="BDAT 87 last\r\no: Susan@random.co"...
 Envelope-from: <someone9@some.domain>
 Envelope-to: <CALLER@test.ex>
 1999-03-02 09:44:33 SMTP protocol synchronization error (next input sent too soon: pipelining was not advertised): rejected "BDAT 1" H=(tester) [127.0.0.1] next input="BDAT 87 last\r\no: Susan@random.co"...
 Envelope-from: <someone9@some.domain>
 Envelope-to: <CALLER@test.ex>

-1999-03-02 09:44:33 SMTP call from (tester) [127.0.0.1] dropped: too many syntax or protocol errors (last command was "From: Sam@random.com")
+1999-03-02 09:44:33 SMTP call from (tester) [127.0.0.1] dropped: too many syntax or protocol errors (last command was "From: Sam@random.com",  C=EHLO,MAIL,RCPT,BDAT)

 Envelope-from: <someone9@some.domain>
 Envelope-to: <CALLER@test.ex>
 Envelope-from: <someone9@some.domain>
 Envelope-to: <CALLER@test.ex>

diff --git a/test/stderr/0453 b/test/stderr/0453
index 1911c67f21608ac37ebb36f80f76e0018f6ae3f9..dee833923492f5ee596b6e71bd2935778e0cf147 100644 (file)
--- a/test/stderr/0453
+++ b/test/stderr/0453
@@ -7,4 +7,4 @@
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> xxxx in helo_lookup_domains? no (end of list)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> xxxx in helo_lookup_domains? no (end of list)

-LOG: SMTP call from (xxxx) [V4NET.0.0.1] dropped: too many syntax or protocol errors (last command was "rcpt to:<bad syntax@x.y.z>")
+LOG: SMTP call from (xxxx) [V4NET.0.0.1] dropped: too many syntax or protocol errors (last command was "rcpt to:<bad syntax@x.y.z>",  C=HELO,MAIL,RCPT,RCPT,RCPT,RCPT)