Debug: build a summary string tracking transport SMTP commands & responses

diff --git a/src/src/EDITME b/src/src/EDITME
index d21a45edaabf56b8643d58d466a212deae01dd83..53022e5934cffd88abc8bd431f61576361f9281a 100644 (file)
--- a/src/src/EDITME
+++ b/src/src/EDITME
@@ -1489,4 +1489,9 @@ EXIM_TMPDIR="/tmp"
 # For development, add this to include code to time various stages and report.
 # CFLAGS += -DMEASURE_TIMING
 
+# For a very slightly smaller build, for constrained systems, uncomment this.
+# The feature involved is purely for debugging.
+
+# DISABLE_CLIENT_CMD_LOG=yes
+
 # End of EDITME for Exim 4.

diff --git a/src/src/config.h.defaults b/src/src/config.h.defaults
index 8a3de3f580940c1223ae2eed96bdbe8243091946..6ddece4d02fc8a2b359d1101331f16ac466770f4 100644 (file)
--- a/src/src/config.h.defaults
+++ b/src/src/config.h.defaults
@@ -46,6 +46,9 @@ Do not put spaces between # and the 'define'.
 #define DEFAULT_CRYPT              crypt
 #define DELIVER_IN_BUFFER_SIZE     8192
 #define DELIVER_OUT_BUFFER_SIZE    8192
+
+#define DISABLE_CLIENT_CMD_LOG
+#define DISABLE_D_OPTION
 #define DISABLE_DNSSEC
 #define DISABLE_DKIM
 #define DISABLE_EVENT
@@ -55,7 +58,6 @@ Do not put spaces between # and the 'define'.
 #define DISABLE_QUEUE_RAMP
 #define DISABLE_TLS
 #define DISABLE_TLS_RESUME
-#define DISABLE_D_OPTION
 
 #define ENABLE_DISABLE_FSYNC
 

diff --git a/src/src/functions.h b/src/src/functions.h
index f52c155b057a980265f959bb32918f8f02aa91a9..5ecef6ad00146ffae87d1186943089dc87d55747 100644 (file)
--- a/src/src/functions.h
+++ b/src/src/functions.h
@@ -1253,6 +1253,42 @@ struct pollfd p = {.fd = fd, .events = pollbits};
 return poll(&p, 1, tmo_millisec);
 }
 
+/******************************************************************************/
+/* Client-side smtp log string, for debug */
+
+static inline void
+smtp_debug_cmd(const uschar * buf, int mode)
+{
+HDEBUG(D_transport|D_acl|D_v) debug_printf_indent("  SMTP%c> %s\n",
+  mode == SCMD_BUFFER ? '|' : mode == SCMD_MORE ? '+' : '>', buf);
+
+#  ifndef DISABLE_CLIENT_CMD_LOG
+  {
+  int old_pool = store_pool;
+  store_pool = POOL_PERM;      /* Main pool ACL allocations eg. callouts get released */
+  client_cmd_log = string_append_listele_n(client_cmd_log, ':', buf,
+                                         Ustrcspn(buf, " \n"));
+  if (mode == SCMD_BUFFER) 
+    {
+    client_cmd_log = string_catn(client_cmd_log, US"|", 1); 
+    (void) string_from_gstring(client_cmd_log);
+    }
+  store_pool = old_pool;
+  }
+#  endif
+}
+
+
+static inline void
+smtp_debug_cmd_report(void)
+{
+#  ifndef DISABLE_CLIENT_CMD_LOG
+debug_printf("cmdlog: '%s'\n", client_cmd_log ? client_cmd_log->s : US"(unset)");
+#  endif
+}
+
+
+
 # endif        /* !COMPILE_UTILITY */
 
 /******************************************************************************/

diff --git a/src/src/globals.c b/src/src/globals.c
index c3cccf1f2c42589a9515126108939fa0aa9ed932..844ff7bacdba65eedaf55916a52c05e87a6ba654 100644 (file)
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -712,6 +712,9 @@ const pcre2_code *regex_LIMITS        = NULL;
 uschar *client_authenticator   = NULL;
 uschar *client_authenticated_id = NULL;
 uschar *client_authenticated_sender = NULL;
+#ifndef DISABLE_CLIENT_CMD_LOG
+gstring *client_cmd_log        = NULL;
+#endif
 int     clmacro_count          = 0;
 uschar *clmacros[MAX_CLMACROS];
 FILE   *config_file            = NULL;

diff --git a/src/src/globals.h b/src/src/globals.h
index f447b0096694d69dcbfb7d32840b8aebe10132b5..8a6405b475350563e39cb3db3276b9b440f215d3 100644 (file)
--- a/src/src/globals.h
+++ b/src/src/globals.h
@@ -421,6 +421,9 @@ extern chunking_state_t chunking_state;
 extern uschar *client_authenticator;        /* Authenticator name used for smtp delivery */
 extern uschar *client_authenticated_id;     /* "login" name used for SMTP AUTH */
 extern uschar *client_authenticated_sender; /* AUTH option to SMTP MAIL FROM (not yet used) */
+#ifndef DISABLE_CLIENT_CMD_LOG
+extern gstring *client_cmd_log;               /* debug log of client cmds & responses */
+#endif
 extern int     clmacro_count;          /* Number of command line macros */
 extern uschar *clmacros[];             /* Copy of them, for re-exec */
 extern BOOL    commandline_checks_require_admin; /* belt and braces for insecure setups */

diff --git a/src/src/smtp_out.c b/src/src/smtp_out.c
index 06f6ce29ccbe05d5c4ba546b9905ba9ccd0b680d..7b8212477af67f305d4c1f67774891159d8f88c0 100644 (file)
--- a/src/src/smtp_out.c
+++ b/src/src/smtp_out.c
@@ -596,6 +596,22 @@ return TRUE;
 
 
 
+/* This might be called both due to callout and then from delivery.
+Use memory that will not be released between those phases.
+*/
+static void
+smtp_debug_resp(const uschar * buf)
+{
+#ifndef DISABLE_CLIENT_CMD_LOG
+int old_pool = store_pool;
+store_pool = POOL_PERM;
+client_cmd_log = string_append_listele_n(client_cmd_log, ':', buf,
+  buf[3] == ' ' ? 3 : 4);
+store_pool = old_pool;
+#endif
+}
+
+
 /*************************************************
 *             Write SMTP command                 *
 *************************************************/
@@ -617,7 +633,7 @@ Returns:     0 if command added to pipelining buffer, with nothing transmitted
 */
 
 int
-smtp_write_command(void * sx, int mode, const char *format, ...)
+smtp_write_command(void * sx, int mode, const char * format, ...)
 {
 smtp_outblock * outblock = &((smtp_context *)sx)->outblock;
 int rc = 0;
@@ -673,9 +689,7 @@ if (format)
     while (*p) *p++ = '*';
     }
 
-  HDEBUG(D_transport|D_acl|D_v) debug_printf_indent("  SMTP%c> %s\n",
-    mode == SCMD_BUFFER ? '|' : mode == SCMD_MORE ? '+' : '>',
-    big_buffer);
+  smtp_debug_cmd(big_buffer, mode);
   }
 
 if (mode != SCMD_BUFFER)
@@ -813,8 +827,10 @@ smtp_context * sx = sx0;
 uschar * ptr = buffer;
 int count = 0;
 time_t timelimit = time(NULL) + timeout;
+BOOL yield = FALSE;
 
 errno = 0;  /* Ensure errno starts out zero */
+buffer[0] = '\0';
 
 #ifndef DISABLE_PIPE_CONNECT
 if (sx->pending_BANNER || sx->pending_EHLO)
@@ -823,9 +839,8 @@ if (sx->pending_BANNER || sx->pending_EHLO)
   if ((rc = smtp_reap_early_pipe(sx, &count)) != OK)
     {
     DEBUG(D_transport) debug_printf("failed reaping pipelined cmd responsess\n");
-    buffer[0] = '\0';
     if (rc == DEFER) errno = ERRNO_TLSFAILURE;
-    return FALSE;
+    goto out;
     }
   }
 #endif
@@ -856,7 +871,7 @@ for (;;)
      (ptr[3] != '-' && ptr[3] != ' ' && ptr[3] != 0))
     {
     errno = ERRNO_SMTPFORMAT;    /* format error */
-    return FALSE;
+    goto out;
     }
 
   /* If the line we have just read is a terminal line, line, we are done.
@@ -884,7 +899,11 @@ distinguish between an unexpected return code and other errors such as
 timeouts, lost connections, etc. */
 
 errno = 0;
-return buffer[0] == okdigit;
+yield = buffer[0] == okdigit;
+
+out:
+  smtp_debug_resp(buffer);
+  return yield;
 }
 
 /* End of smtp_out.c */

diff --git a/src/src/store.c b/src/src/store.c
index 1e555cc18588ac4ec723b4249697023149f018f7..ffc1ca8e66d4594a66bbbcc790483979047a13c6 100644 (file)
--- a/src/src/store.c
+++ b/src/src/store.c
@@ -259,7 +259,7 @@ return NULL;
 }
 
 static pooldesc *
-pool_for_pointer(const void * p)
+pool_for_pointer(const void * p, const char * func, int linenumber)
 {
 pooldesc * pp;
 storeblock * b;
@@ -274,7 +274,8 @@ for (pp = paired_pools; pp < paired_pools + N_PAIRED_POOLS; pp++)
   for (b = pp->chainbase; b; b = b->next)
     if (is_pointer_in_block(b, p)) return pp;
 
-log_write(0, LOG_MAIN|LOG_PANIC_DIE, "bad memory reference; pool not found");
+log_write(0, LOG_MAIN|LOG_PANIC_DIE,
+  "bad memory reference; pool not found, at %s %d", func, linenumber);
 return NULL;
 }
 
@@ -713,7 +714,7 @@ BOOL
 store_extend_3(void * ptr, int oldsize, int newsize,
    const char * func, int linenumber)
 {
-pooldesc * pp = pool_for_pointer(ptr);
+pooldesc * pp = pool_for_pointer(ptr, func, linenumber);
 int inc = newsize - oldsize;
 int rounded_oldsize = oldsize;
 
@@ -1105,7 +1106,7 @@ void *
 store_newblock_3(void * oldblock, int newsize, int len,
   const char * func, int linenumber)
 {
-pooldesc * pp = pool_for_pointer(oldblock);
+pooldesc * pp = pool_for_pointer(oldblock, func, linenumber);
 BOOL release_ok = !is_tainted(oldblock) && pp->store_last_get == oldblock;             /*XXX why tainted not handled? */
 uschar * newblock;
 

diff --git a/src/src/string.c b/src/src/string.c
index 4d870ec9ac1a96f37776e5ba9e197122483a9c9a..c23055d4750567c27763f840eb6ccca6373f993c 100644 (file)
--- a/src/src/string.c
+++ b/src/src/string.c
@@ -1166,6 +1166,13 @@ if (!g)
   unsigned size = ((count + inc) &  ~inc) + 1; /* round up requested count */
   g = string_get_tainted(size, s);
   }
+else if (!g->s)                        /* should not happen */
+  {
+  g->s = string_copyn(s, count);
+  g->ptr = count;
+  g->size = count;     /*XXX suboptimal*/
+  return g;
+  }
 else if (is_incompatible(g->s, s))
   {
 /* debug_printf("rebuf A\n"); */

diff --git a/src/src/transport.c b/src/src/transport.c
index fbd0bb39b388711aeb8ec634d1fa8da8e9a61b37..428d522adfa72172ca5f6e4a4177106ad855f307 100644 (file)
--- a/src/src/transport.c
+++ b/src/src/transport.c
@@ -1155,8 +1155,12 @@ f.spool_file_wireformat = FALSE;
 
 /* If requested, add a terminating "." line (SMTP output). */
 
-if (tctx->options & topt_end_dot && !write_chunk(tctx, US".\n", 2))
-  return FALSE;
+if (tctx->options & topt_end_dot)
+  {
+  smtp_debug_cmd(US".", 0);
+  if (!write_chunk(tctx, US".\n", 2))
+    return FALSE;
+  }
 
 /* Write out any remaining data in the buffer before returning. */
 
@@ -1426,7 +1430,7 @@ if (yield)
         ? !write_chunk(tctx, US".\n", 2)
        : !write_chunk(tctx, US"\n.\n", 3)
      )  )
-    yield = FALSE;
+    { smtp_debug_cmd(US".", 0); yield = FALSE; }
 
   /* Write out any remaining data in the buffer. */
 

diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index 524f18633ab5a492fab2761e2e4eaf602782e9f2..e38ea1502dbc8fc21e83a3bface4f7ea1178d8e8 100644 (file)
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -2155,7 +2155,7 @@ if (continue_hostname && continue_proxy_cipher)
     DEBUG(D_transport)
       debug_printf("Closing proxied-TLS connection due to SNI mismatch\n");
 
-    HDEBUG(D_transport|D_acl|D_v) debug_printf_indent("  SMTP>> QUIT\n");
+    smtp_debug_cmd(US"QUIT", 0);
     write(0, "QUIT\r\n", 6);
     close(0);
     continue_hostname = continue_proxy_cipher = NULL;
@@ -2239,6 +2239,9 @@ if (!continue_hostname)
   sx->peer_limit_mail = sx->peer_limit_rcpt = sx->peer_limit_rcptdom =
 #endif
   sx->avoid_option = sx->peer_offered = smtp_peer_options = 0;
+#ifndef DISABLE_CLIENT_CMD_LOG
+  client_cmd_log = NULL;
+#endif
 
 #ifndef DISABLE_PIPE_CONNECT
   if (  verify_check_given_host(CUSS &ob->hosts_pipe_connect,
@@ -3170,6 +3173,7 @@ sx->cctx.sock = -1;
 (void) event_raise(sx->conn_args.tblock->event_action, US"tcp:close", NULL, NULL);
 #endif
 
+smtp_debug_cmd_report();
 continue_transport = NULL;
 continue_hostname = NULL;
 return yield;
@@ -4831,6 +4835,7 @@ HDEBUG(D_transport|D_acl|D_v) debug_printf_indent("  SMTP(close)>>\n");
 sx->cctx.sock = -1;
 continue_transport = NULL;
 continue_hostname = NULL;
+smtp_debug_cmd_report();
 
 #ifndef DISABLE_EVENT
 (void) event_raise(tblock->event_action, US"tcp:close", NULL, NULL);

diff --git a/src/src/verify.c b/src/src/verify.c
index d78b8bf24724e186a0224811e146a9784ff9b0d1..12e39d6038760f85fce47c567d2a46fb14314f5d 100644 (file)
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -1126,6 +1126,7 @@ no_conn:
        HDEBUG(D_transport|D_acl|D_v) debug_printf_indent("  SMTP(close)>>\n");
        (void)close(sx->cctx.sock);
        sx->cctx.sock = -1;
+       smtp_debug_cmd_report();
 #ifndef DISABLE_EVENT
        (void) event_raise(addr->transport->event_action, US"tcp:close", NULL, NULL);
 #endif
@@ -1346,7 +1347,7 @@ cutthrough_predata(void)
 if(cutthrough.cctx.sock < 0 || cutthrough.callout_hold_only)
   return FALSE;
 
-HDEBUG(D_transport|D_acl|D_v) debug_printf_indent("  SMTP>> DATA\n");
+smtp_debug_cmd(US"DATA", 0);
 cutthrough_puts(US"DATA\r\n", 6);
 cutthrough_flush_send();
 
@@ -1414,7 +1415,7 @@ if(fd >= 0)
   */
   client_conn_ctx tmp_ctx = cutthrough.cctx;
   ctctx.outblock.ptr = ctbuffer;
-  HDEBUG(D_transport|D_acl|D_v) debug_printf_indent("  SMTP>> QUIT\n");
+  smtp_debug_cmd(US"QUIT", 0);
   _cutthrough_puts(US"QUIT\r\n", 6);   /* avoid recursion */
   _cutthrough_flush_send();
   cutthrough.cctx.sock = -1;           /* avoid recursion via read timeout */
@@ -1433,6 +1434,7 @@ if(fd >= 0)
 #endif
   HDEBUG(D_transport|D_acl|D_v) debug_printf_indent("  SMTP(close)>>\n");
   (void)close(fd);
+  smtp_debug_cmd_report();
   HDEBUG(D_acl) debug_printf_indent("----------- cutthrough shutdown (%s) ------------\n", why);
   }
 ctctx.outblock.ptr = ctbuffer;

diff --git a/test/stderr/0143 b/test/stderr/0143
index 02e23a8ac91598d9cd631160356cf7bfb5e3368f..a6ac4c949740392c8f4b404855d08f3b9a51fe70 100644 (file)
--- a/test/stderr/0143
+++ b/test/stderr/0143
@@ -42,6 +42,7 @@ sync_responses expect data
   SMTP<< 354 Send data
   SMTP>> writing message and terminating "."
 cannot use sendfile for body: spoolfile not wireformat
+  SMTP>> .
 writing data block fd=dddd size=sss timeout=300
   SMTP<< 250 OK
 ok=1 send_quit=1 send_rset=0 continue_more=0 yield=0 first_address is NULL
@@ -54,6 +55,7 @@ cmd buf flush ddd bytes (more expected)
   SMTP(shutdown)>>
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:DATA:354:.:250:QUIT:250'
 Leaving my_smtp transport
 LOG: MAIN
   => userx@domain.com R=my_main_router T=my_smtp H=127.0.0.1 [127.0.0.1] C="250 OK"

diff --git a/test/stderr/0217 b/test/stderr/0217
index a1efa5cdd5880a2fa5bffb3f24d51a2106a64935..30724222c74720677632fb27e5c3c7f6816fec3e 100644 (file)
--- a/test/stderr/0217
+++ b/test/stderr/0217
@@ -418,6 +418,8 @@ LOG: MAIN
   SMTP(shutdown)>>
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT:250:250:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:DATA:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:55
+**** debug string too long - truncated ****
 LOG: MAIN
   == yes@test.ex R=client T=send_to_server defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined DATA: 403 Sorry temp data error
 LOG: MAIN
@@ -850,11 +852,13 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> DATA
   SMTP<< 351 Send more
   SMTP>> writing message and terminating "."
+  SMTP>> .
   SMTP<< 250 OK
   SMTP+> QUIT
   SMTP(shutdown)>>
   SMTP(closed)<<
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:RCPT:250:RCPT:250:RCPT:250:DATA:351:.:250:QUIT'
 LOG: MAIN
   => w@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN

diff --git a/test/stderr/0218 b/test/stderr/0218
index c07bd2a467bc9f0992f6e873b6ecea06c202e725..acfb3c156ebe0088b083a46ab02ed20b041971eb 100644 (file)
--- a/test/stderr/0218
+++ b/test/stderr/0218
@@ -32,8 +32,10 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP<< 250 OK
   SMTP<< 351 Send more
   SMTP>> writing message and terminating "."
+  SMTP>> .
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:351:.:250'
 LOG: MAIN
   => a@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 OK"
 LOG: MAIN
@@ -54,11 +56,13 @@ T: send_to_server  (ACL)
   SMTP<< 250 OK
   SMTP<< 351 Send more
   SMTP>> writing message and terminating "."
+  SMTP>> .
   SMTP+> QUIT
   SMTP(shutdown)>>
   SMTP<< 250 OK
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: 'MAIL|:RCPT|:DATA:250:250:351:.:QUIT:250:250'
 LOG: MAIN
   => b@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 OK"
 LOG: MAIN
@@ -104,6 +108,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP(shutdown)>>
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:550:503:503:QUIT:250'
 LOG: MAIN
   ** a@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined MAIL FROM:<CALLER@test.ex>: 550 NO
 Exim version x.yz ....
@@ -168,6 +173,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> RSET
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:550:503:RSET:250'
 LOG: MAIN
   ** b@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<b@test.ex>: 550 Unknown
 Exim version x.yz ....
@@ -195,11 +201,13 @@ T: send_to_server  (ACL)
   SMTP<< 250 OK
   SMTP<< 351 OK
   SMTP>> writing message and terminating "."
+  SMTP>> .
   SMTP+> QUIT
   SMTP(shutdown)>>
   SMTP<< 250 OK
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: 'MAIL|:RCPT|:DATA:250:250:351:.:QUIT:250:250'
 LOG: MAIN
   => c@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 OK"
 LOG: MAIN

diff --git a/test/stderr/0227 b/test/stderr/0227
index 71b9637ff7031e2aceed0ea917784388d54a3145..8d766d61db8b8fb6b21be0ecfa99bcbc61d1e2ae 100644 (file)
--- a/test/stderr/0227
+++ b/test/stderr/0227
@@ -11,6 +11,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:QUIT:250'
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
@@ -30,6 +31,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:QUIT:250'
 LOG: MAIN REJECT
   H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 Unknown user
 LOG: MAIN REJECT
@@ -49,6 +51,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:450:QUIT:250'
 LOG: MAIN REJECT
   H=(test) [V4NET.0.0.1] U=root sender verify defer for <uncheckable@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<uncheckable@localhost1>: 450 Temporary error
 LOG: MAIN REJECT
@@ -66,6 +69,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:550:QUIT:250'
 LOG: MAIN REJECT
   H=(test) [V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 Error for <>
 LOG: MAIN REJECT
@@ -84,6 +88,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:550-:QUIT:250'
 LOG: MAIN REJECT
   H=(test) [V4NET.0.0.1] U=root sender verify fail for <uncheckable@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550-Multiline error for <>\n550 Here's the second line
 LOG: MAIN REJECT
@@ -101,6 +106,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:550:QUIT:250'
 LOG: MAIN REJECT
   H=(test) [V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 Bad-char error for <> topbitchar:\200\377\377
 LOG: MAIN REJECT
@@ -120,6 +126,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:QUIT:250'
 LOG: MAIN REJECT
   H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 550 Recipient not liked
 LOG: smtp_connection MAIN
@@ -138,6 +145,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:550-:QUIT:250'
 LOG: MAIN REJECT
   H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 550-Recipient not liked on two lines\n550 Here's the second
 LOG: smtp_connection MAIN
@@ -155,6 +163,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:QUIT:250'
 LOG: MAIN REJECT
   H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 550 Recipient not liked, with bad char:\200\377\377
 LOG: smtp_connection MAIN
@@ -180,6 +189,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:QUIT:250'
 LOG: MAIN REJECT
   H=(test) [V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line
 LOG: smtp_connection MAIN
@@ -197,6 +207,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:QUIT:250'
 LOG: MAIN REJECT
   H=(test) [V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line
 LOG: smtp_connection MAIN
@@ -221,6 +232,7 @@ Cutthrough cancelled by presence of postmaster verify
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:RSET:250:MAIL:250:RCPT:250:QUIT:250'
 LOG: MAIN REJECT
   H=(test) [V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: relay not permitted
 LOG: smtp_connection MAIN
@@ -245,6 +257,7 @@ Cutthrough cancelled by presence of postmaster verify
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:RSET:250:MAIL:250:RCPT:550:QUIT:250'
 LOG: MAIN REJECT
   H=(test) [V4NET.0.0.5] U=root sender verify fail for <ok@localhost1>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost1>: 550 Don't like postmaster
 LOG: MAIN REJECT
@@ -266,6 +279,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:QUIT:250'
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
@@ -283,6 +297,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:QUIT:250'
 LOG: MAIN REJECT
   H=(me) [V4NET.0.0.3] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: relay not permitted
 LOG: smtp_connection MAIN
@@ -302,6 +317,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:QUIT:250'
 LOG: MAIN REJECT
   H=(me) [V4NET.0.0.3] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: relay not permitted
 LOG: smtp_connection MAIN
@@ -327,6 +343,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL:250:RCPT:550:RSET:250:MAIL:250:RCPT:250:QUIT:250'
 LOG: MAIN REJECT
   H=(me) [V4NET.0.0.7] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: relay not permitted
 LOG: smtp_connection MAIN
@@ -344,6 +361,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:LHLO:250:MAIL:250:RCPT:550:QUIT:250'
 LOG: MAIN REJECT
   H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.lmtp>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.lmtp>: 550 Recipient not liked
 LOG: smtp_connection MAIN
@@ -353,6 +371,7 @@ LOG: smtp_connection MAIN
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP(closed)<<
   SMTP(close)>>
+cmdlog: '(unset)'
 LOG: MAIN REJECT
   H=(test) [V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Remote host closed connection in response to initial connection
 LOG: MAIN REJECT

diff --git a/test/stderr/0276 b/test/stderr/0276
index 3519ecf166f02fde7ccddb978c06e811a0d0df3f..eb289faae253fab90a30a0285bf2b8f53d51bd9d 100644 (file)
--- a/test/stderr/0276
+++ b/test/stderr/0276
@@ -17,6 +17,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP(shutdown)>>
   SMTP<< 200 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:500:QUIT:200'
 LOG: MAIN
   ** userx@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined DATA: 500 NO
 LOG: MAIN
@@ -53,6 +54,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP(shutdown)>>
   SMTP<< 200 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:DATA:500:QUIT:200'
 LOG: MAIN
   ** usery@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after DATA: 500 NO
 LOG: MAIN

diff --git a/test/stderr/0332 b/test/stderr/0332
index 67efe896d50bf009f1e445bbf4a690572c47fbc2..4ca67a51cfe13f2c2d11b82ee7e937c7918501c5 100644 (file)
--- a/test/stderr/0332
+++ b/test/stderr/0332
@@ -34,6 +34,7 @@ After routing:
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-t1.lockfile
+cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:250'
 LOG: MAIN
   => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
@@ -80,6 +81,7 @@ After routing:
     delay@test.again.dns
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-t1.lockfile
+cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:250:QUIT:250'
 LOG: MAIN
   => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK"
 >>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/0333 b/test/stderr/0333
index a1ca416aaed358fd5bf93afe7e4d9f49c9fdcea7..1acaa1f9ef4aca848d3985d8996adf5067a4f285 100644 (file)
--- a/test/stderr/0333
+++ b/test/stderr/0333
@@ -32,6 +32,7 @@ After routing:
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-t1.lockfile
+cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:250'
 LOG: MAIN
   => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
@@ -78,6 +79,7 @@ After routing:
     delay@test.again.dns
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-t1.lockfile
+cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:250:QUIT:250'
 LOG: MAIN
   => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK"
 >>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/0357 b/test/stderr/0357
index 53ecffabeaa4ab251cfa15a32d99077fe13f987a..6881590d687f0598c223bb28a52e05eb3c900c8d 100644 (file)
--- a/test/stderr/0357
+++ b/test/stderr/0357
@@ -26,6 +26,7 @@ checking status of 127.0.0.1
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 added retry item for R:userx@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT:250'
 reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess
   added retry item
 LOG: MAIN
@@ -70,6 +71,7 @@ locking TESTSUITE/spool/db/retry.lockfile
 no host retry record
 no message retry record
 added retry item for R:userx@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT:250'
 reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess
   existing delete item dropped
   added retry item
@@ -127,6 +129,7 @@ locking TESTSUITE/spool/db/retry.lockfile
 no host retry record
 no message retry record
 added retry item for R:userx@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT:250'
 reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess
   existing delete item dropped
   added retry item

diff --git a/test/stderr/0358 b/test/stderr/0358
index 219691d4a0e64272b46dc697695eb25ea7faa3f4..abc5f64c3b4afa4943853171349270d3864cebcf 100644 (file)
--- a/test/stderr/0358
+++ b/test/stderr/0358
@@ -32,6 +32,7 @@ locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 added retry item for R:userx@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0
 added retry item for R:usery@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:RCPT:451:QUIT:250'
 reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess
   added retry item
 reading retry information for R:usery@test.ex:<CALLER@test.ex> from subprocess
@@ -95,6 +96,7 @@ no host retry record
 no message retry record
 added retry item for R:userx@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0
 added retry item for R:usery@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:RCPT:451:QUIT:250'
 reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess
   existing delete item dropped
   added retry item

diff --git a/test/stderr/0374 b/test/stderr/0374
index 5bdf559ed339538135727b3c2667d68360b8660a..69f54579bc885705027d7958eb4eeb84317b4523 100644 (file)
--- a/test/stderr/0374
+++ b/test/stderr/0374
@@ -367,13 +367,16 @@ LOG: MAIN
   == c1@myhost.test.ex R=ut3 T=ut3 defer (0): Child process of ut3 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-ut4.lockfile
+cmdlog: '220'
 LOG: MAIN
   => d1@myhost.test.ex R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1] C="250 OK"
 locking TESTSUITE/spool/db/retry.lockfile
+cmdlog: '220'
 LOG: MAIN
   == d2@myhost.test.ex R=ut4 T=ut4 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d2@myhost.test.ex>: 450 soft error
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-ut4.lockfile
+cmdlog: '220'
 LOG: MAIN
   ** d3@myhost.test.ex R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d3@myhost.test.ex>: 550 hard error
 locking TESTSUITE/spool/db/retry.lockfile

diff --git a/test/stderr/0375 b/test/stderr/0375
index 6c8f00010bdbceccc33252e973308cf6f474c5f3..0f16b9e527b21f313125564b561455426fe540c6 100644 (file)
--- a/test/stderr/0375
+++ b/test/stderr/0375
@@ -802,34 +802,41 @@ LOG: MAIN
 log writing disabled
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-ut4.lockfile
+cmdlog: '220'
 LOG: MAIN
   => d1@myhost.test.ex P=<> R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1] C="250 OK"
 log writing disabled
 locking TESTSUITE/spool/db/retry.lockfile
+cmdlog: '220'
 LOG: MAIN
   == d2@myhost.test.ex R=ut4 T=ut4 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d2@myhost.test.ex>: 450 soft error
 log writing disabled
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-ut4.lockfile
+cmdlog: '220'
 LOG: MAIN
   ** d3@myhost.test.ex P=<> R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d3@myhost.test.ex>: 550 hard error
 log writing disabled
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-ut5.lockfile
+cmdlog: '220'
 LOG: MAIN
   ** e1@myhost.test.ex P=<> R=ut5 T=ut5 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<e1@myhost.test.ex>: 550 hard error
 log writing disabled
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-ut6.lockfile
+cmdlog: '220'
 LOG: MAIN
   => f1@myhost.test.ex P=<CALLER@myhost.test.ex> R=ut6 T=ut6 H=127.0.0.1 [127.0.0.1] C="250 OK"
 log writing disabled
 locking TESTSUITE/spool/db/retry.lockfile
+cmdlog: '220'
 LOG: MAIN
   == f2@myhost.test.ex R=ut6 T=ut6 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<f2@myhost.test.ex>: 450 soft error
 log writing disabled
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-ut6.lockfile
+cmdlog: '220'
 LOG: MAIN
   ** f3@myhost.test.ex P=<CALLER@myhost.test.ex> R=ut6 T=ut6 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<f3@myhost.test.ex>: 550 hard error
 log writing disabled

diff --git a/test/stderr/0376 b/test/stderr/0376
index 96c8347815f66a8b9a1464bd771ca29e888395eb..8fdcf31a78ab1812e61b15eaf3e2365a762a2918 100644 (file)
--- a/test/stderr/0376
+++ b/test/stderr/0376
@@ -23,6 +23,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:QUIT:250'
 wrote callout cache domain record for localhost:
   result=1 postmaster=0 random=0
 wrote positive callout cache address record for ok@localhost
@@ -94,6 +95,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:QUIT:250'
 wrote callout cache domain record for localhost:
   result=1 postmaster=0 random=0
 wrote negative callout cache address record for bad@localhost
@@ -148,6 +150,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:550:QUIT:250'
 wrote callout cache domain record for localhost:
   result=3 postmaster=0 random=0
 LOG: MAIN REJECT
@@ -209,6 +212,7 @@ Cutthrough cancelled by presence of postmaster verify
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:RSET:250:MAIL:250:RCPT:550:QUIT:250'
 wrote callout cache domain record for otherhost:
   result=1 postmaster=2 random=0
 wrote positive callout cache address record for ok@otherhost
@@ -271,6 +275,7 @@ Cutthrough cancelled by presence of postmaster verify
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:RSET:250:MAIL:250:RCPT:250:QUIT:250'
 wrote callout cache domain record for otherhost2:
   result=1 postmaster=1 random=0
 wrote positive callout cache address record for ok@otherhost2
@@ -320,6 +325,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:QUIT:250'
 wrote callout cache domain record for otherhost3:
   result=1 postmaster=0 random=1
 LOG: MAIN
@@ -370,6 +376,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:QUIT:250'
 wrote callout cache domain record for otherhost4:
   result=1 postmaster=0 random=1
 LOG: MAIN
@@ -433,6 +440,7 @@ Cutthrough cancelled by presence of postmaster verify
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:RSET:250:MAIL:250:RCPT:250:RSET:250:MAIL:250:RCPT:250:QUIT:250'
 wrote callout cache domain record for otherhost41:
   result=1 postmaster=1 random=2
 wrote positive callout cache address record for ok@otherhost41
@@ -490,6 +498,7 @@ Cutthrough cancelled by presence of postmaster verify
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:RSET:250:MAIL:250:RCPT:250:QUIT:250'
 wrote callout cache domain record for otherhost21:
   result=1 postmaster=1 random=0
 wrote positive callout cache address record for ok@otherhost21
@@ -522,6 +531,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:QUIT:250'
 wrote callout cache domain record for otherhost21:
   result=1 postmaster=1 random=0
 wrote positive callout cache address record for ok2@otherhost21
@@ -559,6 +569,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:RSET:250:MAIL:250:RCPT:250:QUIT:250'
 wrote callout cache domain record for otherhost31:
   result=1 postmaster=0 random=2
 wrote positive callout cache address record for ok@otherhost31
@@ -591,6 +602,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:QUIT:250'
 wrote callout cache domain record for otherhost31:
   result=1 postmaster=0 random=2
 wrote positive callout cache address record for okok@otherhost31
@@ -628,6 +640,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:RSET:250:MAIL:250:RCPT:250:QUIT:250'
 wrote callout cache domain record for otherhost31:
   result=1 postmaster=0 random=2
 wrote positive callout cache address record for okokok@otherhost31
@@ -658,6 +671,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP(Connection timed out)<<
 SMTP timeout
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT'
 wrote callout cache domain record for otherhost51:
   result=1 postmaster=0 random=0
 LOG: MAIN REJECT
@@ -699,6 +713,7 @@ Cutthrough cancelled by presence of postmaster verify
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:RSET:250:MAIL:250:RCPT:250:QUIT:250'
 wrote callout cache domain record for otherhost52:
   result=1 postmaster=1 random=0
 wrote positive callout cache address record for okokok@otherhost52
@@ -731,6 +746,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:QUIT:250'
 wrote callout cache domain record for x.y.z:
   result=1 postmaster=0 random=0
 wrote positive callout cache address record for abcd@x.y.z/<somesender@a.domain>
@@ -764,6 +780,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP(Connection timed out)<<
 SMTP timeout
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT'
 wrote callout cache domain record for x.y.z:
   result=1 postmaster=0 random=0
 LOG: MAIN
@@ -805,6 +822,7 @@ Cutthrough cancelled by presence of postmaster verify
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:RSET:250:MAIL:250:RCPT:550:RCPT:250:QUIT:250'
 wrote callout cache domain record for otherhost9:
   result=1 postmaster=1 random=0
 wrote positive callout cache address record for ok@otherhost9
@@ -849,6 +867,7 @@ Cutthrough cancelled by presence of postmaster verify
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:RSET:250:MAIL:250:RCPT:250:RSET:250:MAIL:250:RCPT:250:QUIT:250'
 wrote callout cache domain record for test.ex:
   result=1 postmaster=1 random=2
 wrote positive callout cache address record for z@test.ex/<postmaster@myhost.test.ex>

diff --git a/test/stderr/0388 b/test/stderr/0388
index c5acae2a8ec12679681db0bdfce129baccacbc4a..1c2a5a3886838a06e834d29c59df9ccde96817bc 100644 (file)
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -102,6 +102,7 @@ cmd buf flush ddd bytes (more expected)
   SMTP(shutdown)>>
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT:250'
 set_process_info: pppp delivering 10HmaX-0005vi-00: just tried 127.0.0.1 [127.0.0.1]:PORT_S for x@y: result OK
 address match test: subject=*@127.0.0.1 pattern=*
 127.0.0.1 in "*"? yes (matched "*")

diff --git a/test/stderr/0398 b/test/stderr/0398
index d14f1056a812a84f698ae5cc66a0ae58eec4c29d..81854ad9b2ee054bf8fb4e680eb96b729495963a 100644 (file)
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -150,6 +150,7 @@ sync_responses expect rcpt for qq@remote
 cmd buf flush ddd bytes
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:QUIT:250'
  locking TESTSUITE/spool/db/callout.lockfile
  locked  TESTSUITE/spool/db/callout.lockfile
  EXIM_DBOPEN: file <TESTSUITE/spool/db/callout> dir <TESTSUITE/spool/db> flags=O_RDWR|O_CREAT

diff --git a/test/stderr/0426 b/test/stderr/0426
index 0ac7207b20826ad573ad229c19315723cbfe8c1d..23080e96d89f52f1c973be469c726c8165a59e37 100644 (file)
--- a/test/stderr/0426
+++ b/test/stderr/0426
@@ -49,6 +49,7 @@ After routing:
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-t1.lockfile
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:QUIT:250'
 LOG: MAIN
   ** x@uppercase.test.ex R=r1 T=t1 H=uppercase.test.ex [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@UpperCase.test.ex>: 550 Unknown
 Exim version x.yz ....

diff --git a/test/stderr/0432 b/test/stderr/0432
index 2f55fa252d0dead8950e3987dce7cd59b9e91f24..f1c2fa55324234c1af7d15483acec4721280b11f 100644 (file)
--- a/test/stderr/0432
+++ b/test/stderr/0432
@@ -117,6 +117,7 @@ sync_responses expect rcpt for x@y
 cmd buf flush ddd bytes
   SMTP<< 220 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:QUIT:220'
  locking TESTSUITE/spool/db/callout.lockfile
  locked  TESTSUITE/spool/db/callout.lockfile
  EXIM_DBOPEN: file <TESTSUITE/spool/db/callout> dir <TESTSUITE/spool/db> flags=O_RDWR|O_CREAT
@@ -292,6 +293,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> cmd buf flush 6 bytes
 >>>   SMTP<< 220 OK
 >>>   SMTP(close)>>
+>>> cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:QUIT:220'
 >>> wrote callout cache domain record for b:
 >>>   result=1 postmaster=0 random=0
 >>> wrote positive callout cache address record for a@b
@@ -328,6 +330,7 @@ MUNGED: ::1 will be omitted in what follows
 >>>   SMTP>> EHLO myhost.test.ex
 >>> cmd buf flush 21 bytes
 >>>   SMTP(close)>>
+>>> cmdlog: '220:EHLO'
 >>> SMTP timeout
 >>> ----------- end verify ------------
 >>> accept: condition test deferred in ACL "mail"

diff --git a/test/stderr/0462 b/test/stderr/0462
index 0cf9bd41224da0a89fc6c8cde602af7b47ff5622..0fc6bd06afe6fd0420331c9864a8faf17cd922b5 100644 (file)
--- a/test/stderr/0462
+++ b/test/stderr/0462
@@ -30,6 +30,7 @@ Cutthrough cancelled by presence of postmaster verify
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:RSET:250:MAIL:250:RCPT:550:QUIT:250'
 wrote callout cache domain record for localhost:
   result=1 postmaster=2 random=0
 wrote positive callout cache address record for Ok@localhost
@@ -74,6 +75,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:QUIT:250'
 wrote callout cache domain record for elsewhere:
   result=1 postmaster=0 random=0
 wrote negative callout cache address record for NOTok@elsewhere
@@ -109,6 +111,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:QUIT:250'
 wrote callout cache domain record for elsewhere:
   result=1 postmaster=0 random=0
 wrote negative callout cache address record for NOTok2@elsewhere

diff --git a/test/stderr/0467 b/test/stderr/0467
index 54d1e8bc1f98b15a7a72b596ff0018eae6be0e8f..6c6ce3ede46c7f4c2d26c42b7ab4c985420283d8 100644 (file)
--- a/test/stderr/0467
+++ b/test/stderr/0467
@@ -28,11 +28,13 @@ Connecting to localhost.test.ex [127.0.0.1]:1224 ...  connected
   SMTP>> DATA
   SMTP<< 354 OK
   SMTP>> writing message and terminating "."
+  SMTP>> .
   SMTP<< 250 OK
   SMTP+> QUIT
   SMTP(shutdown)>>
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:DATA:354:.:250:QUIT:250'
 LOG: MAIN
   => x@srv27.test.ex R=r1 T=t1 H=localhost.test.ex [127.0.0.1]:1224 C="250 OK"
 LOG: MAIN

diff --git a/test/stderr/0473 b/test/stderr/0473
index d9bdd31dc701db413ee0609ced317d9c263a8892..ad6ff23a27f3bb058906c362444d164df58efd4f 100644 (file)
--- a/test/stderr/0473
+++ b/test/stderr/0473
@@ -22,6 +22,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP(Connection timed out)<<
 SMTP timeout
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT'
 wrote callout cache domain record for two.test.ex:
   result=1 postmaster=0 random=0
 LOG: MAIN REJECT
@@ -46,6 +47,7 @@ interface=NULL port=1224
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP(Connection timed out)<<
   SMTP(close)>>
+cmdlog: '(unset)'
 SMTP timeout
 LOG: MAIN REJECT
   U=CALLER F=<x11@two.test.ex> temporarily rejected RCPT r11@two.test.ex: Could not complete recipient verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after initial connection

diff --git a/test/stderr/0476 b/test/stderr/0476
index 98baf51207fb185ba607731ac3a2f5bc259f72d6..ea51b3f53796f0a20bce79c8a9b9dd7deac61882 100644 (file)
--- a/test/stderr/0476
+++ b/test/stderr/0476
@@ -48,6 +48,7 @@ cmd buf flush ddd bytes
   SMTP(closed)<<
 H=127.0.0.1 [127.0.0.1] Remote host closed connection in response to RSET
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:550:RSET'
 set_process_info: pppp delivering 10HmaX-0005vi-00: just tried 127.0.0.1 [127.0.0.1]:PORT_S for userx@test.ex: result OK
 Leaving t1 transport
 set_process_info: pppp delivering 10HmaX-0005vi-00 (just run t1 for userx@test.ex in subprocess)

diff --git a/test/stderr/0525 b/test/stderr/0525
index 21bc7e06421222ee371520a07788f0e96e823bc4..cb4aae2665df25dfc9eb069798721acfdb2591a6 100644 (file)
--- a/test/stderr/0525
+++ b/test/stderr/0525
@@ -15,6 +15,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP<< 354 SEND
   SMTP>> writing message and terminating "."
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:DATA:354'
 LOG: MAIN
   H=127.0.0.1 [127.0.0.1]: SMTP timeout after sending data block (ddd bytes written): Connection timed out
 LOG: MAIN

diff --git a/test/stderr/0543 b/test/stderr/0543
index 4a12a9b90862a61f7427fcf2e262729c7ac4965a..8aa6d862d6851eed585f5dff2ea515bf6b338158 100644 (file)
--- a/test/stderr/0543
+++ b/test/stderr/0543
@@ -33,6 +33,7 @@ After routing:
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-smtp.lockfile
+cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:DATA:354:.:250:QUIT:250'
 LOG: MAIN
   => userx@domain1 R=smarthost T=smtp H=thisloop.test.ex [127.0.0.1] C="250 OK"
 LOG: MAIN

diff --git a/test/stderr/0554 b/test/stderr/0554
index 3ddb40ee25da239cf9b185689abd05c6c9fbc78b..3c72f66831a474500afe14545ee4645548e4015b 100644 (file)
--- a/test/stderr/0554
+++ b/test/stderr/0554
@@ -19,6 +19,7 @@ checking status of 127.0.0.1
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 added retry item for R:x@y:<CALLER@myhost.test.ex>: errno=-44 more_errno=dd,A flags=0
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT:250'
 reading retry information for R:x@y:<CALLER@myhost.test.ex> from subprocess
   added retry item
 LOG: MAIN
@@ -62,6 +63,7 @@ no message retry record
 added retry item for R:x@y:<CALLER@myhost.test.ex>: errno=dd more_errno=dd,A flags=1
 added retry item for R:x@y: errno=dd more_errno=dd,A flags=1
 locking TESTSUITE/spool/db/wait-smtp.lockfile
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:DATA:354:.:250:QUIT:250'
 reading retry information for R:x@y from subprocess
   existing delete item dropped
   added delete item

diff --git a/test/stderr/0578 b/test/stderr/0578
index 3be9e2a1c6512f3376fc3b9653280ce5d6a7be03..94f44370eb566cffe184b48eb0a6a72d110d7b56 100644 (file)
--- a/test/stderr/0578
+++ b/test/stderr/0578
@@ -25,6 +25,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT:250:250:QUIT:250'
 wrote callout cache domain record for localhost:
   result=1 postmaster=0 random=0
 wrote positive callout cache address record for ok@localhost
@@ -98,6 +99,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT:250:550:QUIT:250'
 wrote callout cache domain record for localhost:
   result=1 postmaster=0 random=0
 wrote negative callout cache address record for bad@localhost
@@ -156,6 +158,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT:550:530:QUIT:250'
 wrote callout cache domain record for localhost:
   result=3 postmaster=0 random=0
 LOG: MAIN REJECT
@@ -219,6 +222,7 @@ Cutthrough cancelled by presence of postmaster verify
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT:250:250:RSET:250:MAIL|:RCPT:250:550:QUIT:250'
 wrote callout cache domain record for otherhost:
   result=1 postmaster=2 random=0
 wrote positive callout cache address record for ok@otherhost
@@ -283,6 +287,7 @@ Cutthrough cancelled by presence of postmaster verify
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT:250:250:RSET:250:MAIL|:RCPT:250:250:QUIT:250'
 wrote callout cache domain record for otherhost2:
   result=1 postmaster=1 random=0
 wrote positive callout cache address record for ok@otherhost2
@@ -334,6 +339,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT:250:250:QUIT:250'
 wrote callout cache domain record for otherhost3:
   result=1 postmaster=0 random=1
 LOG: MAIN
@@ -386,6 +392,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT:250:250:QUIT:250'
 wrote callout cache domain record for otherhost4:
   result=1 postmaster=0 random=1
 LOG: MAIN
@@ -451,6 +458,7 @@ Cutthrough cancelled by presence of postmaster verify
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT:250:550:RSET:250:MAIL|:RCPT:250:250:RSET:250:MAIL|:RCPT:250:250:QUIT:250'
 wrote callout cache domain record for otherhost41:
   result=1 postmaster=1 random=2
 wrote positive callout cache address record for ok@otherhost41
@@ -510,6 +518,7 @@ Cutthrough cancelled by presence of postmaster verify
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT:250:250:RSET:250:MAIL|:RCPT:250:250:QUIT:250'
 wrote callout cache domain record for otherhost21:
   result=1 postmaster=1 random=0
 wrote positive callout cache address record for ok@otherhost21
@@ -544,6 +553,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT:250:250:QUIT:250'
 wrote callout cache domain record for otherhost21:
   result=1 postmaster=1 random=0
 wrote positive callout cache address record for ok2@otherhost21
@@ -583,6 +593,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT:250:550:RSET:250:MAIL|:RCPT:250:250:QUIT:250'
 wrote callout cache domain record for otherhost31:
   result=1 postmaster=0 random=2
 wrote positive callout cache address record for ok@otherhost31
@@ -617,6 +628,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT:250:250:QUIT:250'
 wrote callout cache domain record for otherhost31:
   result=1 postmaster=0 random=2
 wrote positive callout cache address record for okok@otherhost31
@@ -656,6 +668,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT:250:550:RSET:250:MAIL|:RCPT:250:250:QUIT:250'
 wrote callout cache domain record for otherhost31:
   result=1 postmaster=0 random=2
 wrote positive callout cache address record for okokok@otherhost31
@@ -688,6 +701,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP(Connection timed out)<<
 SMTP timeout
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT:250'
 wrote callout cache domain record for otherhost51:
   result=1 postmaster=0 random=0
 LOG: MAIN REJECT
@@ -731,6 +745,7 @@ Cutthrough cancelled by presence of postmaster verify
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT:250:250:RSET:250:MAIL|:RCPT:250:250:QUIT:250'
 wrote callout cache domain record for otherhost52:
   result=1 postmaster=1 random=0
 wrote positive callout cache address record for okokok@otherhost52
@@ -765,6 +780,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT:250:250:QUIT:250'
 wrote callout cache domain record for x.y.z:
   result=1 postmaster=0 random=0
 wrote positive callout cache address record for abcd@x.y.z/<somesender@a.domain>
@@ -800,6 +816,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP(Connection timed out)<<
 SMTP timeout
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT:250'
 wrote callout cache domain record for x.y.z:
   result=1 postmaster=0 random=0
 LOG: MAIN
@@ -843,6 +860,7 @@ Cutthrough cancelled by presence of postmaster verify
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT:250:250:RSET:250:MAIL|:RCPT:250:550:RCPT:250:QUIT:250'
 wrote callout cache domain record for otherhost9:
   result=1 postmaster=1 random=0
 wrote positive callout cache address record for ok@otherhost9
@@ -889,6 +907,7 @@ Cutthrough cancelled by presence of postmaster verify
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT:250:550:RSET:250:MAIL|:RCPT:250:250:RSET:250:MAIL|:RCPT:250:250:QUIT:250'
 wrote callout cache domain record for test.ex:
   result=1 postmaster=1 random=2
 wrote positive callout cache address record for z@test.ex/<postmaster@myhost.test.ex>

diff --git a/test/stderr/0623 b/test/stderr/0623
index 8abd7b0750ee7c99cff0309096dec3f430dd76c9..b98d9285cebd2fdee6b7e0124fde88cdcef5fd75 100644 (file)
--- a/test/stderr/0623
+++ b/test/stderr/0623
@@ -43,6 +43,7 @@ transport_check_waiting entered
 transport_check_waiting: FALSE
 will pipeline QUIT
 cannot use sendfile for body: spoolfile not wireformat
+  SMTP>> .
 writing data block fd=dddd size=sss timeout=300 (more expected)
   SMTP+> QUIT
 cmd buf flush ddd bytes (more expected)
@@ -53,6 +54,7 @@ LOG: MAIN
 ok=0 send_quit=0 send_rset=1 continue_more=0 yield=0 first_address is NULL
   SMTP<< 221 Closing connection
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:300:.:QUIT:451:221'
 added retry item for T:127.0.0.1:127.0.0.1:1225:10HmaZ-0005vi-00: errno=-46 more_errno=dd,A flags=6
 all IP addresses skipped or deferred at least one address
 Leaving send_to_server transport
@@ -107,6 +109,7 @@ transport_check_waiting entered
 transport_check_waiting: FALSE
 will pipeline QUIT
 cannot use sendfile for body: spoolfile not wireformat
+  SMTP>> .
 writing data block fd=dddd size=sss timeout=300 (more expected)
   SMTP+> QUIT
 cmd buf flush ddd bytes (more expected)
@@ -115,6 +118,7 @@ cmd buf flush ddd bytes (more expected)
 ok=0 send_quit=0 send_rset=1 continue_more=0 yield=0 first_address is NULL
   SMTP<< 221 Closing connection
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:300:.:QUIT:550:221'
 Leaving send_to_server transport
 LOG: MAIN
   ** permreject@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 550 content rejected
@@ -171,6 +175,7 @@ transport_check_waiting entered
 transport_check_waiting: FALSE
 will pipeline QUIT
 cannot use sendfile for body: spoolfile not wireformat
+  SMTP>> .
 writing data block fd=dddd size=sss timeout=300 (more expected)
   SMTP+> QUIT
 cmd buf flush ddd bytes (more expected)
@@ -181,6 +186,7 @@ LOG: MAIN
 ok=0 send_quit=0 send_rset=1 continue_more=0 yield=0 first_address is NULL
   SMTP(closed)<<
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:300:.:QUIT'
 added retry item for T:127.0.0.1:127.0.0.1:1225:10HmbB-0005vi-00: errno=-18 more_errno=dd,A flags=6
 all IP addresses skipped or deferred at least one address
 Leaving send_to_server transport

diff --git a/test/stderr/0911 b/test/stderr/0911
index 9ea7f1f250401d06033e3032af14cec3858378ea..2f78100f1036b3f32d5dccbf1a1a5f95113c3fd3 100644 (file)
--- a/test/stderr/0911
+++ b/test/stderr/0911
@@ -55,6 +55,7 @@ sync_responses expect rcpt for good@test.ex
 ok=1 send_quit=0 send_rset=0 continue_more=0 yield=0 first_address is NULL
   SMTP<< 221 Closing connection
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT|:BDAT:QUIT:250:250:250:221'
 Leaving send_to_server transport
 LOG: MAIN
   => good@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L K C="250 OK chunked message data"
@@ -119,6 +120,7 @@ cmd buf flush ddd bytes (more expected)
   SMTP(shutdown)>>
   SMTP<< 221 Closing connection
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:BDAT:250:QUIT:221'
 Leaving send_to_server transport
 LOG: MAIN
   => nopipe@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] K C="250 OK chunked message data"
@@ -186,6 +188,7 @@ LOG: MAIN
 ok=0 send_quit=0 send_rset=1 continue_more=0 yield=0 first_address is NULL
   SMTP<< 221 Closing connection
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT|:BDAT:QUIT:250:250:451:221'
 added retry item for T:127.0.0.1:127.0.0.1:1225:10HmaZ-0005vi-00: errno=-46 more_errno=dd,A flags=6
 all IP addresses skipped or deferred at least one address
 Leaving send_to_server transport
@@ -253,6 +256,7 @@ sync_responses expect rcpt for permreject@test.ex
 ok=0 send_quit=0 send_rset=1 continue_more=0 yield=0 first_address is NULL
   SMTP<< 221 Closing connection
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT|:BDAT:QUIT:250:250:550:221'
 Leaving send_to_server transport
 LOG: MAIN
   ** permreject@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 550 content rejected
@@ -324,6 +328,7 @@ LOG: MAIN
 ok=0 send_quit=0 send_rset=1 continue_more=0 yield=0 first_address is NULL
   SMTP(closed)<<
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT|:BDAT:QUIT:250:250'
 added retry item for T:127.0.0.1:127.0.0.1:1225:10HmbB-0005vi-00: errno=-18 more_errno=dd,A flags=6
 all IP addresses skipped or deferred at least one address
 Leaving send_to_server transport

diff --git a/test/stderr/1150 b/test/stderr/1150
index 9ba4234e7338fbf3113635b856413c83973072cc..7c53000c2702054942211a1196280b3e69d49083 100644 (file)
--- a/test/stderr/1150
+++ b/test/stderr/1150
@@ -25,10 +25,12 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ...  connected
   SMTP<< 250 Accepted
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP>> writing message and terminating "."
+  SMTP>> .
   SMTP>> QUIT
   SMTP<< 250 OK id=10HmaZ-0005vi-00
   SMTP<< 221 myhost.test.ex closing connection
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:STARTTLS:220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:QUIT:250:221'
 LOG: MAIN
   => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaZ-0005vi-00"
 LOG: MAIN
@@ -60,10 +62,12 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ...  connected
   SMTP<< 250 Accepted
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP>> writing message and terminating "."
+  SMTP>> .
   SMTP>> QUIT
   SMTP<< 250 OK id=10HmbA-0005vi-00
   SMTP<< 221 myhost.test.ex closing connection
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:STARTTLS:220:EHLO:250-:MAIL|:RCPT|:RCPT|:DATA:250:250:250:354:.:QUIT:250:221'
 LOG: MAIN
   => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00"
 LOG: MAIN
@@ -92,10 +96,12 @@ Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ...  connected
   SMTP<< 250 Accepted
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP>> writing message and terminating "."
+  SMTP>> .
   SMTP>> QUIT
   SMTP<< 250 OK id=10HmbB-0005vi-00
   SMTP<< 221 myhost.test.ex closing connection
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:STARTTLS:220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:QUIT:250:221'
 LOG: MAIN
   => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbB-0005vi-00"
 LOG: MAIN

diff --git a/test/stderr/1157 b/test/stderr/1157
index d5274fb8e74f89d76cb7f5d26c20d5641855b191..2eecddf911e43fbc7c1432e57b26c4ded3ccb07d 100644 (file)
--- a/test/stderr/1157
+++ b/test/stderr/1157
@@ -34,6 +34,7 @@ cmd buf flush ddd bytes
   SMTP<< 250 OK
   SMTP<< 250 Accepted
   SMTP<< 354 Enter message, ending with "." on a line by itself
+  SMTP>> .
   SMTP<< 250 OK id=10HmbA-0005vi-00
 LOG: MAIN
   => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00"
@@ -52,8 +53,10 @@ cmd buf flush ddd bytes
   SMTP<< 250 OK
   SMTP<< 250 Accepted
   SMTP<< 354 Enter message, ending with "." on a line by itself
+  SMTP>> .
   SMTP<< 250 OK id=10HmbB-0005vi-00
   SMTP(close)>>
+cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:250'
 LOG: MAIN
   => userz@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbB-0005vi-00"
 LOG: MAIN
@@ -71,6 +74,7 @@ cmd buf flush ddd bytes
   SMTP<< 250 OK
   SMTP<< 250 Accepted
   SMTP<< 354 Enter message, ending with "." on a line by itself
+  SMTP>> .
   SMTP+> QUIT
 cmd buf flush ddd bytes (more expected)
   SMTP(shutdown)>>
@@ -78,6 +82,7 @@ cmd buf flush ddd bytes (more expected)
   SMTP<< 250 OK id=10HmbC-0005vi-00
   SMTP<< 221 myhost.test.ex closing connection
   SMTP(close)>>
+cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:QUIT:250:221'
 LOG: MAIN
   => usery@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbC-0005vi-00"
 LOG: MAIN
@@ -123,6 +128,7 @@ cmd buf flush ddd bytes
   SMTP<< 250 OK
   SMTP<< 250 Accepted
   SMTP<< 354 Enter message, ending with "." on a line by itself
+  SMTP>> .
   SMTP<< 250 OK id=10HmbG-0005vi-00
 LOG: MAIN
   => usera@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbG-0005vi-00"
@@ -141,8 +147,10 @@ cmd buf flush ddd bytes
   SMTP<< 250 OK
   SMTP<< 250 Accepted
   SMTP<< 354 Enter message, ending with "." on a line by itself
+  SMTP>> .
   SMTP<< 250 OK id=10HmbH-0005vi-00
   SMTP(close)>>
+cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:250'
 LOG: MAIN
   => userc@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbH-0005vi-00"
 LOG: MAIN
@@ -160,6 +168,7 @@ cmd buf flush ddd bytes
   SMTP<< 250 OK
   SMTP<< 250 Accepted
   SMTP<< 354 Enter message, ending with "." on a line by itself
+  SMTP>> .
   SMTP+> QUIT
 cmd buf flush ddd bytes (more expected)
   SMTP(shutdown)>>
@@ -167,6 +176,7 @@ cmd buf flush ddd bytes (more expected)
   SMTP<< 250 OK id=10HmbI-0005vi-00
   SMTP<< 221 myhost.test.ex closing connection
   SMTP(close)>>
+cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:QUIT:250:221'
 LOG: MAIN
   => userb@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbI-0005vi-00"
 LOG: MAIN
@@ -212,6 +222,7 @@ cmd buf flush ddd bytes
   SMTP<< 250 OK
   SMTP<< 250 Accepted
   SMTP<< 354 Enter message, ending with "." on a line by itself
+  SMTP>> .
   SMTP<< 250 OK id=10HmbM-0005vi-00
   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes
@@ -222,6 +233,7 @@ cmd buf flush ddd bytes
          250-STARTTLS
          250 HELP
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:STARTTLS:220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:250:EHLO:250-'
 LOG: MAIN
   => user_p@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbM-0005vi-00"
 LOG: MAIN
@@ -249,6 +261,7 @@ cmd buf flush ddd bytes
   SMTP<< 250 OK
   SMTP<< 250 Accepted
   SMTP<< 354 Enter message, ending with "." on a line by itself
+  SMTP>> .
   SMTP<< 250 OK id=10HmbN-0005vi-00
   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes
@@ -259,6 +272,7 @@ cmd buf flush ddd bytes
          250-STARTTLS
          250 HELP
   SMTP(close)>>
+cmdlog: 'STARTTLS:220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:250:EHLO:250-'
 LOG: MAIN
   => user_r@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbN-0005vi-00"
 LOG: MAIN
@@ -286,11 +300,13 @@ cmd buf flush ddd bytes
   SMTP<< 250 OK
   SMTP<< 250 Accepted
   SMTP<< 354 Enter message, ending with "." on a line by itself
+  SMTP>> .
   SMTP>> QUIT
 cmd buf flush ddd bytes
   SMTP<< 250 OK id=10HmbO-0005vi-00
   SMTP<< 221 myhost.test.ex closing connection
   SMTP(close)>>
+cmdlog: 'STARTTLS:220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:QUIT:250:221'
 LOG: MAIN
   => user_q@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbO-0005vi-00"
 LOG: MAIN

diff --git a/test/stderr/1160 b/test/stderr/1160
index cdbad361451a2fb4416e6a99e76198f5a240d11c..a4fabf38520adc2e0880f3649e635c2564ebc42c 100644 (file)
--- a/test/stderr/1160
+++ b/test/stderr/1160
@@ -16,10 +16,12 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ...  connected
   SMTP<< 250 Accepted
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP>> writing message and terminating "."
+  SMTP>> .
   SMTP>> QUIT
   SMTP<< 250 OK id=10HmaZ-0005vi-00
   SMTP<< 221 myhost.test.ex closing connection
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:QUIT:250:221'
 LOG: MAIN
   => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaZ-0005vi-00"
 LOG: MAIN
@@ -42,10 +44,12 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ...  connected
   SMTP<< 250 Accepted
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP>> writing message and terminating "."
+  SMTP>> .
   SMTP>> QUIT
   SMTP<< 250 OK id=10HmbA-0005vi-00
   SMTP<< 221 myhost.test.ex closing connection
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT|:RCPT|:DATA:250:250:250:354:.:QUIT:250:221'
 LOG: MAIN
   => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00"
 LOG: MAIN
@@ -65,10 +69,12 @@ Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ...  connected
   SMTP<< 250 Accepted
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP>> writing message and terminating "."
+  SMTP>> .
   SMTP>> QUIT
   SMTP<< 250 OK id=10HmbB-0005vi-00
   SMTP<< 221 myhost.test.ex closing connection
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:QUIT:250:221'
 LOG: MAIN
   => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbB-0005vi-00"
 LOG: MAIN

diff --git a/test/stderr/2035 b/test/stderr/2035
index c15645ce0de22351c2f84f64560699d41a659bc6..308b3358de4182489d88da3f27bbae459926c432 100644 (file)
--- a/test/stderr/2035
+++ b/test/stderr/2035
@@ -59,6 +59,7 @@ sync_responses expect data
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP>> writing message and terminating "."
 cannot use sendfile for body: spoolfile not wireformat
+  SMTP>> .
 writing data block fd=dddd size=sss timeout=300
   SMTP<< 250 OK id=10HmaY-0005vi-00
 ok=1 send_quit=1 send_rset=0 continue_more=0 yield=0 first_address is NULL
@@ -68,6 +69,7 @@ cmd buf flush ddd bytes (more expected)
   SMTP(TLS shutdown)>>
   SMTP<< 221 myhost.test.ex closing connection
   SMTP(close)>>
+cmdlog: 'DATA:354:.:250:QUIT:221'
 Leaving t1 transport
 LOG: MAIN
   => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:1225 X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmaY-0005vi-00"

diff --git a/test/stderr/2135 b/test/stderr/2135
index c15645ce0de22351c2f84f64560699d41a659bc6..308b3358de4182489d88da3f27bbae459926c432 100644 (file)
--- a/test/stderr/2135
+++ b/test/stderr/2135
@@ -59,6 +59,7 @@ sync_responses expect data
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP>> writing message and terminating "."
 cannot use sendfile for body: spoolfile not wireformat
+  SMTP>> .
 writing data block fd=dddd size=sss timeout=300
   SMTP<< 250 OK id=10HmaY-0005vi-00
 ok=1 send_quit=1 send_rset=0 continue_more=0 yield=0 first_address is NULL
@@ -68,6 +69,7 @@ cmd buf flush ddd bytes (more expected)
   SMTP(TLS shutdown)>>
   SMTP<< 221 myhost.test.ex closing connection
   SMTP(close)>>
+cmdlog: 'DATA:354:.:250:QUIT:221'
 Leaving t1 transport
 LOG: MAIN
   => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:1225 X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmaY-0005vi-00"

diff --git a/test/stderr/3404 b/test/stderr/3404
index ea3f7e0a9bd89565f9ec53015fa7da22badf48ff..17af167bc4c774bef1bf5182cb7c8b960c77462b 100644 (file)
--- a/test/stderr/3404
+++ b/test/stderr/3404
@@ -16,11 +16,13 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> DATA
   SMTP<< 354 Send data
   SMTP>> writing message and terminating "."
+  SMTP>> .
   SMTP<< 250 OK
   SMTP+> QUIT
   SMTP(shutdown)>>
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:AUTH:235:MAIL:250:RCPT:250:DATA:354:.:250:QUIT:250'
 LOG: MAIN
   => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] A=plain C="250 OK"
 LOG: MAIN
@@ -43,11 +45,13 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> DATA
   SMTP<< 354 Send data
   SMTP>> writing message and terminating "."
+  SMTP>> .
   SMTP<< 250 OK
   SMTP+> QUIT
   SMTP(shutdown)>>
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:AUTH:235:MAIL:250:RCPT:250:DATA:354:.:250:QUIT:250'
 LOG: MAIN
   => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] A=plain C="250 OK"
 LOG: MAIN
@@ -74,11 +78,13 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> DATA
   SMTP<< 354 Send data
   SMTP>> writing message and terminating "."
+  SMTP>> .
   SMTP<< 250 OK
   SMTP+> QUIT
   SMTP(shutdown)>>
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:AUTH:300:********:300:********:235:MAIL:250:RCPT:250:DATA:354:.:250:QUIT:250'
 LOG: MAIN
   => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] A=login C="250 OK"
 LOG: MAIN

diff --git a/test/stderr/4510 b/test/stderr/4510
index cfdbe6e299db15d913c8ab31720e2b340256eba4..f6a04869f02b91faf90bad77def9fe69517cba73 100644 (file)
--- a/test/stderr/4510
+++ b/test/stderr/4510
@@ -47,12 +47,14 @@ DKIM-Signature:{SP}v=1;{SP}a=rsa-sha256;{SP}q=dns/txt;{SP}c=relaxed/relaxed;{SP}
 DKIM >> Signed DKIM-Signature header, canonicalized (relaxed) >>>>>>>
 dkim-signature:v=1;{SP}a=rsa-sha256;{SP}q=dns/txt;{SP}c=relaxed/relaxed;{SP}d=test.ex;{SP}s=sel_bad;{SP}h=From;{SP}bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=;{SP}b=;
 DKIM [test.ex] Header sha256 computed: 241e16230df5723d899cfae9474c6b376a2ab1f81d1094e358f50ffd0e0067b3
+  SMTP>> .
   SMTP+> QUIT
 cmd buf flush ddd bytes (more expected)
   SMTP(shutdown)>>
   SMTP<< 250 OK id=10HmbL-0005vi-00
   SMTP<< 221 myhost.test.ex closing connection
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:QUIT:250:221'
 LOG: MAIN
   => d@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbL-0005vi-00"
 LOG: MAIN

diff --git a/test/stderr/4530 b/test/stderr/4530
index 4b93222f07813c620dfa5f35dc69601a93efe2f8..62a7b7bb00159e7409de6ff6d1e89f214c9b1561 100644 (file)
--- a/test/stderr/4530
+++ b/test/stderr/4530
@@ -58,11 +58,13 @@ DKIM-Signature:{SP}v=1;{SP}a=rsa-sha256;{SP}q=dns/txt;{SP}c=relaxed/relaxed;{SP}
 DKIM >> Signed DKIM-Signature header, canonicalized (relaxed) >>>>>>>
 dkim-signature:v=1;{SP}a=rsa-sha256;{SP}q=dns/txt;{SP}c=relaxed/relaxed;{SP}d=test.ex;{SP}s=sel_bad;{SP}h=From;{SP}bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=;{SP}b=;
 DKIM [test.ex] Header sha256 computed: 241e16230df5723d899cfae9474c6b376a2ab1f81d1094e358f50ffd0e0067b3
+  SMTP>> .
   SMTP>> QUIT
 cmd buf flush ddd bytes
   SMTP<< 250 OK id=10HmbL-0005vi-00
   SMTP<< 221 myhost.test.ex closing connection
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:STARTTLS:220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:QUIT:250:221'
 LOG: MAIN
   => d@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbL-0005vi-00"
 LOG: MAIN

diff --git a/test/stderr/5403 b/test/stderr/5403
index e7c605a0192a098f4fe9bc74eb1953cb1d6c7b47..17296572afab183962f28343bbf3590f8b421676 100644 (file)
--- a/test/stderr/5403
+++ b/test/stderr/5403
@@ -91,5 +91,6 @@ MUNGED: ::1 will be omitted in what follows
 >>>   SMTP>> QUIT
 >>>   SMTP<< 220 OK
 >>>   SMTP(close)>>
+>>> cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:QUIT:220'
 >>> ----------- cutthrough shutdown (host-checking mode) ------------
 LOG: 10HmaY-0005vi-00 <= sender@myhost.test.ex H=(myhost.test.ex) [1.2.3.4] P=esmtp S=sss for verify@domain.com

diff --git a/test/stderr/5410 b/test/stderr/5410
index 99a829e2b8fc848baeea021e8df17c25fea6c554..8599c878ae746351bc31b592fdb33ed016291478 100644 (file)
--- a/test/stderr/5410
+++ b/test/stderr/5410
@@ -513,6 +513,7 @@ LOG: MAIN
   SMTP>> QUIT
   SMTP<< 221 myhost.test.ex closing connection
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:STARTTLS:220:EHLO:250-:MAIL|:RCPT:250:250:DATA:354:250:QUIT:221'
 ----------- cutthrough shutdown (delivered) ------------
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss
@@ -997,6 +998,7 @@ LOG: MAIN
   SMTP>> QUIT
   SMTP<< 221 myhost.test.ex closing connection
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT:250:250:DATA:354:250:QUIT:221'
 ----------- cutthrough shutdown (delivered) ------------
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss
@@ -1481,6 +1483,7 @@ LOG: MAIN
   SMTP>> QUIT
   SMTP<< 221 myhost.test.ex closing connection
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT:250:250:DATA:354:250:QUIT:221'
 ----------- cutthrough shutdown (delivered) ------------
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss

diff --git a/test/stderr/5420 b/test/stderr/5420
index ff97dbbc7f81e444fc456844b35f4ab6be406df2..384a117365d0b6f496ded065bbd08969dc5fa6f1 100644 (file)
--- a/test/stderr/5420
+++ b/test/stderr/5420
@@ -514,6 +514,7 @@ LOG: MAIN
   SMTP>> QUIT
   SMTP<< 221 myhost.test.ex closing connection
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:STARTTLS:220:EHLO:250-:MAIL|:RCPT:250:250:DATA:354:250:QUIT:221'
 ----------- cutthrough shutdown (delivered) ------------
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss
@@ -998,6 +999,7 @@ LOG: MAIN
   SMTP>> QUIT
   SMTP<< 221 myhost.test.ex closing connection
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT:250:250:DATA:354:250:QUIT:221'
 ----------- cutthrough shutdown (delivered) ------------
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss
@@ -1482,6 +1484,7 @@ LOG: MAIN
   SMTP>> QUIT
   SMTP<< 221 myhost.test.ex closing connection
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT:250:250:DATA:354:250:QUIT:221'
 ----------- cutthrough shutdown (delivered) ------------
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss

diff --git a/test/stderr/5820 b/test/stderr/5820
index f5dbbfa2aeedbdaae80c97188e38df9a35af2e11..53291edf4dfae4053ff07d8629de01c520c9809f 100644 (file)
--- a/test/stderr/5820
+++ b/test/stderr/5820
@@ -57,6 +57,7 @@
 >>> cmd buf flush 6 bytes
 >>>   SMTP<< 221 myhost.test.ex closing connection
 >>>   SMTP(close)>>
+>>> cmdlog: '220:EHLO:250-:STARTTLS:220:EHLO:250-:MAIL|:RCPT:250:250:QUIT:221'
 >>> wrote callout cache domain record for dane256ee.test.ex:
 >>>   result=1 postmaster=0 random=0
 >>> wrote positive callout cache address record for rcptuser@dane256ee.test.ex

diff --git a/test/stderr/5840 b/test/stderr/5840
index 633d7c6930b93a3a434cdc682f668bc2bc616076..93a7bfd2c3fc3b72a522ea6d571cea846d678eff 100644 (file)
--- a/test/stderr/5840
+++ b/test/stderr/5840
@@ -57,6 +57,7 @@
 >>> cmd buf flush 6 bytes
 >>>   SMTP<< 221 myhost.test.ex closing connection
 >>>   SMTP(close)>>
+>>> cmdlog: '220:EHLO:250-:STARTTLS:220:EHLO:250-:MAIL|:RCPT:250:250:QUIT:221'
 >>> wrote callout cache domain record for dane256ee.test.ex:
 >>>   result=1 postmaster=0 random=0
 >>> wrote positive callout cache address record for rcptuser@dane256ee.test.ex