[exim-cvs] More regular logging use of H=<name> [<ip>]

Góra strony
Delete this message
Reply to this message
Autor: Exim Git Commits Mailing List
Data:  
Dla: exim-cvs
Temat: [exim-cvs] More regular logging use of H=<name> [<ip>]
Gitweb: http://git.exim.org/exim.git/commitdiff/c562fd30c03126dd72d76ec43842d9d00fcd8bf3
Commit:     c562fd30c03126dd72d76ec43842d9d00fcd8bf3
Parent:     6a7ed50f95285263f72f625f92ae3aa75edb7426
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Thu Sep 25 22:20:33 2014 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Wed Oct 22 16:14:25 2014 +0100


    More regular logging use of H=<name> [<ip>]


    Note this may affect utilities which parse logs.
---
 src/src/deliver.c                 |   20 ++-
 src/src/retry.c                   |    5 +-
 src/src/tls-gnu.c                 |    3 +-
 src/src/tls-openssl.c             |   17 +-
 src/src/transports/smtp.c         |  127 ++++++-----
 src/src/verify.c                  |    6 +-
 test/log/0098                     |   12 +-
 test/log/0099                     |    4 +-
 test/log/0106                     |    6 +-
 test/log/0109                     |    4 +-
 test/log/0135                     |    8 +-
 test/log/0160                     |    4 +-
 test/log/0163                     |    4 +-
 test/log/0197                     |    6 +-
 test/log/0198                     |    2 +-
 test/log/0201                     |    2 +-
 test/log/0203                     |    2 +-
 test/log/0208                     |    4 +-
 test/log/0209                     |    8 +-
 test/log/0211                     |   14 +-
 test/log/0213                     |    4 +-
 test/log/0215                     |   30 ++--
 test/log/0217                     |  452 ++++++++++++++++++------------------
 test/log/0218                     |    6 +-
 test/log/0228                     |    2 +-
 test/log/0229                     |   10 +-
 test/log/0253                     |    2 +-
 test/log/0257                     |    4 +-
 test/log/0276                     |    8 +-
 test/log/0285                     |    8 +-
 test/log/0286                     |   12 +-
 test/log/0322                     |   44 ++--
 test/log/0343                     |    2 +-
 test/log/0357                     |    6 +-
 test/log/0358                     |    8 +-
 test/log/0366                     |   28 ++--
 test/log/0374                     |    6 +-
 test/log/0388                     |    6 +-
 test/log/0426                     |    2 +-
 test/log/0429                     |    2 +-
 test/log/0447                     |    6 +-
 test/log/0450                     |    4 +-
 test/log/0455                     |   10 +-
 test/log/0461                     |   10 +-
 test/log/0474                     |    6 +-
 test/log/0476                     |    4 +-
 test/log/0477                     |    2 +-
 test/log/0478                     |    4 +-
 test/log/0495                     |   26 +-
 test/log/0497                     |   20 +-
 test/log/0498                     |    4 +-
 test/log/0504                     |    2 +-
 test/log/0511                     |   34 ++--
 test/log/0512                     |   16 +-
 test/log/0519                     |    4 +-
 test/log/0525                     |    4 +-
 test/log/0528                     |   14 +-
 test/log/0531                     |    8 +-
 test/log/0543                     |    4 +-
 test/log/0548                     |   32 ++--
 test/log/0550                     |    4 +-
 test/log/0552                     |    6 +-
 test/log/0553                     |    6 +-
 test/log/0554                     |    2 +-
 test/log/2000                     |    2 +-
 test/log/2001                     |    8 +-
 test/log/2009                     |    2 +-
 test/log/2010                     |    6 +-
 test/log/2012                     |    8 +-
 test/log/2016                     |    4 +-
 test/log/2021                     |    8 +-
 test/log/2025                     |    2 +-
 test/log/2027                     |    2 +-
 test/log/2100                     |    2 +-
 test/log/2101                     |    8 +-
 test/log/2109                     |    2 +-
 test/log/2110                     |    6 +-
 test/log/2111                     |    2 +-
 test/log/2112                     |    8 +-
 test/log/2116                     |    4 +-
 test/log/2120                     |    2 +-
 test/log/2121                     |    8 +-
 test/log/2125                     |    2 +-
 test/log/2126                     |    2 +-
 test/log/2127                     |    2 +-
 test/log/3209                     |    4 +-
 test/log/3401                     |    6 +-
 test/log/5440                     |    2 +-
 test/log/5450                     |    4 +-
 test/log/5510                     |   18 +-
 test/log/5601                     |   12 +-
 test/log/5608                     |   12 +-
 test/log/5651                     |   12 +-
 test/log/5658                     |   12 +-
 test/log/5700                     |    8 +-
 test/log/5750                     |    2 +-
 test/log/5760                     |    2 +-
 test/mail/0211.CALLER             |    9 +-
 test/mail/0253.lmn                |    3 +-
 test/mail/0374.CALLER             |    3 +-
 test/mail/0375.CALLER             |    3 +-
 test/mail/0531.CALLER             |    5 +-
 test/msglog/0099.10HmaX-0005vi-00 |    4 +-
 test/msglog/0106.10HmaX-0005vi-00 |    4 +-
 test/msglog/0106.10HmaY-0005vi-00 |    4 +-
 test/msglog/0109.10HmaX-0005vi-00 |    4 +-
 test/msglog/0197.10HmaX-0005vi-00 |    4 +-
 test/msglog/0197.10HmaY-0005vi-00 |    2 +-
 test/msglog/0198.10HmaX-0005vi-00 |    2 +-
 test/msglog/0208.10HmaX-0005vi-00 |    4 +-
 test/runtest                      |    4 +-
 test/stderr/0217                  |  402 ++++++++++++++++----------------
 test/stderr/0218                  |    6 +-
 test/stderr/0276                  |    8 +-
 test/stderr/0357                  |   12 +-
 test/stderr/0358                  |   16 +-
 test/stderr/0374                  |    4 +-
 test/stderr/0375                  |   10 +-
 test/stderr/0388                  |    8 +-
 test/stderr/0426                  |    2 +-
 test/stderr/0450                  |    4 +-
 test/stderr/0476                  |    8 +-
 test/stderr/0495                  |   10 +-
 test/stderr/0512                  |   12 +-
 test/stderr/0525                  |    4 +-
 test/stderr/0554                  |    4 +-
 test/stdout/0213                  |    2 +-
 test/stdout/0357                  |    6 +-
 test/stdout/0358                  |    8 +-
 test/stdout/0474                  |    6 +-
 test/stdout/0497                  |    4 +-
 test/stdout/0498                  |    2 +-
 test/stdout/0548                  |   12 +-
 test/stdout/0554                  |    2 +-
 134 files changed, 982 insertions(+), 941 deletions(-)


diff --git a/src/src/deliver.c b/src/src/deliver.c
index c6339c6..6fac6d8 100644
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -758,6 +758,7 @@ tpda_msg_event(uschar * event, address_item * addr)
{
uschar * save_domain = deliver_domain;
uschar * save_local = deliver_localpart;
+uschar * save_host = deliver_host;

 if (!addr->transport)
   return;
@@ -766,11 +767,13 @@ router_name =    addr->router ? addr->router->name : NULL;
 transport_name = addr->transport->name;
 deliver_domain = addr->domain;
 deliver_localpart = addr->local_part;
+deliver_host =   addr->host_used ? addr->host_used->name : NULL;


 (void) tpda_raise_event(addr->transport->tpda_event_action, event,
       addr->host_used || Ustrcmp(addr->transport->driver_name, "lmtp") == 0
       ? addr->message : NULL);


+deliver_host =      save_host;
 deliver_localpart = save_local;
 deliver_domain =    save_domain;
 router_name = transport_name = NULL;
@@ -795,7 +798,6 @@ int ptr = 0;            /* expanding buffer, for */
 uschar *s;              /* building log lines;   */
 void *reset_point;      /* released afterwards.  */


-
/* Log the delivery on the main log. We use an extensible string to build up
the log line, and reset the store afterwards. Remote deliveries should always
have a pointer to the host item that succeeded; local deliveries can have a
@@ -937,8 +939,7 @@ s[ptr] = 0;
log_write(0, flags, "%s", s);

#ifdef EXPERIMENTAL_TPDA
-/*XXX cutthrough calls this also for non-delivery...*/
-tpda_msg_event(US"msg:delivery", addr);
+if (!msg) tpda_msg_event(US"msg:delivery", addr);
#endif

 store_reset(reset_point);
@@ -979,7 +980,6 @@ int ptr = 0;            /* expanding buffer, for */
 uschar *s;              /* building log lines;   */
 void *reset_point;      /* released afterwards.  */


-
DEBUG(D_deliver) debug_printf("post-process %s (%d)\n", addr->address, result);

 /* Set up driver kind and name for logging. Disable logging if the router or
@@ -1255,6 +1255,11 @@ else if (result == DEFER || result == PANIC)
       s = string_append(s, &size, &ptr, 2, US": ",
         US strerror(addr->basic_errno));


+    if (addr->host_used)
+      s = string_append(s, &size, &ptr, 5,
+            US" H=", addr->host_used->name,
+            US" [",  addr->host_used->address, US"]");
+
     if (addr->message != NULL)
       s = string_append(s, &size, &ptr, 2, US": ", addr->message);


@@ -4717,6 +4722,10 @@ if (ancestor != addr)
       string_printing(original));
   }


+if (addr->host_used)
+  fprintf(f, "\n    host %s [%s]",
+      addr->host_used->name, addr->host_used->address);
+
 fprintf(f, "%s", CS se);
 return yield;
 }
@@ -6549,6 +6558,7 @@ if (mua_wrapper)
     {
     uschar *s = (addr_failed->user_message != NULL)?
       addr_failed->user_message : addr_failed->message;
+    host_item * host;


     fprintf(stderr, "Delivery failed: ");
     if (addr_failed->basic_errno > 0)
@@ -6556,6 +6566,8 @@ if (mua_wrapper)
       fprintf(stderr, "%s", strerror(addr_failed->basic_errno));
       if (s != NULL) fprintf(stderr, ": ");
       }
+    if ((host = addr_failed->host_used))
+      fprintf(stderr, "H=%s [%s]: ", host->name, host->address);
     if (s == NULL)
       {
       if (addr_failed->basic_errno <= 0) fprintf(stderr, "unknown error");
diff --git a/src/src/retry.c b/src/src/retry.c
index 4809335..55ffd5c 100644
--- a/src/src/retry.c
+++ b/src/src/retry.c
@@ -294,12 +294,15 @@ void
 retry_add_item(address_item *addr, uschar *key, int flags)
 {
 retry_item *rti = store_get(sizeof(retry_item));
+host_item * host = addr->host_used;
 rti->next = addr->retries;
 addr->retries = rti;
 rti->key = key;
 rti->basic_errno = addr->basic_errno;
 rti->more_errno = addr->more_errno;
-rti->message = addr->message;
+rti->message = host
+  ? string_sprintf("H=%s [%s]: %s", host->name, host->address, addr->message)
+  : addr->message;
 rti->flags = flags;


 DEBUG(D_transport|D_retry)
diff --git a/src/src/tls-gnu.c b/src/src/tls-gnu.c
index 14cdd12..5933193 100644
--- a/src/src/tls-gnu.c
+++ b/src/src/tls-gnu.c
@@ -273,7 +273,7 @@ tls_error(const uschar *prefix, const char *msg, const host_item *host)
 {
 if (host)
   {
-  log_write(0, LOG_MAIN, "TLS error on connection to %s [%s] (%s)%s%s",
+  log_write(0, LOG_MAIN, "H=%s [%s] TLS error on connection (%s)%s%s",
       host->name, host->address, prefix, msg ? ": " : "", msg ? msg : "");
   return FAIL;
   }
@@ -282,6 +282,7 @@ else
   uschar *conn_info = smtp_get_connection_info();
   if (Ustrncmp(conn_info, US"SMTP ", 5) == 0)
     conn_info += 5;
+  /* I'd like to get separated H= here, but too hard for now */
   log_write(0, LOG_MAIN, "TLS error on %s (%s)%s%s",
       conn_info, prefix, msg ? ": " : "", msg ? msg : "");
   return DEFER;
diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index cb2e94f..43ea8a0 100644
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -167,27 +167,28 @@ Returns:    OK/DEFER/FAIL
 static int
 tls_error(uschar *prefix, host_item *host, uschar *msg)
 {
-if (msg == NULL)
+if (!msg)
   {
   ERR_error_string(ERR_get_error(), ssl_errstring);
   msg = (uschar *)ssl_errstring;
   }


-if (host == NULL)
+if (host)
+  {
+  log_write(0, LOG_MAIN, "H=%s [%s] TLS error on connection (%s): %s",
+    host->name, host->address, prefix, msg);
+  return FAIL;
+  }
+else
   {
   uschar *conn_info = smtp_get_connection_info();
   if (Ustrncmp(conn_info, US"SMTP ", 5) == 0)
     conn_info += 5;
+  /* I'd like to get separated H= here, but too hard for now */
   log_write(0, LOG_MAIN, "TLS error on %s (%s): %s",
     conn_info, prefix, msg);
   return DEFER;
   }
-else
-  {
-  log_write(0, LOG_MAIN, "TLS error on connection to %s [%s] (%s): %s",
-    host->name, host->address, prefix, msg);
-  return FAIL;
-  }
 }



diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index 9986e80..6d34922 100644
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -433,6 +433,7 @@ Arguments:
   msg            to put in each address's message field
   rc             to put in each address's transport_return field
   pass_message   if TRUE, set the "pass message" flag in the address
+  host           if set, mark addrs as having used this host


 If errno_value has the special value ERRNO_CONNECTTIMEOUT, ETIMEDOUT is put in
 the errno field, and RTEF_CTOUT is ORed into the more_errno field, to indicate
@@ -443,7 +444,7 @@ Returns:       nothing


 static void
 set_errno(address_item *addrlist, int errno_value, uschar *msg, int rc,
-  BOOL pass_message)
+  BOOL pass_message, host_item * host)
 {
 address_item *addr;
 int orvalue = 0;
@@ -463,6 +464,8 @@ for (addr = addrlist; addr != NULL; addr = addr->next)
     if (pass_message) setflag(addr, af_pass_message);
     }
   addr->transport_return = rc;
+  if (host)
+    addr->host_used = host;
   }
 }


@@ -508,8 +511,8 @@ if (smtp_use_pipelining &&

 if (*errno_value == ETIMEDOUT)
   {
-  *message = US string_sprintf("SMTP timeout while connected to %s [%s] "
-    "after %s%s", host->name, host->address, pl, smtp_command);
+  *message = US string_sprintf("SMTP timeout after %s%s",
+      pl, smtp_command);
   if (transport_count > 0)
     *message = US string_sprintf("%s (%d bytes written)", *message,
       transport_count);
@@ -522,13 +525,11 @@ if (*errno_value == ERRNO_SMTPFORMAT)
   {
   uschar *malfresp = string_printing(buffer);
   while (isspace(*malfresp)) malfresp++;
-  if (*malfresp == 0)
-    *message = string_sprintf("Malformed SMTP reply (an empty line) from "
-      "%s [%s] in response to %s%s", host->name, host->address, pl,
-      smtp_command);
-  else
-    *message = string_sprintf("Malformed SMTP reply from %s [%s] in response "
-      "to %s%s: %s", host->name, host->address, pl, smtp_command, malfresp);
+  *message = *malfresp == 0
+    ? string_sprintf("Malformed SMTP reply (an empty line) "
+    "in response to %s%s", pl, smtp_command)
+    : string_sprintf("Malformed SMTP reply in response to %s%s: %s",
+    pl, smtp_command, malfresp);
   return FALSE;
   }


@@ -568,7 +569,7 @@ if (buffer[0] != 0)
   {
   uschar *s = string_printing(buffer);
   *message = US string_sprintf("SMTP error from remote mail server after %s%s: "
-    "host %s [%s]: %s", pl, smtp_command, host->name, host->address, s);
+    "%s", pl, smtp_command, s);
   *pass_message = TRUE;
   *yield = buffer[0];
   return TRUE;
@@ -583,8 +584,8 @@ assume the connection is now dead. */
 if (*errno_value == 0 || *errno_value == ECONNRESET)
   {
   *errno_value = ERRNO_SMTPCLOSED;
-  *message = US string_sprintf("Remote host %s [%s] closed connection "
-    "in response to %s%s", host->name, host->address, pl, smtp_command);
+  *message = US string_sprintf("Remote host closed connection "
+    "in response to %s%s",  pl, smtp_command);
   }
 else *message = US string_sprintf("%s [%s]", host->name, host->address);


@@ -609,9 +610,11 @@ Returns:   nothing
 static void
 write_logs(address_item *addr, host_item *host)
 {
-if (addr->message != NULL)
+uschar * message = string_sprintf("H=%s [%s]", host->name, host->address);
+
+if (addr->message)
   {
-  uschar *message = addr->message;
+  message = string_sprintf("%s: %s", message, addr->message);
   if (addr->basic_errno > 0)
     message = string_sprintf("%s: %s", message, strerror(addr->basic_errno));
   log_write(0, LOG_MAIN, "%s", message);
@@ -619,18 +622,22 @@ if (addr->message != NULL)
   }
 else
   {
-  uschar *msg =
-    ((log_extra_selector & LX_outgoing_port) != 0)?
-    string_sprintf("%s [%s]:%d", host->name, host->address,
-      (host->port == PORT_NONE)? 25 : host->port)
-    :
-    string_sprintf("%s [%s]", host->name, host->address);
-  log_write(0, LOG_MAIN, "%s %s", msg, strerror(addr->basic_errno));
-  deliver_msglog("%s %s %s\n", tod_stamp(tod_log), msg,
-    strerror(addr->basic_errno));
+  if (log_extra_selector & LX_outgoing_port)
+    message = string_sprintf("%s:%d", message,
+        host->port == PORT_NONE ? 25 : host->port);
+  log_write(0, LOG_MAIN, "%s %s", message, strerror(addr->basic_errno));
+  deliver_msglog("%s %s %s\n", tod_stamp(tod_log), message,
+        strerror(addr->basic_errno));
   }
 }


+static void
+msglog_line(host_item * host, uschar * message)
+{
+  deliver_msglog("%s H=%s [%s] %s\n", tod_stamp(tod_log),
+    host->name, host->address, message);
+}
+



 #ifdef EXPERIMENTAL_TPDA
@@ -777,6 +784,14 @@ if (pending_MAIL)
         }
       errno = save_errno;
       }
+
+    if (pending_DATA) count--;  /* Number of RCPT responses to come */
+    while (count-- > 0)        /* Mark any pending addrs with the host used */
+      {
+      while (addr->transport_return != PENDING_DEFER) addr = addr->next;
+      addr->host_used = host;
+      addr = addr->next;
+      }
     return -3;
     }
   }
@@ -792,6 +807,7 @@ while (count-- > 0)
   while (addr->transport_return != PENDING_DEFER) addr = addr->next;


/* The address was accepted */
+ addr->host_used = host;

   if (smtp_read_response(inblock, buffer, buffsize, '2', timeout))
     {
@@ -816,10 +832,9 @@ while (count-- > 0)
   else if (errno == ETIMEDOUT)
     {
     int save_errno = errno;
-    uschar *message = string_sprintf("SMTP timeout while connected to %s [%s] "
-      "after RCPT TO:<%s>", host->name, host->address,
-      transport_rcpt_address(addr, include_affixes));
-    set_errno(addrlist, save_errno, message, DEFER, FALSE);
+    uschar *message = string_sprintf("SMTP timeout after RCPT TO:<%s>",
+              transport_rcpt_address(addr, include_affixes));
+    set_errno(addrlist, save_errno, message, DEFER, FALSE, NULL);
     retry_add_item(addr, addr->address_retry_key, 0);
     update_waiting = FALSE;
     return -1;
@@ -843,10 +858,10 @@ while (count-- > 0)
     {
     addr->message =
       string_sprintf("SMTP error from remote mail server after RCPT TO:<%s>: "
-        "host %s [%s]: %s", transport_rcpt_address(addr, include_affixes),
-        host->name, host->address, string_printing(buffer));
+    "%s", transport_rcpt_address(addr, include_affixes),
+    string_printing(buffer));
     setflag(addr, af_pass_message);
-    deliver_msglog("%s %s\n", tod_stamp(tod_log), addr->message);
+    msglog_line(host, addr->message);


     /* The response was 5xx */


@@ -864,9 +879,11 @@ while (count-- > 0)
       addr->basic_errno = ERRNO_RCPT4XX;
       addr->more_errno |= ((buffer[1] - '0')*10 + buffer[2] - '0') << 8;


-      /* Log temporary errors if there are more hosts to be tried. */
+      /* Log temporary errors if there are more hosts to be tried.
+      If not, log this last one in the == line. */


-      if (host->next != NULL) log_write(0, LOG_MAIN, "%s", addr->message);
+      if (host->next)
+    log_write(0, LOG_MAIN, "H=%s [%s]: %s", host->name, host->address, addr->message);


       /* Do not put this message on the list of those waiting for specific
       hosts, as otherwise it is likely to be tried too often. */
@@ -1068,7 +1085,7 @@ if (is_esmtp && regex_match_and_setup(regex_AUTH, buffer, 0, -1))
       /* Internal problem, message in buffer. */


       case ERROR:
-      set_errno(addrlist, 0, string_copy(buffer), DEFER, FALSE);
+      set_errno(addrlist, 0, string_copy(buffer), DEFER, FALSE, NULL);
       return ERROR;
       }


@@ -1084,7 +1101,7 @@ if (require_auth == OK && !smtp_authenticated)
   {
   set_errno(addrlist, ERRNO_AUTHFAIL,
     string_sprintf("authentication required but %s", fail_reason), DEFER,
-    FALSE);
+    FALSE, NULL);
   return DEFER;
   }


@@ -1123,7 +1140,7 @@ if (ob->authenticated_sender != NULL)
       {
       uschar *message = string_sprintf("failed to expand "
         "authenticated_sender: %s", expand_string_message);
-      set_errno(addrlist, 0, message, DEFER, FALSE);
+      set_errno(addrlist, 0, message, DEFER, FALSE, NULL);
       return TRUE;
       }
     }
@@ -1324,7 +1341,7 @@ tls_modify_variables(&tls_out);
 #ifndef SUPPORT_TLS
 if (smtps)
   {
-  set_errno(addrlist, 0, US"TLS support not available", DEFER, FALSE);
+  set_errno(addrlist, 0, US"TLS support not available", DEFER, FALSE, NULL);
   return ERROR;
   }
 #endif
@@ -1347,7 +1364,7 @@ if (continue_hostname == NULL)
   if (inblock.sock < 0)
     {
     set_errno(addrlist, (errno == ETIMEDOUT)? ERRNO_CONNECTTIMEOUT : errno,
-      NULL, DEFER, FALSE);
+      NULL, DEFER, FALSE, NULL);
     return DEFER;
     }


@@ -1401,7 +1418,7 @@ if (continue_hostname == NULL)
     == DEFER)
     {
     uschar *message = US"deferred by smtp:connect event expansion";
-    set_errno(addrlist, 0, message, DEFER, FALSE);
+    set_errno(addrlist, 0, message, DEFER, FALSE, NULL);
     yield = DEFER;
     goto SEND_QUIT;
     }
@@ -1414,7 +1431,7 @@ if (continue_hostname == NULL)
       {
       uschar *message = string_sprintf("failed to expand helo_data: %s",
         expand_string_message);
-      set_errno(addrlist, 0, message, DEFER, FALSE);
+      set_errno(addrlist, 0, message, DEFER, FALSE, NULL);
       yield = DEFER;
       goto SEND_QUIT;
       }
@@ -1600,7 +1617,6 @@ if (tls_offered && !suppress_tls &&
     /* TLS session is set up */


     for (addr = addrlist; addr != NULL; addr = addr->next)
-      {
       if (addr->transport_return == PENDING_DEFER)
         {
         addr->cipher = tls_out.cipher;
@@ -1609,7 +1625,6 @@ if (tls_offered && !suppress_tls &&
         addr->peerdn = tls_out.peerdn;
     addr->ocsp = tls_out.ocsp;
         }
-      }
     }
   }


@@ -1633,7 +1648,7 @@ if (tls_out.active >= 0)
       {
       uschar *message = string_sprintf("failed to expand helo_data: %s",
         expand_string_message);
-      set_errno(addrlist, 0, message, DEFER, FALSE);
+      set_errno(addrlist, 0, message, DEFER, FALSE, NULL);
       yield = DEFER;
       goto SEND_QUIT;
       }
@@ -1675,8 +1690,7 @@ else if (
     )
   {
   save_errno = ERRNO_TLSREQUIRED;
-  message = string_sprintf("a TLS session is required for %s [%s], but %s",
-    host->name, host->address,
+  message = string_sprintf("a TLS session is required, but %s",
     tls_offered? "an attempt to start TLS failed" :
                  "the server did not offer TLS support");
   goto TLS_FAILED;
@@ -1777,7 +1791,7 @@ if (tblock->filter_command != NULL)
   if (!rc)
     {
     set_errno(addrlist->next, addrlist->basic_errno, addrlist->message, DEFER,
-      FALSE);
+      FALSE, NULL);
     yield = ERROR;
     goto SEND_QUIT;
     }
@@ -2026,7 +2040,7 @@ if (mua_wrapper)
   if (badaddr != NULL)
     {
     set_errno(addrlist, 0, badaddr->message, FAIL,
-      testflag(badaddr, af_pass_message));
+      testflag(badaddr, af_pass_message), NULL);
     ok = FALSE;
     }
   }
@@ -2400,12 +2414,10 @@ if (!ok)
   if (setting_up)
     {
     if (code == '5')
-      {
-      set_errno(addrlist, save_errno, message, FAIL, pass_message);
-      }
+      set_errno(addrlist, save_errno, message, FAIL, pass_message, host);
     else
       {
-      set_errno(addrlist, save_errno, message, DEFER, pass_message);
+      set_errno(addrlist, save_errno, message, DEFER, pass_message, host);
       yield = DEFER;
       }
     }
@@ -2461,7 +2473,7 @@ if (!ok)
       {
       if (mua_wrapper) code = '5';  /* Force hard failure in wrapper mode */
       set_errno(addrlist, save_errno, message, (code == '5')? FAIL : DEFER,
-        pass_message);
+        pass_message, host);


       /* If there's an errno, the message contains just the identity of
       the host. */
@@ -2471,7 +2483,7 @@ if (!ok)
         if (save_errno > 0)
           message = US string_sprintf("%s: %s", message, strerror(save_errno));
         if (host->next != NULL) log_write(0, LOG_MAIN, "%s", message);
-        deliver_msglog("%s %s\n", tod_stamp(tod_log), message);
+    msglog_line(host, message);
         *message_defer = TRUE;
         }
       }
@@ -2486,7 +2498,7 @@ if (!ok)
       {
       yield = (save_errno == ERRNO_CHHEADER_FAIL ||
                save_errno == ERRNO_FILTER_FAIL)? ERROR : DEFER;
-      set_errno(addrlist, save_errno, message, DEFER, pass_message);
+      set_errno(addrlist, save_errno, message, DEFER, pass_message, host);
       }
     }
   }
@@ -2557,7 +2569,8 @@ if (completed_address && ok && send_quit)
           &pass_message);
         if (!send_quit)
           {
-          DEBUG(D_transport) debug_printf("%s\n", msg);
+          DEBUG(D_transport) debug_printf("H=%s [%s] %s\n",
+        host->name, host->address, msg);
           }
         }
       }
@@ -2603,7 +2616,7 @@ if (completed_address && ok && send_quit)


     /* If RSET failed and there are addresses left, they get deferred. */


-    else set_errno(first_addr, errno, msg, DEFER, FALSE);
+    else set_errno(first_addr, errno, msg, DEFER, FALSE, host);
     }
   }


@@ -3283,7 +3296,7 @@ for (cutoff_retry = 0; expired &&
     if (dont_deliver)
       {
       host_item *host2;
-      set_errno(addrlist, 0, NULL, OK, FALSE);
+      set_errno(addrlist, 0, NULL, OK, FALSE, NULL);
       for (addr = addrlist; addr != NULL; addr = addr->next)
         {
         addr->host_used = host;
diff --git a/src/src/verify.c b/src/src/verify.c
index 29d7b13..db35aa5 100644
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -748,9 +748,11 @@ else
      )
         {
         /*save_errno = ERRNO_TLSREQUIRED;*/
-        log_write(0, LOG_MAIN, "a TLS session is required for %s [%s], but %s",
+        log_write(0, LOG_MAIN,
+      "H=%s [%s]: a TLS session is required for this host, but %s",
           host->name, host->address,
-      tls_offered? "an attempt to start TLS failed" : "the server did not offer TLS support");
+      tls_offered ? "an attempt to start TLS failed"
+              : "the server did not offer TLS support");
         done= FALSE;
         goto TLS_FAILED;
         }
diff --git a/test/log/0098 b/test/log/0098
index 6cf0aa3..6de357a 100644
--- a/test/log/0098
+++ b/test/log/0098
@@ -21,7 +21,7 @@
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qf
 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbB-0005vi-00 V4NET.0.0.1 [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmbB-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
 1999-03-02 09:44:33 10HmbB-0005vi-00 == xxxx@??? R=all T=smtp defer (dd): Network Error
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
 1999-03-02 09:44:33 10HmaX-0005vi-00 == defer@??? R=alias defer (-1): This address has been forced to defer.
@@ -31,11 +31,11 @@
 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@??? R=alias defer (-1): This address has been forced to defer.
 1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@??? R=alias defer (-1): This address has been forced to defer.
-1999-03-02 09:44:33 10HmbB-0005vi-00 V4NET.0.0.1 [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmbB-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
 1999-03-02 09:44:33 10HmbB-0005vi-00 == xxxx@??? R=all T=smtp defer (dd): Network Error
 1999-03-02 09:44:33 End queue run: pid=pppp -qf
 1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbD-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmbD-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
 1999-03-02 09:44:33 10HmbD-0005vi-00 == yyyy@??? R=refused T=smtp_connect_refused defer (dd): Connection refused
 1999-03-02 09:44:33 Start queue run: pid=pppp
 1999-03-02 09:44:33 10HmaX-0005vi-00 == defer@??? routing defer (-51): retry time not reached
@@ -51,7 +51,7 @@
 1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@??? routing defer (-51): retry time not reached
 1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@??? routing defer (-51): retry time not reached
 1999-03-02 09:44:33 10HmbB-0005vi-00 == xxxx@??? R=all T=smtp defer (-53): retry time not reached for any host
-1999-03-02 09:44:33 10HmbD-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmbD-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
 1999-03-02 09:44:33 10HmbD-0005vi-00 == yyyy@??? R=refused T=smtp_connect_refused defer (dd): Connection refused
 1999-03-02 09:44:33 End queue run: pid=pppp
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
@@ -65,12 +65,12 @@
 1999-03-02 09:44:33 10HmbF-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss T="Warning: message 10HmaZ-0005vi-00 delayed by 0 minutes"
 1999-03-02 09:44:33 10HmbF-0005vi-00 => CALLER <CALLER@???> R=localuser T=local_delivery
 1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbB-0005vi-00 V4NET.0.0.1 [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmbB-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
 1999-03-02 09:44:33 10HmbB-0005vi-00 == xxxx@??? R=all T=smtp defer (dd): Network Error
 1999-03-02 09:44:33 10HmbG-0005vi-00 <= <> R=10HmbB-0005vi-00 U=EXIMUSER P=local S=sss T="Warning: message 10HmbB-0005vi-00 delayed by 0 minutes"
 1999-03-02 09:44:33 10HmbG-0005vi-00 => CALLER <CALLER@???> R=localuser T=local_delivery
 1999-03-02 09:44:33 10HmbG-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbD-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmbD-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
 1999-03-02 09:44:33 10HmbD-0005vi-00 == yyyy@??? R=refused T=smtp_connect_refused defer (dd): Connection refused
 1999-03-02 09:44:33 10HmbH-0005vi-00 <= <> R=10HmbD-0005vi-00 U=EXIMUSER P=local S=sss T="Warning: message 10HmbD-0005vi-00 delayed by 0 minutes"
 1999-03-02 09:44:33 10HmbH-0005vi-00 => CALLER <CALLER@???> R=localuser T=local_delivery
diff --git a/test/log/0099 b/test/log/0099
index 2d221a9..beb27f7 100644
--- a/test/log/0099
+++ b/test/log/0099
@@ -1,10 +1,10 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=all T=smtp defer (dd): Connection refused
 1999-03-02 09:44:33 Start queue run: pid=pppp
 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=all T=smtp defer (-53): retry time not reached for any host
 1999-03-02 09:44:33 End queue run: pid=pppp
 1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=all T=smtp defer (dd): Connection refused
 1999-03-02 09:44:33 End queue run: pid=pppp
diff --git a/test/log/0106 b/test/log/0106
index c485865..80fe546 100644
--- a/test/log/0106
+++ b/test/log/0106
@@ -1,5 +1,5 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after EHLO myhost.test.ex: Connection timed out
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=all T=smtp defer (dd): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after EHLO myhost.test.ex
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP timeout after EHLO myhost.test.ex: Connection timed out
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=all T=smtp defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after EHLO myhost.test.ex
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 == userx@??? R=all T=smtp defer (dd): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after MAIL FROM:<CALLER@???>
+1999-03-02 09:44:33 10HmaY-0005vi-00 == userx@??? R=all T=smtp defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after MAIL FROM:<CALLER@???>
diff --git a/test/log/0109 b/test/log/0109
index 3f7ec95..6ba3686 100644
--- a/test/log/0109
+++ b/test/log/0109
@@ -1,4 +1,4 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
-1999-03-02 09:44:33 10HmaX-0005vi-00 ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] Connection refused
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] Connection refused
 1999-03-02 09:44:33 10HmaX-0005vi-00 == xx@??? R=remote T=smtp defer (dd): Connection refused
diff --git a/test/log/0135 b/test/log/0135
index a2b7fcc..35bc9e6 100644
--- a/test/log/0135
+++ b/test/log/0135
@@ -2,9 +2,9 @@
 1999-03-02 09:44:33 Start queue run: pid=pppp
 1999-03-02 09:44:33 10HmaX-0005vi-00 == c@??? R=smart T=local_delivery defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/c)
 1999-03-02 09:44:33 10HmaX-0005vi-00 == d@??? R=smart T=local_delivery defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/d)
-1999-03-02 09:44:33 10HmaX-0005vi-00 V4NET.0.0.1 [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
 1999-03-02 09:44:33 10HmaX-0005vi-00 == a@??? R=default T=smtp defer (dd): Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 V4NET.0.0.0 [V4NET.0.0.0] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=V4NET.0.0.0 [V4NET.0.0.0] Network Error
 1999-03-02 09:44:33 10HmaX-0005vi-00 == b@??? R=default T=smtp defer (dd): Network Error
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** b@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** c@???: retry timeout exceeded
@@ -18,7 +18,7 @@
 1999-03-02 09:44:33 End queue run: pid=pppp
 1999-03-02 09:44:33 Start queue run: pid=pppp
 1999-03-02 09:44:33 10HmaX-0005vi-00 == d@??? R=smart T=local_delivery defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/d)
-1999-03-02 09:44:33 10HmaX-0005vi-00 V4NET.0.0.1 [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
 1999-03-02 09:44:33 10HmaX-0005vi-00 == a@??? R=default T=smtp defer (dd): Network Error
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** a@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** d@???: retry timeout exceeded
@@ -29,7 +29,7 @@
 1999-03-02 09:44:33 End queue run: pid=pppp
 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> U=CALLER P=local S=sss
 1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmbA-0005vi-00 V4NET.0.0.0 [V4NET.0.0.0] Network Error
+1999-03-02 09:44:33 10HmbA-0005vi-00 H=V4NET.0.0.0 [V4NET.0.0.0] Network Error
 1999-03-02 09:44:33 10HmbA-0005vi-00 == b@??? R=default T=smtp defer (dd): Network Error
 1999-03-02 09:44:33 10HmbA-0005vi-00 ** b@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmbA-0005vi-00 b@???: error ignored
diff --git a/test/log/0160 b/test/log/0160
index 8cf2b14..bb3c00f 100644
--- a/test/log/0160
+++ b/test/log/0160
@@ -1,9 +1,9 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
 1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=all T=smtp defer (-44): SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 452 Temporary error
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=all T=smtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 452 Temporary error
 1999-03-02 09:44:33 End queue run: pid=pppp
 1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=all T=smtp defer (-44): SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 452 Temporary error
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=all T=smtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 452 Temporary error
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
diff --git a/test/log/0163 b/test/log/0163
index 5ce0017..f4002bf 100644
--- a/test/log/0163
+++ b/test/log/0163
@@ -1,6 +1,6 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 Malformed SMTP reply from 127.0.0.1 [127.0.0.1] in response to end of data: 550 There is a problem with the message, but this response line is over the limit for reasonable SMTP responses. 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=all T=smtp defer (-19): Malformed SMTP reply from 127.0.0.1 [127.0.0.1] in response to end of data: 550 There is a problem with the message, but this response line is over the limit for reasonable SMTP responses. 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 1234567890123456789
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]: Malformed SMTP reply in response to end of data: 550 There is a problem with the message, but this response line is over the limit for reasonable SMTP responses. 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=all T=smtp defer (-19) H=127.0.0.1 [127.0.0.1]: Malformed SMTP reply in response to end of data: 550 There is a problem with the message, but this response line is over the limit for reasonable SMTP responses. 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 1234567890123456789012345678901234567890123456
 1999-03-02 09:44:33 Start queue run: pid=pppp
 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=all T=smtp defer (-53): retry time not reached for any host
 1999-03-02 09:44:33 End queue run: pid=pppp
diff --git a/test/log/0197 b/test/log/0197
index 59d29fd..9e063c4 100644
--- a/test/log/0197
+++ b/test/log/0197
@@ -1,7 +1,7 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@??? R=checkcopy T=makecopy
 1999-03-02 09:44:33 10HmaX-0005vi-00 -> usery@??? R=checkcopy T=makecopy
-1999-03-02 09:44:33 10HmaX-0005vi-00 V4NET.0.0.1 [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=passall T=pass_on defer (dd): Network Error
 1999-03-02 09:44:33 10HmaX-0005vi-00 == usery@??? R=passall T=pass_on defer (dd): Network Error
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= doesn't@matter U=CALLER P=local-smtp S=sss
@@ -11,10 +11,10 @@
 1999-03-02 09:44:33 10HmaY-0005vi-00 == y@??? R=passall T=pass_on defer (-53): retry time not reached for any host
 1999-03-02 09:44:33 10HmaY-0005vi-00 == z@elsewhere R=passall T=pass_on defer (-53): retry time not reached for any host
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 V4NET.0.0.1 [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=passall T=pass_on defer (dd): Network Error
 1999-03-02 09:44:33 10HmaX-0005vi-00 == usery@??? R=passall T=pass_on defer (dd): Network Error
-1999-03-02 09:44:33 10HmaY-0005vi-00 V4NET.0.0.1 [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmaY-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
 1999-03-02 09:44:33 10HmaY-0005vi-00 == x@??? R=passall T=pass_on defer (dd): Network Error
 1999-03-02 09:44:33 10HmaY-0005vi-00 == y@??? R=passall T=pass_on defer (dd): Network Error
 1999-03-02 09:44:33 10HmaY-0005vi-00 == z@elsewhere R=passall T=pass_on defer (dd): Network Error
diff --git a/test/log/0198 b/test/log/0198
index facb8ff..f587cb8 100644
--- a/test/log/0198
+++ b/test/log/0198
@@ -1,6 +1,6 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local-bsmtp S=sss id=E10HmaY-0005vi-00@???
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** usery@???: Unrouteable address
-1999-03-02 09:44:33 10HmaX-0005vi-00 V4NET.0.0.1 [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=check_file T=pass_on defer (dd): Network Error
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmaZ-0005vi-00 == CALLER@??? R=passall T=pass_on defer (-53): retry time not reached for any host
diff --git a/test/log/0201 b/test/log/0201
index ea96c1e..78b3565 100644
--- a/test/log/0201
+++ b/test/log/0201
@@ -1,2 +1,2 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=t1 defer (-24): transport filter process failed (99)
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=t1 defer (-24) H=127.0.0.1 [127.0.0.1]: transport filter process failed (99)
diff --git a/test/log/0203 b/test/log/0203
index 8c11047..2df8033 100644
--- a/test/log/0203
+++ b/test/log/0203
@@ -3,7 +3,7 @@
 1999-03-02 09:44:33 Start queue run: pid=pppp -qqf
 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@domain1 R=others T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 ** userx@domain1 R=others T=smtp: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: host 127.0.0.1 [127.0.0.1]: 550 Don't like that sender
+1999-03-02 09:44:33 10HmaY-0005vi-00 ** userx@domain1 R=others T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: 550 Don't like that sender
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaY-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmaZ-0005vi-00 ** CALLER@???: Unrouteable address
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Frozen (delivery error message)
diff --git a/test/log/0208 b/test/log/0208
index ed7ce39..2326a48 100644
--- a/test/log/0208
+++ b/test/log/0208
@@ -3,7 +3,7 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** fail.direct@???: Unrouteable address
 1999-03-02 09:44:33 10HmaX-0005vi-00 == defer@??? R=defer defer (-1): don't do this yet
 1999-03-02 09:44:33 10HmaX-0005vi-00 => ok <ok@???> R=ok T=succeed
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** fail.transport@??? R=fail_transport T=fail: SMTP error from remote mail server after RCPT TO:<fail.transport@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient refused
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** fail.transport@??? R=fail_transport T=fail H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<fail.transport@???>: 550 Recipient refused
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmaY-0005vi-00 ** CALLER@???: Unrouteable address
 1999-03-02 09:44:33 10HmaY-0005vi-00 CALLER@???: error ignored
@@ -13,7 +13,7 @@
 1999-03-02 09:44:33 10HmaZ-0005vi-00 ** fail.direct@???: Unrouteable address
 1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@??? R=defer defer (-1): don't do this yet
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => ok <ok@???> R=ok T=succeed
-1999-03-02 09:44:33 10HmaZ-0005vi-00 ** fail.transport@??? R=fail_transport T=fail: SMTP error from remote mail server after RCPT TO:<fail.transport@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient refused
+1999-03-02 09:44:33 10HmaZ-0005vi-00 ** fail.transport@??? R=fail_transport T=fail H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<fail.transport@???>: 550 Recipient refused
 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbA-0005vi-00 ** CALLER@???: Unrouteable address
 1999-03-02 09:44:33 10HmbA-0005vi-00 CALLER@???: error ignored
diff --git a/test/log/0209 b/test/log/0209
index 7d3c22c..aae3d49 100644
--- a/test/log/0209
+++ b/test/log/0209
@@ -3,7 +3,7 @@
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmaY-0005vi-00 == userz@domain1 R=others T=smtp defer (0): SMTP delivery explicitly queued
 1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userz@domain1 R=others T=smtp defer (-44): SMTP error from remote mail server after RCPT TO:<userz@domain1>: host 127.0.0.1 [127.0.0.1]: 450 Temporary error
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userz@domain1 R=others T=smtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userz@domain1>: 450 Temporary error
 1999-03-02 09:44:33 10HmaY-0005vi-00 == userz@domain1 routing defer (-51): retry time not reached
 1999-03-02 09:44:33 End queue run: pid=pppp
 1999-03-02 09:44:33 10HmaX-0005vi-00 removed by CALLER
@@ -17,10 +17,10 @@
 1999-03-02 09:44:33 10HmbA-0005vi-00 == userx@domain1 R=others T=smtp defer (0): SMTP delivery explicitly queued
 1999-03-02 09:44:33 10HmbA-0005vi-00 == usery@domain1 R=others T=smtp defer (0): SMTP delivery explicitly queued
 1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@domain1 R=others T=smtp defer (-44): SMTP error from remote mail server after RCPT TO:<userx@domain1>: host 127.0.0.1 [127.0.0.1]: 450 Temporary error
+1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@domain1 R=others T=smtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@domain1>: 450 Temporary error
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => usery@domain1 R=others T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmbA-0005vi-00 == userx@domain1 routing defer (-51): retry time not reached
-1999-03-02 09:44:33 10HmbA-0005vi-00 == usery@domain1 R=others T=smtp defer (-44): SMTP error from remote mail server after RCPT TO:<usery@domain1>: host 127.0.0.1 [127.0.0.1]: 450 Temporary error
+1999-03-02 09:44:33 10HmbA-0005vi-00 == usery@domain1 R=others T=smtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@domain1>: 450 Temporary error
 1999-03-02 09:44:33 10HmbA-0005vi-00 == userx@domain1 routing defer (-51): retry time not reached
 1999-03-02 09:44:33 10HmbA-0005vi-00 == usery@domain1 routing defer (-51): retry time not reached
 1999-03-02 09:44:33 End queue run: pid=pppp
@@ -33,5 +33,5 @@
 1999-03-02 09:44:33 10HmbA-0005vi-00 == userx@domain1 routing defer (-51): retry time not reached
 1999-03-02 09:44:33 10HmbA-0005vi-00 == usery@domain1 routing defer (-51): retry time not reached
 1999-03-02 09:44:33 End queue run: pid=pppp
-1999-03-02 09:44:33 10HmaZ-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmaZ-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
 1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@domain1 R=others T=smtp defer (dd): Connection refused
diff --git a/test/log/0211 b/test/log/0211
index d993b62..07deb3b 100644
--- a/test/log/0211
+++ b/test/log/0211
@@ -1,20 +1,20 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mail server after initial connection: host 127.0.0.1 [127.0.0.1]: 450 I'm busy
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain1 R=others T=smtp defer (0): SMTP error from remote mail server after initial connection: host 127.0.0.1 [127.0.0.1]: 450 I'm busy
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after initial connection: 450 I'm busy
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain1 R=others T=smtp defer (0) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after initial connection: 450 I'm busy
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mail server after HELO the.local.host.name: host 127.0.0.1 [127.0.0.1]: 450 I'm busy
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain1 R=others T=smtp defer (0): SMTP error from remote mail server after HELO the.local.host.name: host 127.0.0.1 [127.0.0.1]: 450 I'm busy
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after HELO the.local.host.name: 450 I'm busy
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain1 R=others T=smtp defer (0) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after HELO the.local.host.name: 450 I'm busy
 1999-03-02 09:44:33 End queue run: pid=pppp -qf
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@domain1 F=<CALLER@???> R=others T=smtp: SMTP error from remote mail server after initial connection: host 127.0.0.1 [127.0.0.1]: 550 Go away
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@domain1 F=<CALLER@???> R=others T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after initial connection: 550 Go away
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER <CALLER@???> F=<> R=all T=local_delivery
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qf
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaZ-0005vi-00 ** userx@domain1 F=<CALLER@???> R=others T=smtp: SMTP error from remote mail server after HELO the.local.host.name: host 127.0.0.1 [127.0.0.1]: 550 Go away
-1999-03-02 09:44:33 10HmaZ-0005vi-00 ** usery@domain2 F=<CALLER@???> R=others T=smtp: SMTP error from remote mail server after HELO the.local.host.name: host 127.0.0.1 [127.0.0.1]: 550 Go away
+1999-03-02 09:44:33 10HmaZ-0005vi-00 ** userx@domain1 F=<CALLER@???> R=others T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after HELO the.local.host.name: 550 Go away
+1999-03-02 09:44:33 10HmaZ-0005vi-00 ** usery@domain2 F=<CALLER@???> R=others T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after HELO the.local.host.name: 550 Go away
 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbA-0005vi-00 => CALLER <CALLER@???> F=<> R=all T=local_delivery
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
diff --git a/test/log/0213 b/test/log/0213
index 615aa91..7ffcf4b 100644
--- a/test/log/0213
+++ b/test/log/0213
@@ -1,3 +1,3 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 Malformed SMTP reply from 127.0.0.1 [127.0.0.1] in response to RCPT TO:<userx@domain1>: 550 The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 c
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain1 R=others T=smtp defer (-19): Malformed SMTP reply from 127.0.0.1 [127.0.0.1] in response to RCPT TO:<userx@domain1>: 550 The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at leas
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]: Malformed SMTP reply in response to RCPT TO:<userx@domain1>: 550 The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 c
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain1 R=others T=smtp defer (-19) H=127.0.0.1 [127.0.0.1]: Malformed SMTP reply in response to RCPT TO:<userx@domain1>: 550 The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is no, but I am going to make sure it is a very long answer. Each line is at least 100 chars. The answer is 
diff --git a/test/log/0215 b/test/log/0215
index 3174781..307ae60 100644
--- a/test/log/0215
+++ b/test/log/0215
@@ -3,11 +3,11 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@??? F=<CALLER@???> R=smartuser T=lmtp H=127.0.0.1 [127.0.0.1] C="250 OK"
-1999-03-02 09:44:33 10HmaY-0005vi-00 == userxx@??? R=smartuser T=lmtp defer (0): LMTP error after DATA: 440 Temporary error
-1999-03-02 09:44:33 10HmaY-0005vi-00 ** userxy@??? F=<CALLER@???> R=smartuser T=lmtp: LMTP error after DATA: 550 Bad user
+1999-03-02 09:44:33 10HmaY-0005vi-00 == userxx@??? R=smartuser T=lmtp defer (0) H=127.0.0.1 [127.0.0.1]: LMTP error after DATA: 440 Temporary error
+1999-03-02 09:44:33 10HmaY-0005vi-00 ** userxy@??? F=<CALLER@???> R=smartuser T=lmtp H=127.0.0.1 [127.0.0.1]: LMTP error after DATA: 550 Bad user
 1999-03-02 09:44:33 10HmaY-0005vi-00 -> userxz@??? F=<CALLER@???> R=smartuser T=lmtp H=127.0.0.1 [127.0.0.1] C="250 OK"
-1999-03-02 09:44:33 10HmaY-0005vi-00 == useryx@??? R=smartuser T=lmtp defer (0): LMTP error after DATA: 440 Temporary error
-1999-03-02 09:44:33 10HmaY-0005vi-00 ** useryy@??? F=<CALLER@???> R=smartuser T=lmtp: LMTP error after DATA: 550 Bad user
+1999-03-02 09:44:33 10HmaY-0005vi-00 == useryx@??? R=smartuser T=lmtp defer (0) H=127.0.0.1 [127.0.0.1]: LMTP error after DATA: 440 Temporary error
+1999-03-02 09:44:33 10HmaY-0005vi-00 ** useryy@??? F=<CALLER@???> R=smartuser T=lmtp H=127.0.0.1 [127.0.0.1]: LMTP error after DATA: 550 Bad user
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaY-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => :blackhole: <CALLER@???> R=bounces
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
@@ -15,23 +15,23 @@
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmbA-0005vi-00 => userx@??? F=<CALLER@???> R=smartuser T=lmtp H=127.0.0.1 [127.0.0.1] C="250 OK"
-1999-03-02 09:44:33 10HmbA-0005vi-00 == userxx@??? R=smartuser T=lmtp defer (0): LMTP error after DATA: 440 Temporary error
-1999-03-02 09:44:33 10HmbA-0005vi-00 ** userxy@??? F=<CALLER@???> R=smartuser T=lmtp: LMTP error after DATA: 550-I don't like this user\n550 Bad user
+1999-03-02 09:44:33 10HmbA-0005vi-00 == userxx@??? R=smartuser T=lmtp defer (0) H=127.0.0.1 [127.0.0.1]: LMTP error after DATA: 440 Temporary error
+1999-03-02 09:44:33 10HmbA-0005vi-00 ** userxy@??? F=<CALLER@???> R=smartuser T=lmtp H=127.0.0.1 [127.0.0.1]: LMTP error after DATA: 550-I don't like this user\n550 Bad user
 1999-03-02 09:44:33 10HmbA-0005vi-00 -> userxz@??? F=<CALLER@???> R=smartuser T=lmtp H=127.0.0.1 [127.0.0.1] C="250-This one's OK\\n250 OK"
-1999-03-02 09:44:33 10HmbA-0005vi-00 == useryx@??? R=smartuser T=lmtp defer (0): LMTP error after DATA: 440-Here's a whole long message, in several lines,\n440-just for testing that nothing breaks when\n440-we do this\n440 Temporary error
-1999-03-02 09:44:33 10HmbA-0005vi-00 ** useryy@??? F=<CALLER@???> R=smartuser T=lmtp: LMTP error after DATA: 550 Bad user
+1999-03-02 09:44:33 10HmbA-0005vi-00 == useryx@??? R=smartuser T=lmtp defer (0) H=127.0.0.1 [127.0.0.1]: LMTP error after DATA: 440-Here's a whole long message, in several lines,\n440-just for testing that nothing breaks when\n440-we do this\n440 Temporary error
+1999-03-02 09:44:33 10HmbA-0005vi-00 ** useryy@??? F=<CALLER@???> R=smartuser T=lmtp H=127.0.0.1 [127.0.0.1]: LMTP error after DATA: 550 Bad user
 1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> R=10HmbA-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbB-0005vi-00 => :blackhole: <CALLER@???> R=bounces
 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbA-0005vi-00 removed by CALLER
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbC-0005vi-00 ** userx@??? F=<CALLER@???> R=smartuser T=lmtp: SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 550 Receiver BAD
-1999-03-02 09:44:33 10HmbC-0005vi-00 == userxx@??? R=smartuser T=lmtp defer (0): LMTP error after DATA: 440 Temporary error
-1999-03-02 09:44:33 10HmbC-0005vi-00 == userxy@??? R=smartuser T=lmtp defer (-44): SMTP error from remote mail server after RCPT TO:<userxy@???>: host 127.0.0.1 [127.0.0.1]: 450 Receiver temporarily bad
-1999-03-02 09:44:33 10HmbC-0005vi-00 ** userxz@??? F=<CALLER@???> R=smartuser T=lmtp: LMTP error after DATA: 550-I don't like this user\n550 Bad user
+1999-03-02 09:44:33 10HmbC-0005vi-00 ** userx@??? F=<CALLER@???> R=smartuser T=lmtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 550 Receiver BAD
+1999-03-02 09:44:33 10HmbC-0005vi-00 == userxx@??? R=smartuser T=lmtp defer (0) H=127.0.0.1 [127.0.0.1]: LMTP error after DATA: 440 Temporary error
+1999-03-02 09:44:33 10HmbC-0005vi-00 == userxy@??? R=smartuser T=lmtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userxy@???>: 450 Receiver temporarily bad
+1999-03-02 09:44:33 10HmbC-0005vi-00 ** userxz@??? F=<CALLER@???> R=smartuser T=lmtp H=127.0.0.1 [127.0.0.1]: LMTP error after DATA: 550-I don't like this user\n550 Bad user
 1999-03-02 09:44:33 10HmbC-0005vi-00 => useryx@??? F=<CALLER@???> R=smartuser T=lmtp H=127.0.0.1 [127.0.0.1] C="250-This one's OK\\n250 OK"
-1999-03-02 09:44:33 10HmbC-0005vi-00 ** useryy@??? F=<CALLER@???> R=smartuser T=lmtp: SMTP error from remote mail server after RCPT TO:<useryy@???>: host 127.0.0.1 [127.0.0.1]: 550 Receiver BAD
+1999-03-02 09:44:33 10HmbC-0005vi-00 ** useryy@??? F=<CALLER@???> R=smartuser T=lmtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<useryy@???>: 550 Receiver BAD
 1999-03-02 09:44:33 10HmbD-0005vi-00 <= <> R=10HmbC-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbD-0005vi-00 => :blackhole: <CALLER@???> R=bounces
 1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
@@ -46,6 +46,6 @@
 1999-03-02 09:44:33 10HmbF-0005vi-00 -> userxz@??? F=<CALLER@???> R=smartuser T=lmtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbG-0005vi-00 == userx@??? R=smartuser T=lmtp defer (-44): SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 450 LATER
+1999-03-02 09:44:33 10HmbG-0005vi-00 == userx@??? R=smartuser T=lmtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 450 LATER
 1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbH-0005vi-00 == userx@??? R=smartuser T=lmtp defer (-44): SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 450 LATER
+1999-03-02 09:44:33 10HmbH-0005vi-00 == userx@??? R=smartuser T=lmtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 450 LATER
diff --git a/test/log/0217 b/test/log/0217
index 80a018b..1328a46 100644
--- a/test/log/0217
+++ b/test/log/0217
@@ -1,269 +1,269 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmaX-0005vi-00 => a@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK"
-1999-03-02 09:44:33 10HmaX-0005vi-00 == b@??? R=client T=send_to_server defer (-44): SMTP error from remote mail server after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 451 Temp error
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** c@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<c@???>: host 127.0.0.1 [127.0.0.1]: 550 Perm error
+1999-03-02 09:44:33 10HmaX-0005vi-00 == b@??? R=client T=send_to_server defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<b@???>: 451 Temp error
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** c@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<c@???>: 550 Perm error
 1999-03-02 09:44:33 10HmaX-0005vi-00 -> d@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmaY-0005vi-00 ** CALLER@??? R=bounce: just discard
 1999-03-02 09:44:33 10HmaY-0005vi-00 CALLER@???: error ignored
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaZ-0005vi-00 == a@??? R=client T=send_to_server defer (dd): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after RCPT TO:<b@???>
-1999-03-02 09:44:33 10HmaZ-0005vi-00 == b@??? R=client T=send_to_server defer (dd): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after RCPT TO:<b@???>
-1999-03-02 09:44:33 10HmaZ-0005vi-00 == c@??? R=client T=send_to_server defer (dd): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after RCPT TO:<b@???>
+1999-03-02 09:44:33 10HmaZ-0005vi-00 == a@??? R=client T=send_to_server defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after RCPT TO:<b@???>
+1999-03-02 09:44:33 10HmaZ-0005vi-00 == b@??? R=client T=send_to_server defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after RCPT TO:<b@???>
+1999-03-02 09:44:33 10HmaZ-0005vi-00 == c@??? R=client T=send_to_server defer (dd): Connection timed out: SMTP timeout after RCPT TO:<b@???>
 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbA-0005vi-00 == a@??? R=client T=send_to_server defer (-45): SMTP error from remote mail server after MAIL FROM:<CALLER@???>: host 127.0.0.1 [127.0.0.1]: 451 Temp error
-1999-03-02 09:44:33 10HmbA-0005vi-00 == b@??? R=client T=send_to_server defer (-45): SMTP error from remote mail server after MAIL FROM:<CALLER@???>: host 127.0.0.1 [127.0.0.1]: 451 Temp error
+1999-03-02 09:44:33 10HmbA-0005vi-00 == a@??? R=client T=send_to_server defer (-45) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: 451 Temp error
+1999-03-02 09:44:33 10HmbA-0005vi-00 == b@??? R=client T=send_to_server defer (-45) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: 451 Temp error
 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbB-0005vi-00 ** a@??? R=client T=send_to_server: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: host 127.0.0.1 [127.0.0.1]: 550 Perm error
-1999-03-02 09:44:33 10HmbB-0005vi-00 ** b@??? R=client T=send_to_server: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: host 127.0.0.1 [127.0.0.1]: 550 Perm error
+1999-03-02 09:44:33 10HmbB-0005vi-00 ** a@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: 550 Perm error
+1999-03-02 09:44:33 10HmbB-0005vi-00 ** b@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: 550 Perm error
 1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbB-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbC-0005vi-00 ** CALLER@??? R=bounce: just discard
 1999-03-02 09:44:33 10HmbC-0005vi-00 CALLER@???: error ignored
 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbD-0005vi-00 == a@??? R=client T=send_to_server defer (-44): SMTP error from remote mail server after RCPT TO:<a@???>: host 127.0.0.1 [127.0.0.1]: 451 Temp error 1
-1999-03-02 09:44:33 10HmbD-0005vi-00 == b@??? R=client T=send_to_server defer (-44): SMTP error from remote mail server after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 451 Temp error 2
+1999-03-02 09:44:33 10HmbD-0005vi-00 == a@??? R=client T=send_to_server defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<a@???>: 451 Temp error 1
+1999-03-02 09:44:33 10HmbD-0005vi-00 == b@??? R=client T=send_to_server defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<b@???>: 451 Temp error 2
 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbE-0005vi-00 ** a@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<a@???>: host 127.0.0.1 [127.0.0.1]: 551 Perm error 1
-1999-03-02 09:44:33 10HmbE-0005vi-00 ** b@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 551 Perm error 2
+1999-03-02 09:44:33 10HmbE-0005vi-00 ** a@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<a@???>: 551 Perm error 1
+1999-03-02 09:44:33 10HmbE-0005vi-00 ** b@??? 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@???>: 551 Perm error 2
 1999-03-02 09:44:33 10HmbF-0005vi-00 <= <> R=10HmbE-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbF-0005vi-00 ** CALLER@??? R=bounce: just discard
 1999-03-02 09:44:33 10HmbF-0005vi-00 CALLER@???: error ignored
 1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbG-0005vi-00 == a@??? R=client T=send_to_server defer (-44): SMTP error from remote mail server after RCPT TO:<a@???>: host 127.0.0.1 [127.0.0.1]: 451 Temp error 1
-1999-03-02 09:44:33 10HmbG-0005vi-00 ** b@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 551 Perm error 2
+1999-03-02 09:44:33 10HmbG-0005vi-00 == a@??? R=client T=send_to_server defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<a@???>: 451 Temp error 1
+1999-03-02 09:44:33 10HmbG-0005vi-00 ** b@??? 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@???>: 551 Perm error 2
 1999-03-02 09:44:33 10HmbH-0005vi-00 <= <> R=10HmbG-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbH-0005vi-00 ** CALLER@??? R=bounce: just discard
 1999-03-02 09:44:33 10HmbH-0005vi-00 CALLER@???: error ignored
 1999-03-02 09:44:33 10HmbH-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbI-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbI-0005vi-00 ** a@??? R=client T=send_to_server: SMTP error from remote mail server after pipelined DATA: host 127.0.0.1 [127.0.0.1]: 503 Sorry perm data error
-1999-03-02 09:44:33 10HmbI-0005vi-00 ** b@??? R=client T=send_to_server: SMTP error from remote mail server after pipelined DATA: host 127.0.0.1 [127.0.0.1]: 503 Sorry perm data error
+1999-03-02 09:44:33 10HmbI-0005vi-00 ** a@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined DATA: 503 Sorry perm data error
+1999-03-02 09:44:33 10HmbI-0005vi-00 ** b@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined DATA: 503 Sorry perm data error
 1999-03-02 09:44:33 10HmbJ-0005vi-00 <= <> R=10HmbI-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbJ-0005vi-00 ** CALLER@??? R=bounce: just discard
 1999-03-02 09:44:33 10HmbJ-0005vi-00 CALLER@???: error ignored
 1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbI-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbK-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbK-0005vi-00 == a@??? R=client T=send_to_server defer (-46): SMTP error from remote mail server after pipelined DATA: host 127.0.0.1 [127.0.0.1]: 403 Sorry temp data error
-1999-03-02 09:44:33 10HmbK-0005vi-00 == b@??? R=client T=send_to_server defer (-46): SMTP error from remote mail server after pipelined DATA: host 127.0.0.1 [127.0.0.1]: 403 Sorry temp data error
+1999-03-02 09:44:33 10HmbK-0005vi-00 == a@??? 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
+1999-03-02 09:44:33 10HmbK-0005vi-00 == b@??? 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
 1999-03-02 09:44:33 10HmbL-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbL-0005vi-00 == yes@??? R=client T=send_to_server defer (-46): SMTP error from remote mail server after pipelined DATA: host 127.0.0.1 [127.0.0.1]: 403 Sorry temp data error
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n00@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n00@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n01@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n01@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n02@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n02@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n03@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n03@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n04@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n04@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n05@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n05@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n06@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n06@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n07@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n07@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n08@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n08@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n09@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n09@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n10@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n10@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n11@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n11@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n12@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n12@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n13@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n13@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n14@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n14@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n15@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n15@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n16@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n16@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n17@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n17@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n18@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n18@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n19@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n19@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n20@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n20@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n21@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n21@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n22@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n22@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n23@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n23@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n24@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n24@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n25@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n25@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n26@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n26@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n27@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n27@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n28@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n28@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n29@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n29@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n30@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n30@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n31@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n31@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n32@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n32@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n33@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n33@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n34@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n34@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n35@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n35@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n36@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n36@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n37@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n37@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n38@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n38@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n39@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n39@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n40@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n40@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n41@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n41@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n42@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n42@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n43@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n43@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n44@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n44@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n45@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n45@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n46@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n46@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n47@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n47@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n48@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n48@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n49@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n49@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n50@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n50@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n51@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n51@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n52@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n52@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n53@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n53@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n54@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n54@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n55@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n55@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n56@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n56@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n57@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n57@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n58@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n58@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n59@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n59@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n60@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n60@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n61@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n61@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n62@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n62@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n63@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n63@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n64@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n64@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n65@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n65@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n66@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n66@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n67@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n67@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n68@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n68@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n69@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n69@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n70@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n70@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n71@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n71@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n72@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n72@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n73@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n73@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n74@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n74@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n75@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n75@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n76@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n76@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n77@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n77@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n78@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n78@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n79@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n79@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n80@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n80@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n81@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n81@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n82@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n82@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n83@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n83@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n84@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n84@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n85@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n85@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n86@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n86@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n87@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n87@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n88@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n88@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n89@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n89@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n90@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n90@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n91@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n91@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n92@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n92@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n93@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n93@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n94@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n94@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n95@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n95@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n96@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n96@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n97@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n97@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n98@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n98@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n99@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n99@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n100@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n100@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n101@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n101@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n102@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n102@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n103@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n103@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n104@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n104@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n105@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n105@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n106@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n106@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n107@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n107@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n108@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n108@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n109@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n109@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n110@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n110@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n111@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n111@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n112@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n112@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n113@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n113@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n114@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n114@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n115@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n115@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n116@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n116@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n117@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n117@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n118@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n118@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n119@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n119@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n120@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n120@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n121@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n121@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n122@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n122@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n123@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n123@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n124@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n124@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n125@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n125@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n126@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n126@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n127@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n127@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n128@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n128@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n129@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n129@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n130@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n130@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n131@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n131@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n132@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n132@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n133@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n133@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n134@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n134@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n135@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n135@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n136@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n136@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n137@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n137@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n138@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n138@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n139@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n139@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n140@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n140@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n141@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n141@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n142@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n142@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n143@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n143@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n144@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n144@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n145@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n145@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n146@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n146@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n147@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n147@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n148@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n148@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n149@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n149@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n150@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n150@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n151@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n151@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n152@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n152@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n153@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n153@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n154@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n154@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n155@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n155@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n156@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n156@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n157@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n157@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n158@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n158@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n159@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n159@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n160@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n160@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n161@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n161@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n162@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n162@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n163@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n163@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n164@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n164@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n165@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n165@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n166@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n166@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n167@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n167@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n168@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n168@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n169@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n169@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n170@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n170@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n171@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n171@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n172@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n172@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n173@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n173@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n174@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n174@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n175@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n175@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n176@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n176@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n177@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n177@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n178@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n178@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n179@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n179@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n180@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n180@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n181@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n181@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n182@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n182@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n183@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n183@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n184@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n184@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n185@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n185@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n186@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n186@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n187@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n187@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n188@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n188@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n189@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n189@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n190@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n190@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n191@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n191@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n192@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n192@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n193@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n193@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n194@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n194@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n195@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n195@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n196@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n196@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n197@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n197@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n198@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n198@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n199@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n199@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 == yes@??? 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
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n00@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n00@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n01@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n01@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n02@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n02@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n03@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n03@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n04@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n04@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n05@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n05@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n06@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n06@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n07@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n07@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n08@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n08@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n09@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n09@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n10@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n10@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n11@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n11@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n12@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n12@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n13@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n13@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n14@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n14@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n15@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n15@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n16@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n16@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n17@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n17@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n18@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n18@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n19@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n19@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n20@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n20@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n21@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n21@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n22@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n22@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n23@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n23@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n24@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n24@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n25@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n25@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n26@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n26@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n27@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n27@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n28@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n28@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n29@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n29@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n30@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n30@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n31@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n31@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n32@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n32@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n33@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n33@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n34@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n34@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n35@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n35@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n36@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n36@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n37@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n37@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n38@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n38@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n39@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n39@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n40@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n40@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n41@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n41@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n42@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n42@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n43@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n43@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n44@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n44@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n45@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n45@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n46@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n46@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n47@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n47@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n48@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n48@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n49@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n49@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n50@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n50@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n51@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n51@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n52@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n52@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n53@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n53@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n54@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n54@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n55@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n55@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n56@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n56@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n57@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n57@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n58@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n58@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n59@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n59@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n60@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n60@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n61@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n61@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n62@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n62@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n63@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n63@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n64@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n64@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n65@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n65@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n66@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n66@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n67@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n67@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n68@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n68@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n69@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n69@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n70@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n70@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n71@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n71@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n72@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n72@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n73@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n73@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n74@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n74@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n75@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n75@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n76@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n76@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n77@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n77@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n78@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n78@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n79@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n79@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n80@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n80@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n81@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n81@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n82@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n82@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n83@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n83@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n84@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n84@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n85@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n85@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n86@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n86@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n87@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n87@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n88@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n88@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n89@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n89@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n90@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n90@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n91@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n91@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n92@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n92@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n93@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n93@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n94@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n94@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n95@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n95@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n96@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n96@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n97@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n97@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n98@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n98@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n99@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n99@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n100@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n100@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n101@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n101@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n102@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n102@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n103@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n103@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n104@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n104@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n105@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n105@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n106@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n106@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n107@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n107@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n108@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n108@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n109@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n109@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n110@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n110@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n111@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n111@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n112@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n112@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n113@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n113@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n114@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n114@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n115@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n115@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n116@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n116@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n117@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n117@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n118@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n118@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n119@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n119@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n120@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n120@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n121@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n121@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n122@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n122@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n123@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n123@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n124@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n124@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n125@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n125@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n126@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n126@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n127@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n127@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n128@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n128@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n129@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n129@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n130@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n130@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n131@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n131@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n132@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n132@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n133@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n133@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n134@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n134@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n135@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n135@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n136@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n136@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n137@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n137@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n138@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n138@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n139@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n139@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n140@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n140@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n141@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n141@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n142@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n142@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n143@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n143@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n144@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n144@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n145@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n145@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n146@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n146@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n147@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n147@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n148@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n148@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n149@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n149@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n150@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n150@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n151@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n151@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n152@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n152@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n153@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n153@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n154@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n154@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n155@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n155@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n156@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n156@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n157@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n157@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n158@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n158@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n159@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n159@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n160@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n160@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n161@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n161@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n162@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n162@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n163@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n163@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n164@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n164@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n165@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n165@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n166@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n166@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n167@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n167@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n168@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n168@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n169@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n169@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n170@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n170@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n171@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n171@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n172@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n172@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n173@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n173@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n174@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n174@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n175@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n175@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n176@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n176@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n177@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n177@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n178@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n178@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n179@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n179@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n180@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n180@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n181@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n181@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n182@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n182@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n183@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n183@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n184@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n184@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n185@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n185@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n186@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n186@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n187@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n187@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n188@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n188@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n189@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n189@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n190@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n190@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n191@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n191@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n192@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n192@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n193@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n193@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n194@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n194@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n195@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n195@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n196@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n196@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n197@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n197@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n198@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n198@???>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n199@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n199@???>: 550 NO
 1999-03-02 09:44:33 10HmbM-0005vi-00 <= <> R=10HmbL-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbM-0005vi-00 ** CALLER@??? R=bounce: just discard
 1999-03-02 09:44:33 10HmbM-0005vi-00 CALLER@???: error ignored
 1999-03-02 09:44:33 10HmbM-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbN-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbN-0005vi-00 Remote host 127.0.0.1 [127.0.0.1] closed connection in response to RCPT TO:<c@???>
-1999-03-02 09:44:33 10HmbN-0005vi-00 == a@??? R=client T=send_to_server defer (-18): Remote host 127.0.0.1 [127.0.0.1] closed connection in response to RCPT TO:<c@???>
-1999-03-02 09:44:33 10HmbN-0005vi-00 ** b@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbN-0005vi-00 == c@??? R=client T=send_to_server defer (-18): Remote host 127.0.0.1 [127.0.0.1] closed connection in response to RCPT TO:<c@???>
-1999-03-02 09:44:33 10HmbN-0005vi-00 == d@??? R=client T=send_to_server defer (-18): Remote host 127.0.0.1 [127.0.0.1] closed connection in response to RCPT TO:<c@???>
-1999-03-02 09:44:33 10HmbN-0005vi-00 == e@??? R=client T=send_to_server defer (-18): Remote host 127.0.0.1 [127.0.0.1] closed connection in response to RCPT TO:<c@???>
+1999-03-02 09:44:33 10HmbN-0005vi-00 H=127.0.0.1 [127.0.0.1]: Remote host closed connection in response to RCPT TO:<c@???>
+1999-03-02 09:44:33 10HmbN-0005vi-00 == a@??? R=client T=send_to_server defer (-18) H=127.0.0.1 [127.0.0.1]: Remote host closed connection in response to RCPT TO:<c@???>
+1999-03-02 09:44:33 10HmbN-0005vi-00 ** b@??? 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@???>: 550 NO
+1999-03-02 09:44:33 10HmbN-0005vi-00 == c@??? R=client T=send_to_server defer (-18) H=127.0.0.1 [127.0.0.1]: Remote host closed connection in response to RCPT TO:<c@???>
+1999-03-02 09:44:33 10HmbN-0005vi-00 == d@??? R=client T=send_to_server defer (-18) H=127.0.0.1 [127.0.0.1]: Remote host closed connection in response to RCPT TO:<c@???>
+1999-03-02 09:44:33 10HmbN-0005vi-00 == e@??? R=client T=send_to_server defer (-18) H=127.0.0.1 [127.0.0.1]: Remote host closed connection in response to RCPT TO:<c@???>
 1999-03-02 09:44:33 10HmbO-0005vi-00 <= <> R=10HmbN-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbO-0005vi-00 ** CALLER@??? R=bounce: just discard
 1999-03-02 09:44:33 10HmbO-0005vi-00 CALLER@???: error ignored
diff --git a/test/log/0218 b/test/log/0218
index e246b2c..4aac50d 100644
--- a/test/log/0218
+++ b/test/log/0218
@@ -9,10 +9,10 @@
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
 1999-03-02 09:44:33 Start queue run: pid=pppp -qq
-1999-03-02 09:44:33 10HmaZ-0005vi-00 ** a@??? F=<CALLER@???> R=client T=send_to_server: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+1999-03-02 09:44:33 10HmaZ-0005vi-00 ** a@??? F=<CALLER@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: 550 NO
 1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbA-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmbA-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
 1999-03-02 09:44:33 10HmbA-0005vi-00 == b@??? R=client T=send_to_server defer (dd): Connection refused
 1999-03-02 09:44:33 End queue run: pid=pppp -qq
 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
@@ -20,7 +20,7 @@
 1999-03-02 09:44:33 10HmbB-0005vi-00 ** CALLER@??? F=<> R=bounce: just discard
 1999-03-02 09:44:33 10HmbB-0005vi-00 CALLER@???: error ignored
 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbA-0005vi-00 ** b@??? F=<CALLER@???> R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 550 Unknown
+1999-03-02 09:44:33 10HmbA-0005vi-00 ** b@??? F=<CALLER@???> 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@???>: 550 Unknown
 1999-03-02 09:44:33 10HmbD-0005vi-00 <= <> R=10HmbA-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbC-0005vi-00 => c@??? F=<CALLER@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK"
diff --git a/test/log/0228 b/test/log/0228
index 2ca7720..646034c 100644
--- a/test/log/0228
+++ b/test/log/0228
@@ -1,3 +1,3 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
 1999-03-02 09:44:33 10HmaX-0005vi-00 == abcd@??? R=all T=smtp defer (0): smtp transport found host ip4.ip4.ip4.ip4 to be local
diff --git a/test/log/0229 b/test/log/0229
index 10da189..193bf3c 100644
--- a/test/log/0229
+++ b/test/log/0229
@@ -1,7 +1,7 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
-1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
-1999-03-02 09:44:33 10HmaX-0005vi-00 ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] Connection refused
-1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
-1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] Connection refused
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
 1999-03-02 09:44:33 10HmaX-0005vi-00 == a@??? R=all T=smtp defer (dd): Connection refused
diff --git a/test/log/0253 b/test/log/0253
index 527cb1a..57b00c8 100644
--- a/test/log/0253
+++ b/test/log/0253
@@ -7,7 +7,7 @@
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= pqr@??? U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx@??? P=<pqr=userx+myhost.test.ex@???> R=r3 T=t3 H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => phil@??? P=<pqr=phil+myhost.test.ex@???> R=r3 T=t3 H=127.0.0.1 [127.0.0.1] C="250 OK"
-1999-03-02 09:44:33 10HmaZ-0005vi-00 ** fail@??? P=<pqr=fail+myhost.test.ex@???> R=r3 T=t3: SMTP error from remote mail server after RCPT TO:<fail@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
+1999-03-02 09:44:33 10HmaZ-0005vi-00 ** fail@??? P=<pqr=fail+myhost.test.ex@???> R=r3 T=t3 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<fail@???>: 550 Recipient not OK
 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbA-0005vi-00 => lmn <lmn@???> P=<> R=r0 T=t0
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
diff --git a/test/log/0257 b/test/log/0257
index 49461e2..8822a6e 100644
--- a/test/log/0257
+++ b/test/log/0257
@@ -1,4 +1,4 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 ten-1.test.ex [V4NET.0.0.1] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 ten-2.test.ex [V4NET.0.0.2] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-1.test.ex [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-2.test.ex [V4NET.0.0.2] Network Error
 1999-03-02 09:44:33 10HmaX-0005vi-00 == abcd@??? R=all T=smtp defer (dd): Network Error
diff --git a/test/log/0276 b/test/log/0276
index e2b75e6..b5a5613 100644
--- a/test/log/0276
+++ b/test/log/0276
@@ -1,16 +1,16 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@??? R=r1 T=t1: SMTP error from remote mail server after pipelined DATA: host 127.0.0.1 [127.0.0.1]: 500 NO
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined DATA: 500 NO
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmaY-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
 1999-03-02 09:44:33 10HmaY-0005vi-00 == CALLER@??? R=r1 T=t1 defer (dd): Connection refused
 1999-03-02 09:44:33 10HmaY-0005vi-00 ** CALLER@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmaY-0005vi-00 CALLER@???: error ignored
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaZ-0005vi-00 ** userx@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 500 NO
+1999-03-02 09:44:33 10HmaZ-0005vi-00 ** userx@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after DATA: 500 NO
 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss
-1999-03-02 09:44:33 10HmbA-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmbA-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
 1999-03-02 09:44:33 10HmbA-0005vi-00 == CALLER@??? R=r1 T=t1 defer (dd): Connection refused
 1999-03-02 09:44:33 10HmbA-0005vi-00 ** CALLER@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmbA-0005vi-00 CALLER@???: error ignored
diff --git a/test/log/0285 b/test/log/0285
index b0c90f1..4e46a52 100644
--- a/test/log/0285
+++ b/test/log/0285
@@ -2,8 +2,8 @@
 1999-03-02 09:44:33 Start queue run: pid=pppp
 1999-03-02 09:44:33 10HmaX-0005vi-00 => a@??? R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaX-0005vi-00 -> b@??? R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** c@??? R=all T=smtp: SMTP error from remote mail server after RCPT TO:<c@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** d@??? R=all T=smtp: SMTP error from remote mail server after RCPT TO:<d@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** c@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<c@???>: 550 Recipient not OK
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** d@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d@???>: 550 Recipient not OK
 1999-03-02 09:44:33 10HmaX-0005vi-00 => e@??? R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaX-0005vi-00 -> f@??? R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
@@ -15,8 +15,8 @@
 1999-03-02 09:44:33 Start queue run: pid=pppp
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => a@??? R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaZ-0005vi-00 -> b@??? R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
-1999-03-02 09:44:33 10HmaZ-0005vi-00 ** c@??? R=all T=smtp: SMTP error from remote mail server after RCPT TO:<c@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
-1999-03-02 09:44:33 10HmaZ-0005vi-00 ** d@??? R=all T=smtp: SMTP error from remote mail server after RCPT TO:<d@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
+1999-03-02 09:44:33 10HmaZ-0005vi-00 ** c@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<c@???>: 550 Recipient not OK
+1999-03-02 09:44:33 10HmaZ-0005vi-00 ** d@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d@???>: 550 Recipient not OK
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => e@??? R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaZ-0005vi-00 -> f@??? R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => g@??? R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
diff --git a/test/log/0286 b/test/log/0286
index 52e28a4..a8e02ed 100644
--- a/test/log/0286
+++ b/test/log/0286
@@ -2,8 +2,8 @@
 1999-03-02 09:44:33 Start queue run: pid=pppp
 1999-03-02 09:44:33 10HmaX-0005vi-00 => a@??? R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaX-0005vi-00 -> b@??? R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** c@??? R=all T=smtp: SMTP error from remote mail server after RCPT TO:<c@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** d@??? R=all T=smtp: SMTP error from remote mail server after RCPT TO:<d@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** c@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<c@???>: 550 Recipient not OK
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** d@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d@???>: 550 Recipient not OK
 1999-03-02 09:44:33 10HmaX-0005vi-00 => e@??? R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaX-0005vi-00 => f@??? R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
@@ -15,12 +15,12 @@
 1999-03-02 09:44:33 End queue run: pid=pppp
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
 1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaZ-0005vi-00 ** a@??? R=all T=smtp: SMTP error from remote mail server after RCPT TO:<a@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
-1999-03-02 09:44:33 10HmaZ-0005vi-00 ** b@??? R=all T=smtp: SMTP error from remote mail server after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
+1999-03-02 09:44:33 10HmaZ-0005vi-00 ** a@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<a@???>: 550 Recipient not OK
+1999-03-02 09:44:33 10HmaZ-0005vi-00 ** b@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<b@???>: 550 Recipient not OK
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => c@??? R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaZ-0005vi-00 -> d@??? R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
-1999-03-02 09:44:33 10HmaZ-0005vi-00 ** e@??? R=all T=smtp: SMTP error from remote mail server after RCPT TO:<e@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
-1999-03-02 09:44:33 10HmaZ-0005vi-00 ** f@??? R=all T=smtp: SMTP error from remote mail server after RCPT TO:<f@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
+1999-03-02 09:44:33 10HmaZ-0005vi-00 ** e@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<e@???>: 550 Recipient not OK
+1999-03-02 09:44:33 10HmaZ-0005vi-00 ** f@??? R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<f@???>: 550 Recipient not OK
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => g@??? R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaZ-0005vi-00 -> h@??? R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss
diff --git a/test/log/0322 b/test/log/0322
index e90cb9c..0c45cc5 100644
--- a/test/log/0322
+++ b/test/log/0322
@@ -1,32 +1,32 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to pipelined DATA
-1999-03-02 09:44:33 10HmaX-0005vi-00 == x@??? R=remote T=smtp defer (-19): Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to pipelined DATA
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]: Malformed SMTP reply (an empty line) in response to pipelined DATA
+1999-03-02 09:44:33 10HmaX-0005vi-00 == x@??? R=remote T=smtp defer (-19) H=127.0.0.1 [127.0.0.1]: Malformed SMTP reply (an empty line) in response to pipelined DATA
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** x@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <CALLER@???> R=null
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaZ-0005vi-00 Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to RCPT TO:<x@???>
-1999-03-02 09:44:33 10HmaZ-0005vi-00 == x@??? R=remote T=smtp defer (-19): Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to RCPT TO:<x@???>
+1999-03-02 09:44:33 10HmaZ-0005vi-00 H=127.0.0.1 [127.0.0.1]: Malformed SMTP reply (an empty line) in response to RCPT TO:<x@???>
+1999-03-02 09:44:33 10HmaZ-0005vi-00 == x@??? R=remote T=smtp defer (-19) H=127.0.0.1 [127.0.0.1]: Malformed SMTP reply (an empty line) in response to RCPT TO:<x@???>
 1999-03-02 09:44:33 10HmaZ-0005vi-00 ** x@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <CALLER@???> R=null
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbB-0005vi-00 Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to MAIL FROM:<CALLER@???>
-1999-03-02 09:44:33 10HmbB-0005vi-00 == x@??? R=remote T=smtp defer (-19): Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to MAIL FROM:<CALLER@???>
+1999-03-02 09:44:33 10HmbB-0005vi-00 H=127.0.0.1 [127.0.0.1]: Malformed SMTP reply (an empty line) in response to MAIL FROM:<CALLER@???>
+1999-03-02 09:44:33 10HmbB-0005vi-00 == x@??? R=remote T=smtp defer (-19) H=127.0.0.1 [127.0.0.1]: Malformed SMTP reply (an empty line) in response to MAIL FROM:<CALLER@???>
 1999-03-02 09:44:33 10HmbB-0005vi-00 ** x@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbB-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbC-0005vi-00 => :blackhole: <CALLER@???> R=null
 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbD-0005vi-00 Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to RCPT TO:<y@???>
-1999-03-02 09:44:33 10HmbD-0005vi-00 == x@??? R=remote T=smtp defer (-19): Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to RCPT TO:<y@???>
-1999-03-02 09:44:33 10HmbD-0005vi-00 == y@??? R=remote T=smtp defer (-19): Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to RCPT TO:<y@???>
-1999-03-02 09:44:33 10HmbD-0005vi-00 == z@??? R=remote T=smtp defer (-19): Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to RCPT TO:<y@???>
+1999-03-02 09:44:33 10HmbD-0005vi-00 H=127.0.0.1 [127.0.0.1]: Malformed SMTP reply (an empty line) in response to RCPT TO:<y@???>
+1999-03-02 09:44:33 10HmbD-0005vi-00 == x@??? R=remote T=smtp defer (-19) H=127.0.0.1 [127.0.0.1]: Malformed SMTP reply (an empty line) in response to RCPT TO:<y@???>
+1999-03-02 09:44:33 10HmbD-0005vi-00 == y@??? R=remote T=smtp defer (-19) H=127.0.0.1 [127.0.0.1]: Malformed SMTP reply (an empty line) in response to RCPT TO:<y@???>
+1999-03-02 09:44:33 10HmbD-0005vi-00 == z@??? R=remote T=smtp defer (-19) H=127.0.0.1 [127.0.0.1]: Malformed SMTP reply (an empty line) in response to RCPT TO:<y@???>
 1999-03-02 09:44:33 10HmbD-0005vi-00 ** z@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmbD-0005vi-00 ** y@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmbD-0005vi-00 ** x@???: retry timeout exceeded
@@ -35,8 +35,8 @@
 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbF-0005vi-00 == a@??? R=remote T=smtp defer (-44): SMTP error from remote mail server after RCPT TO:<a@???>: host 127.0.0.1 [127.0.0.1]: 450 Recipient bad
-1999-03-02 09:44:33 10HmbF-0005vi-00 == b@??? R=remote T=smtp defer (-44): SMTP error from remote mail server after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 450 Recipient bad
+1999-03-02 09:44:33 10HmbF-0005vi-00 == a@??? R=remote T=smtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<a@???>: 450 Recipient bad
+1999-03-02 09:44:33 10HmbF-0005vi-00 == b@??? R=remote T=smtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<b@???>: 450 Recipient bad
 1999-03-02 09:44:33 10HmbF-0005vi-00 ** b@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmbF-0005vi-00 ** a@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmbG-0005vi-00 <= <> R=10HmbF-0005vi-00 U=EXIMUSER P=local S=sss
@@ -44,34 +44,34 @@
 1999-03-02 09:44:33 10HmbG-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbH-0005vi-00 Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to DATA
-1999-03-02 09:44:33 10HmbH-0005vi-00 == x@??? R=remote T=smtp defer (-19): Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to DATA
+1999-03-02 09:44:33 10HmbH-0005vi-00 H=127.0.0.1 [127.0.0.1]: Malformed SMTP reply (an empty line) in response to DATA
+1999-03-02 09:44:33 10HmbH-0005vi-00 == x@??? R=remote T=smtp defer (-19) H=127.0.0.1 [127.0.0.1]: Malformed SMTP reply (an empty line) in response to DATA
 1999-03-02 09:44:33 10HmbH-0005vi-00 ** x@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmbI-0005vi-00 <= <> R=10HmbH-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbI-0005vi-00 => :blackhole: <CALLER@???> R=null
 1999-03-02 09:44:33 10HmbI-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbH-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbJ-0005vi-00 Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to RCPT TO:<x@???>
-1999-03-02 09:44:33 10HmbJ-0005vi-00 == x@??? R=remote T=smtp defer (-19): Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to RCPT TO:<x@???>
+1999-03-02 09:44:33 10HmbJ-0005vi-00 H=127.0.0.1 [127.0.0.1]: Malformed SMTP reply (an empty line) in response to RCPT TO:<x@???>
+1999-03-02 09:44:33 10HmbJ-0005vi-00 == x@??? R=remote T=smtp defer (-19) H=127.0.0.1 [127.0.0.1]: Malformed SMTP reply (an empty line) in response to RCPT TO:<x@???>
 1999-03-02 09:44:33 10HmbJ-0005vi-00 ** x@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmbK-0005vi-00 <= <> R=10HmbJ-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbK-0005vi-00 => :blackhole: <CALLER@???> R=null
 1999-03-02 09:44:33 10HmbK-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbL-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbL-0005vi-00 Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to MAIL FROM:<CALLER@???>
-1999-03-02 09:44:33 10HmbL-0005vi-00 == x@??? R=remote T=smtp defer (-19): Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to MAIL FROM:<CALLER@???>
+1999-03-02 09:44:33 10HmbL-0005vi-00 H=127.0.0.1 [127.0.0.1]: Malformed SMTP reply (an empty line) in response to MAIL FROM:<CALLER@???>
+1999-03-02 09:44:33 10HmbL-0005vi-00 == x@??? R=remote T=smtp defer (-19) H=127.0.0.1 [127.0.0.1]: Malformed SMTP reply (an empty line) in response to MAIL FROM:<CALLER@???>
 1999-03-02 09:44:33 10HmbL-0005vi-00 ** x@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmbM-0005vi-00 <= <> R=10HmbL-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbM-0005vi-00 => :blackhole: <CALLER@???> R=null
 1999-03-02 09:44:33 10HmbM-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbL-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbN-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbN-0005vi-00 Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to RCPT TO:<y@???>
-1999-03-02 09:44:33 10HmbN-0005vi-00 == x@??? R=remote T=smtp defer (-19): Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to RCPT TO:<y@???>
-1999-03-02 09:44:33 10HmbN-0005vi-00 == y@??? R=remote T=smtp defer (-19): Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to RCPT TO:<y@???>
-1999-03-02 09:44:33 10HmbN-0005vi-00 == z@??? R=remote T=smtp defer (-19): Malformed SMTP reply (an empty line) from 127.0.0.1 [127.0.0.1] in response to RCPT TO:<y@???>
+1999-03-02 09:44:33 10HmbN-0005vi-00 H=127.0.0.1 [127.0.0.1]: Malformed SMTP reply (an empty line) in response to RCPT TO:<y@???>
+1999-03-02 09:44:33 10HmbN-0005vi-00 == x@??? R=remote T=smtp defer (-19) H=127.0.0.1 [127.0.0.1]: Malformed SMTP reply (an empty line) in response to RCPT TO:<y@???>
+1999-03-02 09:44:33 10HmbN-0005vi-00 == y@??? R=remote T=smtp defer (-19) H=127.0.0.1 [127.0.0.1]: Malformed SMTP reply (an empty line) in response to RCPT TO:<y@???>
+1999-03-02 09:44:33 10HmbN-0005vi-00 == z@??? R=remote T=smtp defer (-19) H=127.0.0.1 [127.0.0.1]: Malformed SMTP reply (an empty line) in response to RCPT TO:<y@???>
 1999-03-02 09:44:33 10HmbN-0005vi-00 ** z@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmbN-0005vi-00 ** y@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmbN-0005vi-00 ** x@???: retry timeout exceeded
diff --git a/test/log/0343 b/test/log/0343
index 560bdd0..cdeaab3 100644
--- a/test/log/0343
+++ b/test/log/0343
@@ -1,4 +1,4 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
 1999-03-02 09:44:33 10HmaX-0005vi-00 == x@y R=all T=remote_smtp defer (dd): Connection refused
 1999-03-02 09:44:33 10HmaX-0005vi-00 == x@y R=all T=remote_smtp defer (-53): retry time not reached for any host
diff --git a/test/log/0357 b/test/log/0357
index 0aa9fd7..4a4ed55 100644
--- a/test/log/0357
+++ b/test/log/0357
@@ -1,10 +1,10 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
 1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
 1999-03-02 09:44:33 End queue run: pid=pppp
 1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
 1999-03-02 09:44:33 End queue run: pid=pppp
 1999-03-02 09:44:33 Start queue run: pid=pppp
 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? routing defer (-51): retry time not reached
diff --git a/test/log/0358 b/test/log/0358
index 233e6bd..86351c3 100644
--- a/test/log/0358
+++ b/test/log/0358
@@ -1,7 +1,7 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
-1999-03-02 09:44:33 10HmaX-0005vi-00 == usery@??? R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<usery@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
+1999-03-02 09:44:33 10HmaX-0005vi-00 == usery@??? R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@???>: 451 Temporary error
 1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
-1999-03-02 09:44:33 10HmaX-0005vi-00 == usery@??? R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<usery@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
+1999-03-02 09:44:33 10HmaX-0005vi-00 == usery@??? R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@???>: 451 Temporary error
 1999-03-02 09:44:33 End queue run: pid=pppp
diff --git a/test/log/0366 b/test/log/0366
index 0104bed..62afef0 100644
--- a/test/log/0366
+++ b/test/log/0366
@@ -1,20 +1,20 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 ten-3.test.ex [V4NET.0.0.3] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 ten-5.test.ex [V4NET.0.0.5] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 ten-4.test.ex [V4NET.0.0.4] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 ten-2.test.ex [V4NET.0.0.2] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 ten-1.test.ex [V4NET.0.0.1] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 black-2.test.ex [V4NET.11.12.14] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-3.test.ex [V4NET.0.0.3] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-5.test.ex [V4NET.0.0.5] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-4.test.ex [V4NET.0.0.4] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-2.test.ex [V4NET.0.0.2] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-1.test.ex [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=black-2.test.ex [V4NET.11.12.14] Network Error
 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=smtp defer (dd): Network Error
 1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaX-0005vi-00 ten-3.test.ex [V4NET.0.0.3] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 ten-5.test.ex [V4NET.0.0.5] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 ten-4.test.ex [V4NET.0.0.4] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 ten-2.test.ex [V4NET.0.0.2] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 ten-1.test.ex [V4NET.0.0.1] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 ten-6.test.ex [V4NET.0.0.6] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 black-2.test.ex [V4NET.11.12.14] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 black-1.test.ex [V4NET.11.12.13] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-3.test.ex [V4NET.0.0.3] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-5.test.ex [V4NET.0.0.5] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-4.test.ex [V4NET.0.0.4] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-2.test.ex [V4NET.0.0.2] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-1.test.ex [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-6.test.ex [V4NET.0.0.6] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=black-2.test.ex [V4NET.11.12.14] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=black-1.test.ex [V4NET.11.12.13] Network Error
 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=smtp defer (dd): Network Error
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
diff --git a/test/log/0374 b/test/log/0374
index b3a8400..abbd3ad 100644
--- a/test/log/0374
+++ b/test/log/0374
@@ -9,13 +9,13 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** b1@??? R=ut2 T=ut2: Child process of ut2 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file
 1999-03-02 09:44:33 10HmaX-0005vi-00 == c1@??? 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
 1999-03-02 09:44:33 10HmaX-0005vi-00 => d1@??? R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1] C="250 OK"
-1999-03-02 09:44:33 10HmaX-0005vi-00 == d2@??? R=ut4 T=ut4 defer (-44): SMTP error from remote mail server after RCPT TO:<d2@???>: host 127.0.0.1 [127.0.0.1]: 450 soft error
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** d3@??? R=ut4 T=ut4: SMTP error from remote mail server after RCPT TO:<d3@???>: host 127.0.0.1 [127.0.0.1]: 550 hard error
+1999-03-02 09:44:33 10HmaX-0005vi-00 == d2@??? 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@???>: 450 soft error
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** d3@??? R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d3@???>: 550 hard error
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER <CALLER@???> R=real T=real
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
 1999-03-02 09:44:33 10HmaX-0005vi-00 == c1@??? 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
-1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
 1999-03-02 09:44:33 10HmaX-0005vi-00 == d2@??? R=ut4 T=ut4 defer (dd): Connection refused
 1999-03-02 09:44:33 End queue run: pid=pppp -qf
diff --git a/test/log/0388 b/test/log/0388
index 094a3ba..5e45415 100644
--- a/test/log/0388
+++ b/test/log/0388
@@ -1,7 +1,7 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mail server after RCPT TO:<x@y>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
-1999-03-02 09:44:33 10HmaX-0005vi-00 V4NET.0.0.0 [V4NET.0.0.0] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 == x@y R=r1 T=smtp defer (dd): Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@y>: 451 Temporary error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=V4NET.0.0.0 [V4NET.0.0.0] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 == x@y R=r1 T=smtp defer (dd): Network Error H=127.0.0.1 [127.0.0.1]
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** x@y: retry timeout exceeded
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <CALLER@???> R=r0
diff --git a/test/log/0426 b/test/log/0426
index b5ff4c5..c6d7d56 100644
--- a/test/log/0426
+++ b/test/log/0426
@@ -1,5 +1,5 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** x@??? R=r1 T=t1: SMTP error from remote mail server after RCPT TO:<x@???>: host uppercase.test.ex [127.0.0.1]: 550 Unknown
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** x@??? R=r1 T=t1 H=uppercase.test.ex [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@???>: 550 Unknown
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <CALLER@???> R=r0
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
diff --git a/test/log/0429 b/test/log/0429
index c981000..cb75f6c 100644
--- a/test/log/0429
+++ b/test/log/0429
@@ -1,6 +1,6 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
 1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** x@y R=r1 T=t1: SMTP error from remote mail server after HELO myhost.test.ex: host 127.0.0.1 [127.0.0.1]: 550 No
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** x@y R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after HELO myhost.test.ex: 550 No
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp
diff --git a/test/log/0447 b/test/log/0447
index 91af1eb..5069ceb 100644
--- a/test/log/0447
+++ b/test/log/0447
@@ -1,12 +1,12 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection timed out
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection timed out
 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=t1 defer (dd): Connection timed out
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection timed out
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection timed out
 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=t1 defer (dd): Connection timed out
 1999-03-02 09:44:33 End queue run: pid=pppp -qf
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection timed out
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection timed out
 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=t1 defer (dd): Connection timed out
 1999-03-02 09:44:33 End queue run: pid=pppp -qf
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
diff --git a/test/log/0450 b/test/log/0450
index 18c9a84..e5df92a 100644
--- a/test/log/0450
+++ b/test/log/0450
@@ -1,7 +1,7 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=t1 defer (dd): Connection refused
 1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=t1 defer (dd): Connection refused
 1999-03-02 09:44:33 End queue run: pid=pppp
diff --git a/test/log/0455 b/test/log/0455
index caeab73..a755cfa 100644
--- a/test/log/0455
+++ b/test/log/0455
@@ -1,11 +1,11 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 ten-3.test.ex [V4NET.0.0.3] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-3.test.ex [V4NET.0.0.3] Network Error
 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=smtp defer (dd): Network Error
 1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaX-0005vi-00 ten-3.test.ex [V4NET.0.0.3] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 ten-4.test.ex [V4NET.0.0.4] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 ten-2.test.ex [V4NET.0.0.2] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 ten-1.test.ex [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-3.test.ex [V4NET.0.0.3] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-4.test.ex [V4NET.0.0.4] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-2.test.ex [V4NET.0.0.2] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-1.test.ex [V4NET.0.0.1] Network Error
 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=smtp defer (dd): Network Error
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
diff --git a/test/log/0461 b/test/log/0461
index db36aa5..49370d5 100644
--- a/test/log/0461
+++ b/test/log/0461
@@ -1,13 +1,13 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 V4NET.0.0.1 [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 V4NET.0.0.1 [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmaY-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaZ-0005vi-00 V4NET.0.0.1 [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmaZ-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
@@ -17,10 +17,10 @@
 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbC-0005vi-00 V4NET.0.0.2 [V4NET.0.0.2] Network Error
+1999-03-02 09:44:33 10HmbC-0005vi-00 H=V4NET.0.0.2 [V4NET.0.0.2] Network Error
 1999-03-02 09:44:33 10HmbC-0005vi-00 == userx@??? R=r1 T=t1 defer (dd): Network Error
 1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmbC-0005vi-00 V4NET.0.0.2 [V4NET.0.0.2] Network Error
+1999-03-02 09:44:33 10HmbC-0005vi-00 H=V4NET.0.0.2 [V4NET.0.0.2] Network Error
 1999-03-02 09:44:33 10HmbC-0005vi-00 == userx@??? R=r1 T=t1 defer (dd): Network Error
 1999-03-02 09:44:33 10HmbC-0005vi-00 ** userx@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmbD-0005vi-00 <= <> R=10HmbC-0005vi-00 U=EXIMUSER P=local S=sss
diff --git a/test/log/0474 b/test/log/0474
index 92eb69d..127663c 100644
--- a/test/log/0474
+++ b/test/log/0474
@@ -1,8 +1,8 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 == abcd@xyz R=callout T=smtp defer (0): SMTP error from remote mail server after end of data: host 127.0.0.1 [127.0.0.1]: 850 NONSENSE
+1999-03-02 09:44:33 10HmaX-0005vi-00 == abcd@xyz R=callout T=smtp defer (0) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 850 NONSENSE
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 == abcd@xyz R=callout T=smtp defer (0): SMTP error from remote mail server after MAIL FROM:<CALLER@???>: host 127.0.0.1 [127.0.0.1]: 850 RUBBISH
+1999-03-02 09:44:33 10HmaX-0005vi-00 == abcd@xyz R=callout T=smtp defer (0) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: 850 RUBBISH
 1999-03-02 09:44:33 End queue run: pid=pppp -qf
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 == abcd@xyz R=callout T=smtp defer (-44): SMTP error from remote mail server after RCPT TO:<abcd@xyz>: host 127.0.0.1 [127.0.0.1]: 850 RUBBISH
+1999-03-02 09:44:33 10HmaX-0005vi-00 == abcd@xyz R=callout T=smtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<abcd@xyz>: 850 RUBBISH
 1999-03-02 09:44:33 End queue run: pid=pppp -qf
diff --git a/test/log/0476 b/test/log/0476
index c48ae1b..c2d8ce4 100644
--- a/test/log/0476
+++ b/test/log/0476
@@ -3,9 +3,9 @@
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@??? R=r1 T=t1 defer (0): SMTP delivery explicitly queued
 1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@??? R=r1 T=t1: SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 550 NO
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
-1999-03-02 09:44:33 10HmaZ-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmaZ-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
 1999-03-02 09:44:33 10HmaZ-0005vi-00 == CALLER@??? R=r1 T=t1 defer (dd): Connection refused
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@??? R=r1 T=t1 defer (-53): retry time not reached for any host
diff --git a/test/log/0477 b/test/log/0477
index b5c8523..bd08227 100644
--- a/test/log/0477
+++ b/test/log/0477
@@ -1,3 +1,3 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Network Error
 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=t1 defer (dd): Network Error
diff --git a/test/log/0478 b/test/log/0478
index 591069f..5a52157 100644
--- a/test/log/0478
+++ b/test/log/0478
@@ -6,9 +6,9 @@
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, -q1h, listening for SMTP on port 1225
 1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaX-0005vi-00 V4NET.0.0.1 [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
 1999-03-02 09:44:33 10HmaX-0005vi-00 == V4NET.0.0.1@??? R=r1 T=t1 defer (dd): Network Error
 1999-03-02 09:44:33 End queue run: pid=pppp
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaY-0005vi-00@???
-1999-03-02 09:44:33 10HmaZ-0005vi-00 V4NET.0.0.2 [V4NET.0.0.2] Network Error
+1999-03-02 09:44:33 10HmaZ-0005vi-00 H=V4NET.0.0.2 [V4NET.0.0.2] Network Error
 1999-03-02 09:44:33 10HmaZ-0005vi-00 == 127.0.0.1@??? R=r1 T=t1 defer (dd): Network Error
diff --git a/test/log/0495 b/test/log/0495
index 20f15c6..17886a8 100644
--- a/test/log/0495
+++ b/test/log/0495
@@ -1,6 +1,6 @@
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
-1999-03-02 09:44:33 10HmaY-0005vi-00 ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] Connection refused
+1999-03-02 09:44:33 10HmaY-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmaY-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] Connection refused
 1999-03-02 09:44:33 10HmaY-0005vi-00 ** xyz@??? R=r9 T=t1: Connection refused
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
@@ -8,16 +8,16 @@
 1999-03-02 09:44:33 10HmaZ-0005vi-00 -> b@??? R=r9 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbA-0005vi-00 ** a@??? R=r9 T=t1: SMTP error from remote mail server after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 550 NOTOK
-1999-03-02 09:44:33 10HmbA-0005vi-00 ** b@??? R=r9 T=t1: SMTP error from remote mail server after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 550 NOTOK
+1999-03-02 09:44:33 10HmbA-0005vi-00 ** a@??? R=r9 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<b@???>: 550 NOTOK
+1999-03-02 09:44:33 10HmbA-0005vi-00 ** b@??? R=r9 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<b@???>: 550 NOTOK
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbB-0005vi-00 ** a@??? R=r9 T=t1: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: host 127.0.0.1 [127.0.0.1]: 550 BAD MAIL
-1999-03-02 09:44:33 10HmbB-0005vi-00 ** b@??? R=r9 T=t1: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: host 127.0.0.1 [127.0.0.1]: 550 BAD MAIL
+1999-03-02 09:44:33 10HmbB-0005vi-00 ** a@??? R=r9 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: 550 BAD MAIL
+1999-03-02 09:44:33 10HmbB-0005vi-00 ** b@??? R=r9 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: 550 BAD MAIL
 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbC-0005vi-00 ** a@??? R=r9 T=t1: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: host 127.0.0.1 [127.0.0.1]: 450 TEMPORARY MAIL FAIL
-1999-03-02 09:44:33 10HmbC-0005vi-00 ** b@??? R=r9 T=t1: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: host 127.0.0.1 [127.0.0.1]: 450 TEMPORARY MAIL FAIL
+1999-03-02 09:44:33 10HmbC-0005vi-00 ** a@??? R=r9 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: 450 TEMPORARY MAIL FAIL
+1999-03-02 09:44:33 10HmbC-0005vi-00 ** b@??? R=r9 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: 450 TEMPORARY MAIL FAIL
 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmbD-0005vi-00 => pm@??? <postmaster@???> R=r9 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
@@ -45,14 +45,14 @@
 1999-03-02 09:44:33 10HmbJ-0005vi-00 -> b@??? R=r9 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbK-0005vi-00 <= sen@der U=CALLER P=local-esmtp S=sss
-1999-03-02 09:44:33 10HmbK-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
-1999-03-02 09:44:33 10HmbK-0005vi-00 ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] Connection refused
+1999-03-02 09:44:33 10HmbK-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmbK-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] Connection refused
 1999-03-02 09:44:33 10HmbK-0005vi-00 ** a@??? R=r9 T=t1: Connection refused
 1999-03-02 09:44:33 10HmbK-0005vi-00 ** b@??? R=r9 T=t1: Connection refused
 1999-03-02 09:44:33 10HmbK-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbL-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** a@??? R=r9 T=t1: Connection timed out: SMTP timeout while connected to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] after RCPT TO:<b@???>
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** b@??? R=r9 T=t1: Connection timed out: SMTP timeout while connected to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] after RCPT TO:<b@???>
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** a@??? R=r9 T=t1 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: Connection timed out: SMTP timeout after RCPT TO:<b@???>
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** b@??? R=r9 T=t1 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: Connection timed out: SMTP timeout after RCPT TO:<b@???>
 1999-03-02 09:44:33 10HmbL-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmaX-0005vi-00 == badport1@z R=r3 T=t4 defer (-1): TCP port "nonexistent" is not defined for t4 transport
@@ -61,6 +61,6 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** badport1@z mua_wrapper forced failure for deferred delivery
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbM-0005vi-00 <= <> U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbM-0005vi-00 ** a@??? R=r9 T=t1: SMTP error from remote mail server after RCPT TO:<a@???>: host 127.0.0.1 [127.0.0.1]: 550 SORRY
+1999-03-02 09:44:33 10HmbM-0005vi-00 ** a@??? R=r9 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<a@???>: 550 SORRY
 1999-03-02 09:44:33 10HmbM-0005vi-00 ** a@??? mua_wrapper forced failure for deferred delivery
 1999-03-02 09:44:33 10HmbM-0005vi-00 Completed
diff --git a/test/log/0497 b/test/log/0497
index 61f08ff..9e55e5d 100644
--- a/test/log/0497
+++ b/test/log/0497
@@ -1,62 +1,62 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=t1 defer (-45): SMTP error from remote mail server after MAIL FROM:<CALLER@???>: host 127.0.0.1 [127.0.0.1]: 452 temporary error
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=t1 defer (-45) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: 452 temporary error
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <CALLER@???> R=r0
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@??? R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 452 temporary error
+1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@??? R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 452 temporary error
 1999-03-02 09:44:33 10HmaZ-0005vi-00 ** userx@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <CALLER@???> R=r0
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbB-0005vi-00 == userx@??? R=r1 T=t1 defer (-46): SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 452 temporary error
+1999-03-02 09:44:33 10HmbB-0005vi-00 == userx@??? R=r1 T=t1 defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after DATA: 452 temporary error
 1999-03-02 09:44:33 10HmbB-0005vi-00 ** userx@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbB-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbC-0005vi-00 => :blackhole: <CALLER@???> R=r0
 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbD-0005vi-00 == userx@??? R=r1 T=t1 defer (-46): SMTP error from remote mail server after end of data: host 127.0.0.1 [127.0.0.1]: 452 temporary error
+1999-03-02 09:44:33 10HmbD-0005vi-00 == userx@??? R=r1 T=t1 defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 452 temporary error
 1999-03-02 09:44:33 10HmbD-0005vi-00 ** userx@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmbE-0005vi-00 <= <> R=10HmbD-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbE-0005vi-00 => :blackhole: <CALLER@???> R=r0
 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbF-0005vi-00 == userx@??? R=r1 T=t1 defer (-45): SMTP error from remote mail server after MAIL FROM:<CALLER@???>: host 127.0.0.1 [127.0.0.1]: 452 temporary error
+1999-03-02 09:44:33 10HmbF-0005vi-00 == userx@??? R=r1 T=t1 defer (-45) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: 452 temporary error
 1999-03-02 09:44:33 10HmbF-0005vi-00 ** userx@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmbG-0005vi-00 <= <> R=10HmbF-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbG-0005vi-00 => :blackhole: <CALLER@???> R=r0
 1999-03-02 09:44:33 10HmbG-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbH-0005vi-00 == userx@??? R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 452 temporary error
+1999-03-02 09:44:33 10HmbH-0005vi-00 == userx@??? R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 452 temporary error
 1999-03-02 09:44:33 10HmbH-0005vi-00 ** userx@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmbI-0005vi-00 <= <> R=10HmbH-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbI-0005vi-00 => :blackhole: <CALLER@???> R=r0
 1999-03-02 09:44:33 10HmbI-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbH-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbJ-0005vi-00 == userx@??? R=r1 T=t1 defer (-46): SMTP error from remote mail server after pipelined DATA: host 127.0.0.1 [127.0.0.1]: 452 temporary error
+1999-03-02 09:44:33 10HmbJ-0005vi-00 == userx@??? R=r1 T=t1 defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined DATA: 452 temporary error
 1999-03-02 09:44:33 10HmbJ-0005vi-00 ** userx@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmbK-0005vi-00 <= <> R=10HmbJ-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbK-0005vi-00 => :blackhole: <CALLER@???> R=r0
 1999-03-02 09:44:33 10HmbK-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbL-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbL-0005vi-00 == userx@??? R=r1 T=t1 defer (-46): SMTP error from remote mail server after end of data: host 127.0.0.1 [127.0.0.1]: 452 temporary error
+1999-03-02 09:44:33 10HmbL-0005vi-00 == userx@??? R=r1 T=t1 defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 452 temporary error
 1999-03-02 09:44:33 10HmbL-0005vi-00 ** userx@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmbM-0005vi-00 <= <> R=10HmbL-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbM-0005vi-00 => :blackhole: <CALLER@???> R=r0
 1999-03-02 09:44:33 10HmbM-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbL-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbN-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbN-0005vi-00 Remote host 127.0.0.1 [127.0.0.1] closed connection in response to RCPT TO:<userx@???>
-1999-03-02 09:44:33 10HmbN-0005vi-00 == userx@??? R=r1 T=t1 defer (-18): Remote host 127.0.0.1 [127.0.0.1] closed connection in response to RCPT TO:<userx@???>
+1999-03-02 09:44:33 10HmbN-0005vi-00 H=127.0.0.1 [127.0.0.1]: Remote host closed connection in response to RCPT TO:<userx@???>
+1999-03-02 09:44:33 10HmbN-0005vi-00 == userx@??? R=r1 T=t1 defer (-18) H=127.0.0.1 [127.0.0.1]: Remote host closed connection in response to RCPT TO:<userx@???>
 1999-03-02 09:44:33 10HmbN-0005vi-00 ** userx@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmbO-0005vi-00 <= <> R=10HmbN-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbO-0005vi-00 => :blackhole: <CALLER@???> R=r0
diff --git a/test/log/0498 b/test/log/0498
index ae2dd0f..4c82476 100644
--- a/test/log/0498
+++ b/test/log/0498
@@ -1,7 +1,7 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=t1 defer (-45): SMTP error from remote mail server after MAIL FROM:<CALLER@???>: host 127.0.0.1 [127.0.0.1]: 450 DELAY
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=t1 defer (-45) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: 450 DELAY
 1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=t1 defer (dd): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after end of data (ddd bytes written)
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=t1 defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after end of data (ddd bytes written)
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <CALLER@???> R=r0
diff --git a/test/log/0504 b/test/log/0504
index fe3424f..03158bb 100644
--- a/test/log/0504
+++ b/test/log/0504
@@ -3,4 +3,4 @@
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmaY-0005vi-00 == userx@??? R=r1 T=t2 defer (-24): Transport filter process failed (127): unable to execute command
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@??? R=r1 T=t3 defer (-24): transport filter process failed (127): unable to execute command
+1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@??? R=r1 T=t3 defer (-24) H=127.0.0.1 [127.0.0.1]: transport filter process failed (127): unable to execute command
diff --git a/test/log/0511 b/test/log/0511
index 139fe14..677934d 100644
--- a/test/log/0511
+++ b/test/log/0511
@@ -1,22 +1,22 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph11@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph12@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph13@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph14@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph15@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph16@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph17@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph18@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph19@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph20@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph21@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph22@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph23@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph24@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph25@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, inde
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after DATA: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a v
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph11@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after DATA: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a v
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph12@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after DATA: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a v
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph13@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after DATA: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a v
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph14@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after DATA: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a v
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph15@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after DATA: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a v
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph16@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after DATA: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a v
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph17@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after DATA: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a v
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph18@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after DATA: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a v
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph19@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after DATA: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a v
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph20@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after DATA: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a v
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph21@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after DATA: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a v
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph22@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after DATA: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a v
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph23@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after DATA: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a v
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph24@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after DATA: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a v
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** ph25@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after DATA: 550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a very long error message, very long indeed, indeed, indeed.\n550-This is a v
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmaY-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
 1999-03-02 09:44:33 10HmaY-0005vi-00 == CALLER@??? R=r1 T=t1 defer (dd): Connection refused
 1999-03-02 09:44:33 10HmaY-0005vi-00 ** CALLER@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmaY-0005vi-00 CALLER@???: error ignored
diff --git a/test/log/0512 b/test/log/0512
index e8f84b8..206a2e9 100644
--- a/test/log/0512
+++ b/test/log/0512
@@ -1,11 +1,11 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=t1 defer (dd): Connection refused
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
-1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
-1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
-1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=t1 defer (dd): Connection refused
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
@@ -14,11 +14,11 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qf
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaZ-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmaZ-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
 1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@??? R=r1 T=t1 defer (dd): Connection refused
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaZ-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
-1999-03-02 09:44:33 10HmaZ-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmaZ-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmaZ-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
 1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@??? R=r1 T=t1 defer (dd): Connection refused
 1999-03-02 09:44:33 10HmaZ-0005vi-00 ** userx@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss
diff --git a/test/log/0519 b/test/log/0519
index 4587a6f..27279fe 100644
--- a/test/log/0519
+++ b/test/log/0519
@@ -1,9 +1,9 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=t1 defer (-32): failed to lookup IP address for non-exist.test.ex
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmaY-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
 1999-03-02 09:44:33 10HmaY-0005vi-00 == CALLER@??? R=r1 T=t1 defer (-32): failed to lookup IP address for non-exist.test.ex
 1999-03-02 09:44:33 10HmaY-0005vi-00 ** CALLER@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmaY-0005vi-00 CALLER@???: error ignored
diff --git a/test/log/0525 b/test/log/0525
index dfedcf8..330bfbf 100644
--- a/test/log/0525
+++ b/test/log/0525
@@ -1,3 +1,3 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local-smtp S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after sending data block (ddd bytes written): Connection timed out
-1999-03-02 09:44:33 10HmaX-0005vi-00 == def@pqr R=r1 T=t1 defer (dd): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after sending data block (ddd bytes written)
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP timeout after sending data block (ddd bytes written): Connection timed out
+1999-03-02 09:44:33 10HmaX-0005vi-00 == def@pqr R=r1 T=t1 defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after sending data block (ddd bytes written)
diff --git a/test/log/0528 b/test/log/0528
index 0426da0..2e15130 100644
--- a/test/log/0528
+++ b/test/log/0528
@@ -1,9 +1,9 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1]:1225 Connection refused
-1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1]:1226 Connection refused
-1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1]:1227 Connection refused
-1999-03-02 09:44:33 10HmaX-0005vi-00 ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1228 Connection refused
-1999-03-02 09:44:33 10HmaX-0005vi-00 ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1223 Connection refused
-1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1]:1224 Connection refused
-1999-03-02 09:44:33 10HmaX-0005vi-00 ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 Connection refused
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]:1225 Connection refused
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]:1226 Connection refused
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]:1227 Connection refused
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1228 Connection refused
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1223 Connection refused
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]:1224 Connection refused
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 Connection refused
 1999-03-02 09:44:33 10HmaX-0005vi-00 == x@y R=r1 T=t1 defer (dd): Connection refused
diff --git a/test/log/0531 b/test/log/0531
index a960f3e..89be9cb 100644
--- a/test/log/0531
+++ b/test/log/0531
@@ -1,5 +1,5 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=smartuser T=lmtp defer (0): LMTP error after DATA: 450 TEMPERROR
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=smartuser T=lmtp defer (0) H=127.0.0.1 [127.0.0.1]: LMTP error after DATA: 450 TEMPERROR
 1999-03-02 09:44:33 10HmaX-0005vi-00 => usery@??? F=<CALLER@???> R=smartuser T=lmtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
@@ -7,9 +7,9 @@
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@??? R=smartuser T=lmtp defer (0): LMTP error after DATA: 450 TEMPERROR
+1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@??? R=smartuser T=lmtp defer (0) H=127.0.0.1 [127.0.0.1]: LMTP error after DATA: 450 TEMPERROR
 1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@??? R=smartuser T=lmtp defer (0): LMTP error after DATA: 450 TEMPERROR
+1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@??? R=smartuser T=lmtp defer (0) H=127.0.0.1 [127.0.0.1]: LMTP error after DATA: 450 TEMPERROR
 1999-03-02 09:44:33 10HmaZ-0005vi-00 ** userx@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbA-0005vi-00 => CALLER <CALLER@???> F=<> R=bounces T=t1
@@ -17,7 +17,7 @@
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp
 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbB-0005vi-00 == userx@??? R=smartuser T=lmtp defer (-44): SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 450 TEMPERROR
+1999-03-02 09:44:33 10HmbB-0005vi-00 == userx@??? R=smartuser T=lmtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 450 TEMPERROR
 1999-03-02 09:44:33 10HmbB-0005vi-00 ** userx@???: retry timeout exceeded
 1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbB-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbC-0005vi-00 => CALLER <CALLER@???> F=<> R=bounces T=t1
diff --git a/test/log/0543 b/test/log/0543
index b585327..bce32c5 100644
--- a/test/log/0543
+++ b/test/log/0543
@@ -1,7 +1,7 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 SMTP error from remote mail server after RCPT TO:<usery@domain1>: host thisloop.test.ex [127.0.0.1]: 451 Later, please
-1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@domain1 R=smarthost T=smtp defer (-44): SMTP error from remote mail server after RCPT TO:<usery@domain1>: host thisloop.test.ex [127.0.0.1]: 451 Later, please
+1999-03-02 09:44:33 10HmaY-0005vi-00 H=thisloop.test.ex [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@domain1>: 451 Later, please
+1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@domain1 R=smarthost T=smtp defer (-44) H=thisloop.test.ex [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@domain1>: 451 Later, please
 1999-03-02 09:44:33 Start queue run: pid=pppp
 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@domain1 R=smarthost T=smtp H=thisloop.test.ex [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
diff --git a/test/log/0548 b/test/log/0548
index cc61439..0d02473 100644
--- a/test/log/0548
+++ b/test/log/0548
@@ -1,26 +1,26 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mail server after RCPT TO:<userx@???>: host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]: 451 Recipient deferred
-1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mail server after initial connection: host thishost.test.ex [127.0.0.1]: 451 host deferred
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=smarthost T=smtp defer (0): SMTP error from remote mail server after initial connection: host thishost.test.ex [127.0.0.1]: 451 host deferred
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Recipient deferred
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=smarthost T=smtp defer (0) H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred
 1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mail server after RCPT TO:<userx@???>: host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]: 451 Recipient deferred
-1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mail server after initial connection: host thishost.test.ex [127.0.0.1]: 451 host deferred
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=smarthost T=smtp defer (0): SMTP error from remote mail server after initial connection: host thishost.test.ex [127.0.0.1]: 451 host deferred
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Recipient deferred
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=smarthost T=smtp defer (0) H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred
 1999-03-02 09:44:33 End queue run: pid=pppp
 1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mail server after RCPT TO:<userx@???>: host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]: 451 Recipient deferred
-1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mail server after initial connection: host thishost.test.ex [127.0.0.1]: 451 host deferred
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=smarthost T=smtp defer (0): SMTP error from remote mail server after initial connection: host thishost.test.ex [127.0.0.1]: 451 host deferred
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Recipient deferred
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=smarthost T=smtp defer (0) H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred
 1999-03-02 09:44:33 End queue run: pid=pppp
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 SMTP error from remote mail server after RCPT TO:<usery@???>: host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]: 451 Recipient deferred
-1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@??? R=smarthost T=smtp defer (-44): SMTP error from remote mail server after RCPT TO:<usery@???>: host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]: 451 Recipient deferred
+1999-03-02 09:44:33 10HmaY-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<usery@???>: 451 Recipient deferred
+1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@??? R=smarthost T=smtp defer (-44) H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<usery@???>: 451 Recipient deferred
 1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mail server after RCPT TO:<userx@???>: host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]: 451 Recipient deferred
-1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mail server after initial connection: host thishost.test.ex [127.0.0.1]: 451 host deferred
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=smarthost T=smtp defer (0): SMTP error from remote mail server after initial connection: host thishost.test.ex [127.0.0.1]: 451 host deferred
-1999-03-02 09:44:33 10HmaY-0005vi-00 SMTP error from remote mail server after RCPT TO:<usery@???>: host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]: 451 Recipient deferred
-1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@??? R=smarthost T=smtp defer (-44): SMTP error from remote mail server after RCPT TO:<usery@???>: host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]: 451 Recipient deferred
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Recipient deferred
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=smarthost T=smtp defer (0) H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred
+1999-03-02 09:44:33 10HmaY-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<usery@???>: 451 Recipient deferred
+1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@??? R=smarthost T=smtp defer (-44) H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<usery@???>: 451 Recipient deferred
 1999-03-02 09:44:33 End queue run: pid=pppp


******** SERVER ********
diff --git a/test/log/0550 b/test/log/0550
index 30da3ad..674cd57 100644
--- a/test/log/0550
+++ b/test/log/0550
@@ -1,3 +1,3 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mail server after MAIL FROM:<CALLER@???>: host 127.0.0.1 [127.0.0.1]: 450 Defer
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=t1 defer (-45): SMTP error from remote mail server after MAIL FROM:<CALLER@???>: host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]: 450 Defer
+1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mail server after MAIL FROM:<CALLER@???>: 450 Defer
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=t1 defer (-45) H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: 450 Defer
diff --git a/test/log/0552 b/test/log/0552
index 64d4997..8148c5a 100644
--- a/test/log/0552
+++ b/test/log/0552
@@ -1,9 +1,9 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 Accept non-SMTP
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx1@??? R=r1 T=t1 defer (dd): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after MAIL FROM:<CALLER@???> SIZE=ssss
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx2@??? R=r1 T=t1 defer (dd): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after MAIL FROM:<CALLER@???> SIZE=ssss
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx3@??? R=r1 T=t1 defer (dd): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after MAIL FROM:<CALLER@???> SIZE=ssss
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx1@??? R=r1 T=t1 defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after MAIL FROM:<CALLER@???> SIZE=ssss
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx2@??? R=r1 T=t1 defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after MAIL FROM:<CALLER@???> SIZE=ssss
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx3@??? R=r1 T=t1 defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after MAIL FROM:<CALLER@???> SIZE=ssss
1999-03-02 09:44:33 End queue run: pid=pppp -qf
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
1999-03-02 09:44:33 10HmaX-0005vi-00 => userx1@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00"
diff --git a/test/log/0553 b/test/log/0553
index 54f94fd..322c9b3 100644
--- a/test/log/0553
+++ b/test/log/0553
@@ -1,8 +1,8 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx1@??? R=t1 T=smtp defer (dd): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after RCPT TO:<userx1@???>
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx2@??? R=t1 T=smtp defer (dd): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after RCPT TO:<userx1@???>
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx3@??? R=t1 T=smtp defer (dd): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after RCPT TO:<userx1@???>
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx1@??? R=t1 T=smtp defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after RCPT TO:<userx1@???>
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx2@??? R=t1 T=smtp defer (dd): Connection timed out: SMTP timeout after RCPT TO:<userx1@???>
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx3@??? R=t1 T=smtp defer (dd): Connection timed out: SMTP timeout after RCPT TO:<userx1@???>
1999-03-02 09:44:33 End queue run: pid=pppp -qf
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
1999-03-02 09:44:33 10HmaX-0005vi-00 => userx1@??? R=t1 T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00"
diff --git a/test/log/0554 b/test/log/0554
index 97784ca..bf0e8f6 100644
--- a/test/log/0554
+++ b/test/log/0554
@@ -1,4 +1,4 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 == x@y R=r1 T=smtp defer (-44): SMTP error from remote mail server after RCPT TO:<x@y>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+1999-03-02 09:44:33 10HmaX-0005vi-00 == x@y R=r1 T=smtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@y>: 451 Temporary error
1999-03-02 09:44:33 10HmaX-0005vi-00 => x@y R=r1 T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
diff --git a/test/log/2000 b/test/log/2000
index 6685d59..68c88a3 100644
--- a/test/log/2000
+++ b/test/log/2000
@@ -1,6 +1,6 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 TLS error on connection to 127.0.0.1 [127.0.0.1] (certificate verification failed): certificate invalid
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] TLS error on connection (certificate verification failed): certificate invalid
1999-03-02 09:44:33 10HmaX-0005vi-00 TLS session failure: delivering unencrypted to 127.0.0.1 [127.0.0.1] (not in hosts_require_tls)
1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00"
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
diff --git a/test/log/2001 b/test/log/2001
index da5a78a..13cf370 100644
--- a/test/log/2001
+++ b/test/log/2001
@@ -1,11 +1,11 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 TLS error on connection to 127.0.0.1 [127.0.0.1] (certificate verification failed): certificate invalid
-1999-03-02 09:44:33 10HmaX-0005vi-00 == CALLER@??? R=client T=send_to_server defer (-37): failure while setting up TLS session
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] TLS error on connection (certificate verification failed): certificate invalid
+1999-03-02 09:44:33 10HmaX-0005vi-00 == CALLER@??? R=client T=send_to_server defer (-37) H=127.0.0.1 [127.0.0.1]: failure while setting up TLS session
1999-03-02 09:44:33 End queue run: pid=pppp -qf
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 TLS error on connection to 127.0.0.1 [127.0.0.1] (certificate verification failed): certificate invalid
-1999-03-02 09:44:33 10HmaX-0005vi-00 == CALLER@??? R=client T=send_to_server defer (-37): failure while setting up TLS session
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] TLS error on connection (certificate verification failed): certificate invalid
+1999-03-02 09:44:33 10HmaX-0005vi-00 == CALLER@??? R=client T=send_to_server defer (-37) H=127.0.0.1 [127.0.0.1]: failure while setting up TLS session
1999-03-02 09:44:33 End queue run: pid=pppp -qf

******** SERVER ********
diff --git a/test/log/2009 b/test/log/2009
index 9e03226..5da164a 100644
--- a/test/log/2009
+++ b/test/log/2009
@@ -1,6 +1,6 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 550 encryption required
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 550 encryption required
1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 End queue run: pid=pppp -qf
diff --git a/test/log/2010 b/test/log/2010
index a557710..67c8836 100644
--- a/test/log/2010
+++ b/test/log/2010
@@ -1,12 +1,12 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 a TLS session is required for 127.0.0.1 [127.0.0.1], but the server did not offer TLS support
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]: a TLS session is required, but the server did not offer TLS support
1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@??? R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 C="250 OK id=10HmaY-0005vi-00"
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 End queue run: pid=pppp -qf
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaY-0005vi-00 a TLS session is required for 127.0.0.1 [127.0.0.1], but the server did not offer TLS support
-1999-03-02 09:44:33 10HmaY-0005vi-00 == userx@??? R=client T=send_to_server defer (-38): a TLS session is required for 127.0.0.1 [127.0.0.1], but the server did not offer TLS support
+1999-03-02 09:44:33 10HmaY-0005vi-00 H=127.0.0.1 [127.0.0.1]: a TLS session is required, but the server did not offer TLS support
+1999-03-02 09:44:33 10HmaY-0005vi-00 == userx@??? R=client T=send_to_server defer (-38) H=127.0.0.1 [127.0.0.1]: a TLS session is required, but the server did not offer TLS support
1999-03-02 09:44:33 10HmaY-0005vi-00 ** userx@???: retry timeout exceeded
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaY-0005vi-00 U=EXIMUSER P=local S=sss
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
diff --git a/test/log/2012 b/test/log/2012
index bcb1e6f..48c75d2 100644
--- a/test/log/2012
+++ b/test/log/2012
@@ -3,17 +3,17 @@
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 TLS error on connection to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] (certificate verification failed): certificate invalid
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=client_x T=send_to_server_failcert defer (-37): failure while setting up TLS session
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] TLS error on connection (certificate verification failed): certificate invalid
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=client_x T=send_to_server_failcert defer (-37) H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: failure while setting up TLS session
1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@???: retry timeout exceeded
1999-03-02 09:44:33 10HmaX-0005vi-00 userx@???: error ignored
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 TLS error on connection to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] (certificate verification failed): certificate invalid
+1999-03-02 09:44:33 10HmaY-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] TLS error on connection (certificate verification failed): certificate invalid
1999-03-02 09:44:33 10HmaY-0005vi-00 => usery@??? R=client_y T=send_to_server_retry H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=yes DN="CN=server1.example.com" C="250 OK id=10HmbB-0005vi-00"
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
1999-03-02 09:44:33 10HmaZ-0005vi-00 => userz@??? R=client_z T=send_to_server_crypt H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no DN="CN=server1.example.com" C="250 OK id=10HmbC-0005vi-00"
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbA-0005vi-00 TLS error on connection to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] (certificate verification failed): certificate invalid
+1999-03-02 09:44:33 10HmbA-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] TLS error on connection (certificate verification failed): certificate invalid
1999-03-02 09:44:33 10HmbA-0005vi-00 TLS session failure: delivering unencrypted to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] (not in hosts_require_tls)
1999-03-02 09:44:33 10HmbA-0005vi-00 => userq@??? R=client_q T=send_to_server_req_fail H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbD-0005vi-00"
1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
diff --git a/test/log/2016 b/test/log/2016
index f8c7604..d784bfc 100644
--- a/test/log/2016
+++ b/test/log/2016
@@ -1,3 +1,3 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 TLS error on connection to 127.0.0.1 [127.0.0.1] (gnutls_handshake): timed out
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain1 R=others T=smtp defer (-37): failure while setting up TLS session
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] TLS error on connection (gnutls_handshake): timed out
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain1 R=others T=smtp defer (-37) H=127.0.0.1 [127.0.0.1]: failure while setting up TLS session
diff --git a/test/log/2021 b/test/log/2021
index bcb988f..59e8330 100644
--- a/test/log/2021
+++ b/test/log/2021
@@ -1,10 +1,10 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mail server after STARTTLS: host 127.0.0.1 [127.0.0.1]: 450 temp problem
-1999-03-02 09:44:33 10HmaX-0005vi-00 == x@y R=client T=send_to_server defer (0): SMTP error from remote mail server after STARTTLS: host 127.0.0.1 [127.0.0.1]: 450 temp problem
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after STARTTLS: 450 temp problem
+1999-03-02 09:44:33 10HmaX-0005vi-00 == x@y R=client T=send_to_server defer (0) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after STARTTLS: 450 temp problem
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
1999-03-02 09:44:33 10HmaX-0005vi-00 => x@y R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK"
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 End queue run: pid=pppp -qf
1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 a TLS session is required for 127.0.0.1 [127.0.0.1], but an attempt to start TLS failed
-1999-03-02 09:44:33 10HmaY-0005vi-00 == x@y R=client T=send_to_server defer (-38): a TLS session is required for 127.0.0.1 [127.0.0.1], but an attempt to start TLS failed
+1999-03-02 09:44:33 10HmaY-0005vi-00 H=127.0.0.1 [127.0.0.1]: a TLS session is required, but an attempt to start TLS failed
+1999-03-02 09:44:33 10HmaY-0005vi-00 == x@y R=client T=send_to_server defer (-38) H=127.0.0.1 [127.0.0.1]: a TLS session is required, but an attempt to start TLS failed
diff --git a/test/log/2025 b/test/log/2025
index fafc68d..f8e8910 100644
--- a/test/log/2025
+++ b/test/log/2025
@@ -1,6 +1,6 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 a TLS session is required for ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4], but an attempt to start TLS failed
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: a TLS session is required, but an attempt to start TLS failed
1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmaY-0005vi-00"
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 End queue run: pid=pppp -qf
diff --git a/test/log/2027 b/test/log/2027
index a54d4a5..72967c2 100644
--- a/test/log/2027
+++ b/test/log/2027
@@ -3,7 +3,7 @@
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 C="250 OK id=10HmaZ-0005vi-00"
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 a TLS session is required for ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4], but an attempt to start TLS failed
+1999-03-02 09:44:33 10HmaY-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] a TLS session is required but an attempt to start TLS failed
1999-03-02 09:44:33 10HmaY-0005vi-00 TLS session failure: delivering unencrypted to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] (not in hosts_require_tls)
1999-03-02 09:44:33 10HmaY-0005vi-00 => usery@??? R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbA-0005vi-00"
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
diff --git a/test/log/2100 b/test/log/2100
index f4ea5c4..02b6f0e 100644
--- a/test/log/2100
+++ b/test/log/2100
@@ -1,7 +1,7 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
1999-03-02 09:44:33 10HmaX-0005vi-00 SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
-1999-03-02 09:44:33 10HmaX-0005vi-00 TLS error on connection to 127.0.0.1 [127.0.0.1] (SSL_connect): error: <<detail omitted>>
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] TLS error on connection (SSL_connect): error: <<detail omitted>>
1999-03-02 09:44:33 10HmaX-0005vi-00 TLS session failure: delivering unencrypted to 127.0.0.1 [127.0.0.1] (not in hosts_require_tls)
1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00"
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
diff --git a/test/log/2101 b/test/log/2101
index 9131e00..5f8befe 100644
--- a/test/log/2101
+++ b/test/log/2101
@@ -1,13 +1,13 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
1999-03-02 09:44:33 10HmaX-0005vi-00 SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
-1999-03-02 09:44:33 10HmaX-0005vi-00 TLS error on connection to 127.0.0.1 [127.0.0.1] (SSL_connect): error: <<detail omitted>>
-1999-03-02 09:44:33 10HmaX-0005vi-00 == CALLER@??? R=client T=send_to_server defer (-37): failure while setting up TLS session
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] TLS error on connection (SSL_connect): error: <<detail omitted>>
+1999-03-02 09:44:33 10HmaX-0005vi-00 == CALLER@??? R=client T=send_to_server defer (-37) H=127.0.0.1 [127.0.0.1]: failure while setting up TLS session
1999-03-02 09:44:33 End queue run: pid=pppp -qf
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
1999-03-02 09:44:33 10HmaX-0005vi-00 SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
-1999-03-02 09:44:33 10HmaX-0005vi-00 TLS error on connection to 127.0.0.1 [127.0.0.1] (SSL_connect): error: <<detail omitted>>
-1999-03-02 09:44:33 10HmaX-0005vi-00 == CALLER@??? R=client T=send_to_server defer (-37): failure while setting up TLS session
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] TLS error on connection (SSL_connect): error: <<detail omitted>>
+1999-03-02 09:44:33 10HmaX-0005vi-00 == CALLER@??? R=client T=send_to_server defer (-37) H=127.0.0.1 [127.0.0.1]: failure while setting up TLS session
1999-03-02 09:44:33 End queue run: pid=pppp -qf

******** SERVER ********
diff --git a/test/log/2109 b/test/log/2109
index 9e03226..5da164a 100644
--- a/test/log/2109
+++ b/test/log/2109
@@ -1,6 +1,6 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 550 encryption required
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 550 encryption required
1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 End queue run: pid=pppp -qf
diff --git a/test/log/2110 b/test/log/2110
index 3727c6a..72f08dc 100644
--- a/test/log/2110
+++ b/test/log/2110
@@ -1,12 +1,12 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 a TLS session is required for 127.0.0.1 [127.0.0.1], but the server did not offer TLS support
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]: a TLS session is required, but the server did not offer TLS support
1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@??? R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:AES256-SHA:256 C="250 OK id=10HmaY-0005vi-00"
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 End queue run: pid=pppp -qf
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaY-0005vi-00 a TLS session is required for 127.0.0.1 [127.0.0.1], but the server did not offer TLS support
-1999-03-02 09:44:33 10HmaY-0005vi-00 == userx@??? R=client T=send_to_server defer (-38): a TLS session is required for 127.0.0.1 [127.0.0.1], but the server did not offer TLS support
+1999-03-02 09:44:33 10HmaY-0005vi-00 H=127.0.0.1 [127.0.0.1]: a TLS session is required, but the server did not offer TLS support
+1999-03-02 09:44:33 10HmaY-0005vi-00 == userx@??? R=client T=send_to_server defer (-38) H=127.0.0.1 [127.0.0.1]: a TLS session is required, but the server did not offer TLS support
1999-03-02 09:44:33 10HmaY-0005vi-00 ** userx@???: retry timeout exceeded
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaY-0005vi-00 U=EXIMUSER P=local S=sss
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
diff --git a/test/log/2111 b/test/log/2111
index 9668585..0fef3f4 100644
--- a/test/log/2111
+++ b/test/log/2111
@@ -1,6 +1,6 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 TLS error on connection to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] (SSL_connect): error: <<detail omitted>>
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] TLS error on connection (SSL_connect): error: <<detail omitted>>
1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:DES-CBC3-SHA:168 DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaY-0005vi-00"
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 End queue run: pid=pppp -qf
diff --git a/test/log/2112 b/test/log/2112
index ea09dd9..45a0458 100644
--- a/test/log/2112
+++ b/test/log/2112
@@ -4,13 +4,13 @@
1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
1999-03-02 09:44:33 10HmaX-0005vi-00 SSL verify error: depth=0 error=unable to get local issuer certificate cert=/CN=server1.example.com
-1999-03-02 09:44:33 10HmaX-0005vi-00 TLS error on connection to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] (SSL_connect): error: <<detail omitted>>
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=client_x T=send_to_server_failcert defer (-37): failure while setting up TLS session
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] TLS error on connection (SSL_connect): error: <<detail omitted>>
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=client_x T=send_to_server_failcert defer (-37) H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: failure while setting up TLS session
1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@???: retry timeout exceeded
1999-03-02 09:44:33 10HmaX-0005vi-00 userx@???: error ignored
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 10HmaY-0005vi-00 SSL verify error: depth=0 error=unable to get local issuer certificate cert=/CN=server1.example.com
-1999-03-02 09:44:33 10HmaY-0005vi-00 TLS error on connection to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] (SSL_connect): error: <<detail omitted>>
+1999-03-02 09:44:33 10HmaY-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] TLS error on connection (SSL_connect): error: <<detail omitted>>
1999-03-02 09:44:33 10HmaY-0005vi-00 => usery@??? R=client_y T=send_to_server_retry H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbB-0005vi-00"
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
1999-03-02 09:44:33 10HmaZ-0005vi-00 SSL verify error: depth=0 error=unable to get local issuer certificate cert=/CN=server1.example.com
@@ -19,7 +19,7 @@
1999-03-02 09:44:33 10HmaZ-0005vi-00 => userz@??? R=client_z T=send_to_server_crypt H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:AES256-SHA:256 CV=no DN="/CN=server1.example.com" C="250 OK id=10HmbC-0005vi-00"
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
1999-03-02 09:44:33 10HmbA-0005vi-00 SSL verify error: depth=0 error=unable to get local issuer certificate cert=/CN=server1.example.com
-1999-03-02 09:44:33 10HmbA-0005vi-00 TLS error on connection to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] (SSL_connect): error: <<detail omitted>>
+1999-03-02 09:44:33 10HmbA-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] TLS error on connection (SSL_connect): error: <<detail omitted>>
1999-03-02 09:44:33 10HmbA-0005vi-00 TLS session failure: delivering unencrypted to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] (not in hosts_require_tls)
1999-03-02 09:44:33 10HmbA-0005vi-00 => userq@??? R=client_q T=send_to_server_req_fail H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbD-0005vi-00"
1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
diff --git a/test/log/2116 b/test/log/2116
index 765cfdb..b796820 100644
--- a/test/log/2116
+++ b/test/log/2116
@@ -1,3 +1,3 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 TLS error on connection to 127.0.0.1 [127.0.0.1] (SSL_connect): timed out
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain1 R=others T=smtp defer (-37): failure while setting up TLS session
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] TLS error on connection (SSL_connect): timed out
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain1 R=others T=smtp defer (-37) H=127.0.0.1 [127.0.0.1]: failure while setting up TLS session
diff --git a/test/log/2120 b/test/log/2120
index 534f5b8..d27a6ef 100644
--- a/test/log/2120
+++ b/test/log/2120
@@ -1,6 +1,6 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 TLS error on connection to 127.0.0.1 [127.0.0.1] (SSL_connect): error: <<detail omitted>>
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] TLS error on connection (SSL_connect): error: <<detail omitted>>
1999-03-02 09:44:33 10HmaX-0005vi-00 TLS session failure: delivering unencrypted to 127.0.0.1 [127.0.0.1] (not in hosts_require_tls)
1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@??? R=abc T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00"
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
diff --git a/test/log/2121 b/test/log/2121
index bcb988f..59e8330 100644
--- a/test/log/2121
+++ b/test/log/2121
@@ -1,10 +1,10 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mail server after STARTTLS: host 127.0.0.1 [127.0.0.1]: 450 temp problem
-1999-03-02 09:44:33 10HmaX-0005vi-00 == x@y R=client T=send_to_server defer (0): SMTP error from remote mail server after STARTTLS: host 127.0.0.1 [127.0.0.1]: 450 temp problem
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after STARTTLS: 450 temp problem
+1999-03-02 09:44:33 10HmaX-0005vi-00 == x@y R=client T=send_to_server defer (0) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after STARTTLS: 450 temp problem
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
1999-03-02 09:44:33 10HmaX-0005vi-00 => x@y R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK"
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 End queue run: pid=pppp -qf
1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 a TLS session is required for 127.0.0.1 [127.0.0.1], but an attempt to start TLS failed
-1999-03-02 09:44:33 10HmaY-0005vi-00 == x@y R=client T=send_to_server defer (-38): a TLS session is required for 127.0.0.1 [127.0.0.1], but an attempt to start TLS failed
+1999-03-02 09:44:33 10HmaY-0005vi-00 H=127.0.0.1 [127.0.0.1]: a TLS session is required, but an attempt to start TLS failed
+1999-03-02 09:44:33 10HmaY-0005vi-00 == x@y R=client T=send_to_server defer (-38) H=127.0.0.1 [127.0.0.1]: a TLS session is required, but an attempt to start TLS failed
diff --git a/test/log/2125 b/test/log/2125
index 5851340..eb4a638 100644
--- a/test/log/2125
+++ b/test/log/2125
@@ -1,6 +1,6 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 TLS error on connection to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] (SSL_connect): error: <<detail omitted>>
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] TLS error on connection (SSL_connect): error: <<detail omitted>>
1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:DES-CBC3-SHA:168 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaY-0005vi-00"
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 End queue run: pid=pppp -qf
diff --git a/test/log/2126 b/test/log/2126
index 9ee15e4..c49d0af 100644
--- a/test/log/2126
+++ b/test/log/2126
@@ -1,5 +1,5 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP error from remote mail server after RCPT TO:<usery@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary local problem - please try later
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@???>: 451 Temporary local problem - please try later
1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00"
1999-03-02 09:44:33 10HmaX-0005vi-00 => usery@??? R=r1 T=t1 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:AES256-SHA:256 DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00"
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
diff --git a/test/log/2127 b/test/log/2127
index 91f972a..5602f67 100644
--- a/test/log/2127
+++ b/test/log/2127
@@ -3,7 +3,7 @@
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 C="250 OK id=10HmaZ-0005vi-00"
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 TLS error on connection to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] (SSL_connect): error: <<detail omitted>>
+1999-03-02 09:44:33 10HmaY-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] TLS error on connection (SSL_connect): error: <<detail omitted>>
1999-03-02 09:44:33 10HmaY-0005vi-00 TLS session failure: delivering unencrypted to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] (not in hosts_require_tls)
1999-03-02 09:44:33 10HmaY-0005vi-00 => usery@??? R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbA-0005vi-00"
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
diff --git a/test/log/3209 b/test/log/3209
index 7033918..9fa7035 100644
--- a/test/log/3209
+++ b/test/log/3209
@@ -1,5 +1,5 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmaX-0005vi-00 == x@??? R=lookuphost defer (-1): lookup defer for mx_domains
-1999-03-02 09:44:33 10HmaX-0005vi-00 ten-2.test.ex [V4NET.0.0.2] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 ten-3.test.ex [V4NET.0.0.3] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-2.test.ex [V4NET.0.0.2] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-3.test.ex [V4NET.0.0.3] Network Error
1999-03-02 09:44:33 10HmaX-0005vi-00 == x@??? R=lookuphost T=smtp defer (dd): Network Error
diff --git a/test/log/3401 b/test/log/3401
index 8532e4b..322db8e 100644
--- a/test/log/3401
+++ b/test/log/3401
@@ -9,8 +9,8 @@
1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx@??? R=try T=smtp_try H=127.0.0.1 [127.0.0.1] C="250 OK"
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbA-0005vi-00 Remote host 127.0.0.1 [127.0.0.1] closed connection in response to AUTH LOGIN
-1999-03-02 09:44:33 10HmbA-0005vi-00 == userx@??? R=try T=smtp_try defer (-18): Remote host 127.0.0.1 [127.0.0.1] closed connection in response to AUTH LOGIN
+1999-03-02 09:44:33 10HmbA-0005vi-00 H=127.0.0.1 [127.0.0.1]: Remote host closed connection in response to AUTH LOGIN
+1999-03-02 09:44:33 10HmbA-0005vi-00 == userx@??? R=try T=smtp_try defer (-18) H=127.0.0.1 [127.0.0.1]: Remote host closed connection in response to AUTH LOGIN
1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmbB-0005vi-00 plain authenticator failed H=127.0.0.1 [127.0.0.1] 535 Sorry, authentication failed
1999-03-02 09:44:33 10HmbB-0005vi-00 == userx@??? R=force T=smtp_force defer (-42): authentication required but authentication attempt(s) failed
@@ -31,7 +31,7 @@
1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmbG-0005vi-00 login authenticator cancelled authentication H=127.0.0.1 [127.0.0.1] Invalid base64 string in server response "334 User?"
-1999-03-02 09:44:33 10HmbG-0005vi-00 ** userx@??? R=try T=smtp_try: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: host 127.0.0.1 [127.0.0.1]: 550 Not now
+1999-03-02 09:44:33 10HmbG-0005vi-00 ** userx@??? R=try T=smtp_try H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: 550 Not now
1999-03-02 09:44:33 10HmbH-0005vi-00 <= <> R=10HmbG-0005vi-00 U=EXIMUSER P=local S=sss
1999-03-02 09:44:33 10HmbH-0005vi-00 ** CALLER@???: Unrouteable address
1999-03-02 09:44:33 10HmbH-0005vi-00 Frozen (delivery error message)
diff --git a/test/log/5440 b/test/log/5440
index 4d600eb..b90e6ed 100644
--- a/test/log/5440
+++ b/test/log/5440
@@ -1,7 +1,7 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 TLS error on connection to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] (certificate verification failed)
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] TLS error on connection (certificate verification failed)
1999-03-02 09:44:33 10HmaX-0005vi-00 TLS session failure: delivering unencrypted to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] (not in hosts_require_tls)
1999-03-02 09:44:33 10HmaX-0005vi-00 => userr@??? R=client_r T=send_to_server_req_failname H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmaZ-0005vi-00"
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
diff --git a/test/log/5450 b/test/log/5450
index 2a8aec4..2432153 100644
--- a/test/log/5450
+++ b/test/log/5450
@@ -3,13 +3,13 @@
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
1999-03-02 09:44:33 10HmaX-0005vi-00 SSL verify error: depth=0 error=unable to get local issuer certificate cert=/CN=server1.example.com
-1999-03-02 09:44:33 10HmaX-0005vi-00 TLS error on connection to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] (SSL_connect): error: <<detail omitted>>
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] TLS error on connection (SSL_connect): error: <<detail omitted>>
1999-03-02 09:44:33 10HmaX-0005vi-00 TLS session failure: delivering unencrypted to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] (not in hosts_require_tls)
1999-03-02 09:44:33 10HmaX-0005vi-00 => userq@??? R=client_q T=send_to_server_req_fail H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbA-0005vi-00"
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 10HmaY-0005vi-00 SSL verify error: certificate name mismatch: "/CN=server1.example.com"

-1999-03-02 09:44:33 10HmaY-0005vi-00 TLS error on connection to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] (SSL_connect): error: <<detail omitted>>
+1999-03-02 09:44:33 10HmaY-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] TLS error on connection (SSL_connect): error: <<detail omitted>>
1999-03-02 09:44:33 10HmaY-0005vi-00 TLS session failure: delivering unencrypted to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] (not in hosts_require_tls)
1999-03-02 09:44:33 10HmaY-0005vi-00 => userr@??? R=client_r T=send_to_server_req_failname H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbB-0005vi-00"
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
diff --git a/test/log/5510 b/test/log/5510
index 86a9bab..2e65e04 100644
--- a/test/log/5510
+++ b/test/log/5510
@@ -8,24 +8,24 @@
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= userx@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmaZ-0005vi-00 => usery@??? R=r0 T=t1 H=127.0.0.1 [127.0.0.1] PRDR C="250 first rcpt was good"
-1999-03-02 09:44:33 10HmaZ-0005vi-00 == userz@??? R=r0 T=t1 defer (0): PRDR error after DATA: 450 cannot handle second rcpt right now
+1999-03-02 09:44:33 10HmaZ-0005vi-00 == userz@??? R=r0 T=t1 defer (0) H=127.0.0.1 [127.0.0.1]: PRDR error after DATA: 450 cannot handle second rcpt right now
1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmbA-0005vi-00 => userp@??? R=r0 T=t1 H=127.0.0.1 [127.0.0.1] PRDR C="250 first rcpt was good"
-1999-03-02 09:44:33 10HmbA-0005vi-00 ** userq@??? R=r0 T=t1: PRDR error after DATA: 550 second rcpt does not like content
+1999-03-02 09:44:33 10HmbA-0005vi-00 ** userq@??? R=r0 T=t1 H=127.0.0.1 [127.0.0.1]: PRDR error after DATA: 550 second rcpt does not like content
1999-03-02 09:44:33 10HmbA-0005vi-00 Frozen (delivery error message)
1999-03-02 09:44:33 10HmaZ-0005vi-00 == userz@??? routing defer (-51): retry time not reached
1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbB-0005vi-00 ** user5.1@??? R=r0 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: host 127.0.0.1 [127.0.0.1]: 550 oops, overall rejection
-1999-03-02 09:44:33 10HmbB-0005vi-00 ** user5.2@??? R=r0 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: host 127.0.0.1 [127.0.0.1]: 550 oops, overall rejection
+1999-03-02 09:44:33 10HmbB-0005vi-00 ** user5.1@??? R=r0 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 550 oops, overall rejection
+1999-03-02 09:44:33 10HmbB-0005vi-00 ** user5.2@??? R=r0 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 550 oops, overall rejection
1999-03-02 09:44:33 10HmbB-0005vi-00 Frozen (delivery error message)
1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbC-0005vi-00 ** user6.1@??? R=r0 T=t1: SMTP error from remote mail server after end of data: host 127.0.0.1 [127.0.0.1]: 550 naah mate
-1999-03-02 09:44:33 10HmbC-0005vi-00 ** user6.2@??? R=r0 T=t1: SMTP error from remote mail server after end of data: host 127.0.0.1 [127.0.0.1]: 550 naah mate
+1999-03-02 09:44:33 10HmbC-0005vi-00 ** user6.1@??? R=r0 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 550 naah mate
+1999-03-02 09:44:33 10HmbC-0005vi-00 ** user6.2@??? R=r0 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 550 naah mate
1999-03-02 09:44:33 10HmbC-0005vi-00 Frozen (delivery error message)
1999-03-02 09:44:33 10HmbD-0005vi-00 <= <> U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbD-0005vi-00 == user7.1@??? R=r0 T=t1 defer (-46): SMTP error from remote mail server after end of data: host 127.0.0.1 [127.0.0.1]: 450 oops, try again later please
-1999-03-02 09:44:33 10HmbD-0005vi-00 == user7.2@??? R=r0 T=t1 defer (-46): SMTP error from remote mail server after end of data: host 127.0.0.1 [127.0.0.1]: 450 oops, try again later please
-1999-03-02 09:44:33 10HmbD-0005vi-00 == user7.3@??? R=r0 T=t1 defer (-46): SMTP error from remote mail server after end of data: host 127.0.0.1 [127.0.0.1]: 450 oops, try again later please
+1999-03-02 09:44:33 10HmbD-0005vi-00 == user7.1@??? R=r0 T=t1 defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 450 oops, try again later please
+1999-03-02 09:44:33 10HmbD-0005vi-00 == user7.2@??? R=r0 T=t1 defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 450 oops, try again later please
+1999-03-02 09:44:33 10HmbD-0005vi-00 == user7.3@??? R=r0 T=t1 defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 450 oops, try again later please
1999-03-02 09:44:33 10HmbE-0005vi-00 <= <> U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmbE-0005vi-00 => user8.1@??? R=r0 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK, got that"
1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
diff --git a/test/log/5601 b/test/log/5601
index 7c9a3b9..e5b3cec 100644
--- a/test/log/5601
+++ b/test/log/5601
@@ -9,16 +9,16 @@
1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmbD-0005vi-00 Received TLS status callback, null content
-1999-03-02 09:44:33 10HmbD-0005vi-00 TLS error on connection to 127.0.0.1 [127.0.0.1] (SSL_connect): error: <<detail omitted>>
-1999-03-02 09:44:33 10HmbD-0005vi-00 == CALLER@??? R=client T=send_to_server3 defer (-37): failure while setting up TLS session
+1999-03-02 09:44:33 10HmbD-0005vi-00 H=127.0.0.1 [127.0.0.1] TLS error on connection (SSL_connect): error: <<detail omitted>>
+1999-03-02 09:44:33 10HmbD-0005vi-00 == CALLER@??? R=client T=send_to_server3 defer (-37) H=127.0.0.1 [127.0.0.1]: failure while setting up TLS session
1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmbE-0005vi-00 Server certificate revoked; reason: superseded
-1999-03-02 09:44:33 10HmbE-0005vi-00 TLS error on connection to 127.0.0.1 [127.0.0.1] (SSL_connect): error: <<detail omitted>>
-1999-03-02 09:44:33 10HmbE-0005vi-00 == CALLER@??? R=client T=send_to_server3 defer (-37): failure while setting up TLS session
+1999-03-02 09:44:33 10HmbE-0005vi-00 H=127.0.0.1 [127.0.0.1] TLS error on connection (SSL_connect): error: <<detail omitted>>
+1999-03-02 09:44:33 10HmbE-0005vi-00 == CALLER@??? R=client T=send_to_server3 defer (-37) H=127.0.0.1 [127.0.0.1]: failure while setting up TLS session
1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmbF-0005vi-00 Server OSCP dates invalid
-1999-03-02 09:44:33 10HmbF-0005vi-00 TLS error on connection to 127.0.0.1 [127.0.0.1] (SSL_connect): error: <<detail omitted>>
-1999-03-02 09:44:33 10HmbF-0005vi-00 == CALLER@??? R=client T=send_to_server3 defer (-37): failure while setting up TLS session
+1999-03-02 09:44:33 10HmbF-0005vi-00 H=127.0.0.1 [127.0.0.1] TLS error on connection (SSL_connect): error: <<detail omitted>>
+1999-03-02 09:44:33 10HmbF-0005vi-00 == CALLER@??? R=client T=send_to_server3 defer (-37) H=127.0.0.1 [127.0.0.1]: failure while setting up TLS session

******** SERVER ********
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
diff --git a/test/log/5608 b/test/log/5608
index a7115ad..3ef1fec 100644
--- a/test/log/5608
+++ b/test/log/5608
@@ -16,19 +16,19 @@
1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmbF-0005vi-00 Received TLS status callback, null content
-1999-03-02 09:44:33 10HmbF-0005vi-00 TLS error on connection to 127.0.0.1 [127.0.0.1] (SSL_connect): error: <<detail omitted>>
+1999-03-02 09:44:33 10HmbF-0005vi-00 H=127.0.0.1 [127.0.0.1] TLS error on connection (SSL_connect): error: <<detail omitted>>
1999-03-02 09:44:33 10HmbF-0005vi-00 client ocsp status: 1 (notresp)
-1999-03-02 09:44:33 10HmbF-0005vi-00 == failrequire@??? R=client T=send_to_server3 defer (-37): failure while setting up TLS session
+1999-03-02 09:44:33 10HmbF-0005vi-00 == failrequire@??? R=client T=send_to_server3 defer (-37) H=127.0.0.1 [127.0.0.1]: failure while setting up TLS session
1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmbG-0005vi-00 Server certificate revoked; reason: superseded
-1999-03-02 09:44:33 10HmbG-0005vi-00 TLS error on connection to 127.0.0.1 [127.0.0.1] (SSL_connect): error: <<detail omitted>>
+1999-03-02 09:44:33 10HmbG-0005vi-00 H=127.0.0.1 [127.0.0.1] TLS error on connection (SSL_connect): error: <<detail omitted>>
1999-03-02 09:44:33 10HmbG-0005vi-00 client ocsp status: 3 (failed)
-1999-03-02 09:44:33 10HmbG-0005vi-00 == failrevoked@??? R=client T=send_to_server3 defer (-37): failure while setting up TLS session
+1999-03-02 09:44:33 10HmbG-0005vi-00 == failrevoked@??? R=client T=send_to_server3 defer (-37) H=127.0.0.1 [127.0.0.1]: failure while setting up TLS session
1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmbH-0005vi-00 Server OSCP dates invalid
-1999-03-02 09:44:33 10HmbH-0005vi-00 TLS error on connection to 127.0.0.1 [127.0.0.1] (SSL_connect): error: <<detail omitted>>
+1999-03-02 09:44:33 10HmbH-0005vi-00 H=127.0.0.1 [127.0.0.1] TLS error on connection (SSL_connect): error: <<detail omitted>>
1999-03-02 09:44:33 10HmbH-0005vi-00 client ocsp status: 3 (failed)
-1999-03-02 09:44:33 10HmbH-0005vi-00 == failexpired@??? R=client T=send_to_server3 defer (-37): failure while setting up TLS session
+1999-03-02 09:44:33 10HmbH-0005vi-00 == failexpired@??? R=client T=send_to_server3 defer (-37) H=127.0.0.1 [127.0.0.1]: failure while setting up TLS session

******** SERVER ********
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
diff --git a/test/log/5651 b/test/log/5651
index f19900e..b525299 100644
--- a/test/log/5651
+++ b/test/log/5651
@@ -8,14 +8,14 @@
1999-03-02 09:44:33 10HmbB-0005vi-00 => CALLER@??? R=client T=send_to_server3 H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 DN="CN=server1.example.com" C="250 OK id=10HmbC-0005vi-00"
1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbD-0005vi-00 TLS error on connection to 127.0.0.1 [127.0.0.1] (certificate status check failed)
-1999-03-02 09:44:33 10HmbD-0005vi-00 == CALLER@??? R=client T=send_to_server3 defer (-37): failure while setting up TLS session
+1999-03-02 09:44:33 10HmbD-0005vi-00 H=127.0.0.1 [127.0.0.1] TLS error on connection (certificate status check failed)
+1999-03-02 09:44:33 10HmbD-0005vi-00 == CALLER@??? R=client T=send_to_server3 defer (-37) H=127.0.0.1 [127.0.0.1]: failure while setting up TLS session
1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbE-0005vi-00 TLS error on connection to 127.0.0.1 [127.0.0.1] (certificate verification failed): certificate revoked
-1999-03-02 09:44:33 10HmbE-0005vi-00 == CALLER@??? R=client T=send_to_server3 defer (-37): failure while setting up TLS session
+1999-03-02 09:44:33 10HmbE-0005vi-00 H=127.0.0.1 [127.0.0.1] TLS error on connection (certificate verification failed): certificate revoked
+1999-03-02 09:44:33 10HmbE-0005vi-00 == CALLER@??? R=client T=send_to_server3 defer (-37) H=127.0.0.1 [127.0.0.1]: failure while setting up TLS session
1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbF-0005vi-00 TLS error on connection to 127.0.0.1 [127.0.0.1] (certificate status check failed)
-1999-03-02 09:44:33 10HmbF-0005vi-00 == CALLER@??? R=client T=send_to_server3 defer (-37): failure while setting up TLS session
+1999-03-02 09:44:33 10HmbF-0005vi-00 H=127.0.0.1 [127.0.0.1] TLS error on connection (certificate status check failed)
+1999-03-02 09:44:33 10HmbF-0005vi-00 == CALLER@??? R=client T=send_to_server3 defer (-37) H=127.0.0.1 [127.0.0.1]: failure while setting up TLS session

******** SERVER ********
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
diff --git a/test/log/5658 b/test/log/5658
index 16f5b31..7282a7e 100644
--- a/test/log/5658
+++ b/test/log/5658
@@ -15,17 +15,17 @@
1999-03-02 09:44:33 10HmbD-0005vi-00 client ocsp status: 4 (verified)
1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbF-0005vi-00 TLS error on connection to 127.0.0.1 [127.0.0.1] (certificate status check failed)
+1999-03-02 09:44:33 10HmbF-0005vi-00 H=127.0.0.1 [127.0.0.1] TLS error on connection (certificate status check failed)
1999-03-02 09:44:33 10HmbF-0005vi-00 client ocsp status: 3 (failed)
-1999-03-02 09:44:33 10HmbF-0005vi-00 == failrequire@??? R=client T=send_to_server3 defer (-37): failure while setting up TLS session
+1999-03-02 09:44:33 10HmbF-0005vi-00 == failrequire@??? R=client T=send_to_server3 defer (-37) H=127.0.0.1 [127.0.0.1]: failure while setting up TLS session
1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbG-0005vi-00 TLS error on connection to 127.0.0.1 [127.0.0.1] (certificate verification failed): certificate revoked
+1999-03-02 09:44:33 10HmbG-0005vi-00 H=127.0.0.1 [127.0.0.1] TLS error on connection (certificate verification failed): certificate revoked
1999-03-02 09:44:33 10HmbG-0005vi-00 client ocsp status: 1 (notresp)
-1999-03-02 09:44:33 10HmbG-0005vi-00 == failrevoked@??? R=client T=send_to_server3 defer (-37): failure while setting up TLS session
+1999-03-02 09:44:33 10HmbG-0005vi-00 == failrevoked@??? R=client T=send_to_server3 defer (-37) H=127.0.0.1 [127.0.0.1]: failure while setting up TLS session
1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbH-0005vi-00 TLS error on connection to 127.0.0.1 [127.0.0.1] (certificate status check failed)
+1999-03-02 09:44:33 10HmbH-0005vi-00 H=127.0.0.1 [127.0.0.1] TLS error on connection (certificate status check failed)
1999-03-02 09:44:33 10HmbH-0005vi-00 client ocsp status: 3 (failed)
-1999-03-02 09:44:33 10HmbH-0005vi-00 == failexpired@??? R=client T=send_to_server3 defer (-37): failure while setting up TLS session
+1999-03-02 09:44:33 10HmbH-0005vi-00 == failexpired@??? R=client T=send_to_server3 defer (-37) H=127.0.0.1 [127.0.0.1]: failure while setting up TLS session

******** SERVER ********
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
diff --git a/test/log/5700 b/test/log/5700
index 7f57129..c3fe649 100644
--- a/test/log/5700
+++ b/test/log/5700
@@ -39,10 +39,10 @@
1999-03-02 09:44:33 10HmaZ-0005vi-00 . banner <220 ESMTP>
1999-03-02 09:44:33 10HmaZ-0005vi-00 event tcp:close
1999-03-02 09:44:33 10HmaZ-0005vi-00 . [127.0.0.1] -> [127.0.0.1]:1224
-1999-03-02 09:44:33 10HmaZ-0005vi-00 SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after EHLO the.local.host.name: Connection timed out
+1999-03-02 09:44:33 10HmaZ-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP timeout after EHLO the.local.host.name: Connection timed out
1999-03-02 09:44:33 10HmaZ-0005vi-00 event msg:host:defer
-1999-03-02 09:44:33 10HmaZ-0005vi-00 . deferral ip <127.0.0.1> port <1224> fqdn <127.0.0.1> local_part <userx> domain <domain1> errno <110> errstr <SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after EHLO the.local.host.name: Connection timed out> router <others> transport <smtp>
-1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@domain1 R=others T=smtp defer (dd): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after EHLO the.local.host.name
+1999-03-02 09:44:33 10HmaZ-0005vi-00 . deferral ip <127.0.0.1> port <1224> fqdn <127.0.0.1> local_part <userx> domain <domain1> errno <110> errstr <SMTP timeout after EHLO the.local.host.name: Connection timed out> router <others> transport <smtp>
+1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@domain1 R=others T=smtp defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after EHLO the.local.host.name
1999-03-02 09:44:33 10HmaZ-0005vi-00 ** userx@domain1: retry timeout exceeded
1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss
1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <CALLER@???> R=dump_bounces
@@ -61,7 +61,7 @@
1999-03-02 09:44:33 10HmbB-0005vi-00 . banner <220 ESMTP>
1999-03-02 09:44:33 10HmbB-0005vi-00 event tcp:close
1999-03-02 09:44:33 10HmbB-0005vi-00 . [127.0.0.1] -> [127.0.0.1]:1224
-1999-03-02 09:44:33 10HmbB-0005vi-00 ** userx@domain1 R=others T=smtp: SMTP error from remote mail server after RCPT TO:<userx@domain1>: host 127.0.0.1 [127.0.0.1]: 550 GO AWAY
+1999-03-02 09:44:33 10HmbB-0005vi-00 ** userx@domain1 R=others T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@domain1>: 550 GO AWAY
1999-03-02 09:44:33 10HmbB-0005vi-00 event msg:fail:delivery
1999-03-02 09:44:33 10HmbB-0005vi-00 . refused by fdqn <127.0.0.1> local_part <userx> domain <domain1>
1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbB-0005vi-00 U=EXIMUSER P=local S=sss
diff --git a/test/log/5750 b/test/log/5750
index c13fe6a..9e85d1a 100644
--- a/test/log/5750
+++ b/test/log/5750
@@ -2,7 +2,7 @@
1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
1999-03-02 09:44:33 10HmaX-0005vi-00 tls:cert depth=0 <CN=server1.example.com>
-1999-03-02 09:44:33 10HmaX-0005vi-00 TLS error on connection to 127.0.0.1 [127.0.0.1] (certificate verification failed): certificate invalid
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] TLS error on connection (certificate verification failed): certificate invalid
1999-03-02 09:44:33 10HmaX-0005vi-00 msg:host:defer bad
1999-03-02 09:44:33 10HmaX-0005vi-00 NO CLIENT CERT presented
1999-03-02 09:44:33 10HmaX-0005vi-00 Peer cert:
diff --git a/test/log/5760 b/test/log/5760
index e8fd95f..6d382ca 100644
--- a/test/log/5760
+++ b/test/log/5760
@@ -2,7 +2,7 @@
1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
1999-03-02 09:44:33 10HmaX-0005vi-00 SSL verify error: depth=2 error=self signed certificate in certificate chain cert=/O=example.com/CN=clica CA
-1999-03-02 09:44:33 10HmaX-0005vi-00 TLS error on connection to 127.0.0.1 [127.0.0.1] (SSL_connect): error: <<detail omitted>>
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] TLS error on connection (SSL_connect): error: <<detail omitted>>
1999-03-02 09:44:33 10HmaX-0005vi-00 msg:host:defer bad
1999-03-02 09:44:33 10HmaX-0005vi-00 NO CLIENT CERT presented
1999-03-02 09:44:33 10HmaX-0005vi-00 Peer cert:
diff --git a/test/mail/0211.CALLER b/test/mail/0211.CALLER
index cd5f25b..4a9257c 100644
--- a/test/mail/0211.CALLER
+++ b/test/mail/0211.CALLER
@@ -17,8 +17,9 @@ A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:

   userx@domain1
+  host 127.0.0.1 [127.0.0.1]
     SMTP error from remote mail server after initial connection:
-  host 127.0.0.1 [127.0.0.1]: 550 Go away
+    550 Go away


------ This is a copy of the message, including all the headers. ------

@@ -53,11 +54,13 @@ A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:

   usery@domain2
+  host 127.0.0.1 [127.0.0.1]
     SMTP error from remote mail server after HELO the.local.host.name:
-  host 127.0.0.1 [127.0.0.1]: 550 Go away
+    550 Go away
   userx@domain1
+  host 127.0.0.1 [127.0.0.1]
     SMTP error from remote mail server after HELO the.local.host.name:
-  host 127.0.0.1 [127.0.0.1]: 550 Go away
+    550 Go away


------ This is a copy of the message, including all the headers. ------

diff --git a/test/mail/0253.lmn b/test/mail/0253.lmn
index eeac8dc..ad1f0e6 100644
--- a/test/mail/0253.lmn
+++ b/test/mail/0253.lmn
@@ -20,8 +20,9 @@ could not be delivered to one or more of its recipients. The following
address(es) failed:

   fail@???
+  host 127.0.0.1 [127.0.0.1]
     SMTP error from remote mail server after RCPT TO:<fail@???>:
-  host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
+    550 Recipient not OK


------ This is a copy of the message, including all the headers. ------

diff --git a/test/mail/0374.CALLER b/test/mail/0374.CALLER
index 36e4ef0..df8b523 100644
--- a/test/mail/0374.CALLER
+++ b/test/mail/0374.CALLER
@@ -19,8 +19,9 @@ A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:

   d3@???
+  host 127.0.0.1 [127.0.0.1]
     SMTP error from remote mail server after RCPT TO:<d3@???>:
-  host 127.0.0.1 [127.0.0.1]: 550 hard error
+    550 hard error
   b1@???
     local delivery failed


diff --git a/test/mail/0375.CALLER b/test/mail/0375.CALLER
index 9fc9424..72ecd22 100644
--- a/test/mail/0375.CALLER
+++ b/test/mail/0375.CALLER
@@ -18,8 +18,9 @@ A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:

   e1@???
+  host 127.0.0.1 [127.0.0.1]
     SMTP error from remote mail server after RCPT TO:<e1@???>:
-  host 127.0.0.1 [127.0.0.1]: 550 hard error
+    550 hard error


------ This is a copy of the message, including all the headers. ------

diff --git a/test/mail/0531.CALLER b/test/mail/0531.CALLER
index a35a782..d945516 100644
--- a/test/mail/0531.CALLER
+++ b/test/mail/0531.CALLER
@@ -16,6 +16,7 @@ A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:

   userx@???
+  host 127.0.0.1 [127.0.0.1]
     LMTP error after DATA: 450 TEMPERROR: retry timeout exceeded


------ This is a copy of the message, including all the headers. ------
@@ -48,6 +49,7 @@ A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:

   userx@???
+  host 127.0.0.1 [127.0.0.1]
     LMTP error after DATA: 450 TEMPERROR: retry timeout exceeded


------ This is a copy of the message, including all the headers. ------
@@ -81,8 +83,9 @@ A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:

   userx@???
+  host 127.0.0.1 [127.0.0.1]
     SMTP error from remote mail server after RCPT TO:<userx@???>:
-  host 127.0.0.1 [127.0.0.1]: 450 TEMPERROR: retry timeout exceeded
+    450 TEMPERROR: retry timeout exceeded


------ This is a copy of the message, including all the headers. ------

diff --git a/test/msglog/0099.10HmaX-0005vi-00 b/test/msglog/0099.10HmaX-0005vi-00
index 996dc85..f9bd430 100644
--- a/test/msglog/0099.10HmaX-0005vi-00
+++ b/test/msglog/0099.10HmaX-0005vi-00
@@ -1,5 +1,5 @@
1999-03-02 09:44:33 Received from CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 H=127.0.0.1 [127.0.0.1] Connection refused
1999-03-02 09:44:33 userx@??? R=all T=smtp defer (dd): Connection refused
-1999-03-02 09:44:33 127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 H=127.0.0.1 [127.0.0.1] Connection refused
1999-03-02 09:44:33 userx@??? R=all T=smtp defer (dd): Connection refused
diff --git a/test/msglog/0106.10HmaX-0005vi-00 b/test/msglog/0106.10HmaX-0005vi-00
index 0ae4aaa..4d61228 100644
--- a/test/msglog/0106.10HmaX-0005vi-00
+++ b/test/msglog/0106.10HmaX-0005vi-00
@@ -1,3 +1,3 @@
1999-03-02 09:44:33 Received from CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after EHLO myhost.test.ex: Connection timed out
-1999-03-02 09:44:33 userx@??? R=all T=smtp defer (dd): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after EHLO myhost.test.ex
+1999-03-02 09:44:33 H=127.0.0.1 [127.0.0.1]: SMTP timeout after EHLO myhost.test.ex: Connection timed out
+1999-03-02 09:44:33 userx@??? R=all T=smtp defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after EHLO myhost.test.ex
diff --git a/test/msglog/0106.10HmaY-0005vi-00 b/test/msglog/0106.10HmaY-0005vi-00
index 4c4f9b0..af0eb72 100644
--- a/test/msglog/0106.10HmaY-0005vi-00
+++ b/test/msglog/0106.10HmaY-0005vi-00
@@ -1,3 +1,3 @@
1999-03-02 09:44:33 Received from CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after MAIL FROM:<CALLER@???>: Connection timed out
-1999-03-02 09:44:33 userx@??? R=all T=smtp defer (dd): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after MAIL FROM:<CALLER@???>
+1999-03-02 09:44:33 H=127.0.0.1 [127.0.0.1] SMTP timeout after MAIL FROM:<CALLER@???>: Connection timed out
+1999-03-02 09:44:33 userx@??? R=all T=smtp defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after MAIL FROM:<CALLER@???>
diff --git a/test/msglog/0109.10HmaX-0005vi-00 b/test/msglog/0109.10HmaX-0005vi-00
index 573dae3..842e692 100644
--- a/test/msglog/0109.10HmaX-0005vi-00
+++ b/test/msglog/0109.10HmaX-0005vi-00
@@ -1,4 +1,4 @@
1999-03-02 09:44:33 Received from CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 127.0.0.1 [127.0.0.1] Connection refused
-1999-03-02 09:44:33 ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] Connection refused
+1999-03-02 09:44:33 H=127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] Connection refused
1999-03-02 09:44:33 xx@??? R=remote T=smtp defer (dd): Connection refused
diff --git a/test/msglog/0197.10HmaX-0005vi-00 b/test/msglog/0197.10HmaX-0005vi-00
index 5fb436c..51efc62 100644
--- a/test/msglog/0197.10HmaX-0005vi-00
+++ b/test/msglog/0197.10HmaX-0005vi-00
@@ -1,9 +1,9 @@
1999-03-02 09:44:33 Received from CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 userx@??? <userx@???>: makecopy transport succeeded
1999-03-02 09:44:33 usery@??? <usery@???>: makecopy transport succeeded
-1999-03-02 09:44:33 V4NET.0.0.1 [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
1999-03-02 09:44:33 userx@??? R=passall T=pass_on defer (dd): Network Error
1999-03-02 09:44:33 usery@??? R=passall T=pass_on defer (dd): Network Error
-1999-03-02 09:44:33 V4NET.0.0.1 [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
1999-03-02 09:44:33 userx@??? R=passall T=pass_on defer (dd): Network Error
1999-03-02 09:44:33 usery@??? R=passall T=pass_on defer (dd): Network Error
diff --git a/test/msglog/0197.10HmaY-0005vi-00 b/test/msglog/0197.10HmaY-0005vi-00
index 9ca3081..a046fcd 100644
--- a/test/msglog/0197.10HmaY-0005vi-00
+++ b/test/msglog/0197.10HmaY-0005vi-00
@@ -4,7 +4,7 @@
1999-03-02 09:44:33 x@??? R=passall T=pass_on defer (-53): retry time not reached for any host
1999-03-02 09:44:33 y@??? R=passall T=pass_on defer (-53): retry time not reached for any host
1999-03-02 09:44:33 z@elsewhere R=passall T=pass_on defer (-53): retry time not reached for any host
-1999-03-02 09:44:33 V4NET.0.0.1 [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
1999-03-02 09:44:33 x@??? R=passall T=pass_on defer (dd): Network Error
1999-03-02 09:44:33 y@??? R=passall T=pass_on defer (dd): Network Error
1999-03-02 09:44:33 z@elsewhere R=passall T=pass_on defer (dd): Network Error
diff --git a/test/msglog/0198.10HmaX-0005vi-00 b/test/msglog/0198.10HmaX-0005vi-00
index 61ba18a..858bd18 100644
--- a/test/msglog/0198.10HmaX-0005vi-00
+++ b/test/msglog/0198.10HmaX-0005vi-00
@@ -1,4 +1,4 @@
1999-03-02 09:44:33 Received from CALLER@??? U=CALLER P=local-bsmtp S=sss id=E10HmaY-0005vi-00@???
1999-03-02 09:44:33 routing failed for usery@???: Unrouteable address
-1999-03-02 09:44:33 V4NET.0.0.1 [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
1999-03-02 09:44:33 userx@??? R=check_file T=pass_on defer (dd): Network Error
diff --git a/test/msglog/0208.10HmaX-0005vi-00 b/test/msglog/0208.10HmaX-0005vi-00
index 530806b..3ac99eb 100644
--- a/test/msglog/0208.10HmaX-0005vi-00
+++ b/test/msglog/0208.10HmaX-0005vi-00
@@ -3,5 +3,5 @@
1999-03-02 09:44:33 routing failed for fail.direct@???: Unrouteable address
1999-03-02 09:44:33 defer@??? R=defer defer (-1): don't do this yet
1999-03-02 09:44:33 ok@???: succeed transport succeeded
-1999-03-02 09:44:33 SMTP error from remote mail server after RCPT TO:<fail.transport@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient refused
-1999-03-02 09:44:33 fail.transport@??? R=fail_transport T=fail: SMTP error from remote mail server after RCPT TO:<fail.transport@???>: host 127.0.0.1 [127.0.0.1]: 550 Recipient refused
+1999-03-02 09:44:33 H=127.0.0.1 [127.0.0.1] SMTP error from remote mail server after RCPT TO:<fail.transport@???>: 550 Recipient refused
+1999-03-02 09:44:33 fail.transport@??? R=fail_transport T=fail H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<fail.transport@???>: 550 Recipient refused
diff --git a/test/runtest b/test/runtest
index bfc02ed..421e0b3 100755
--- a/test/runtest
+++ b/test/runtest
@@ -541,7 +541,7 @@ RESET_AFTER_EXTRA_LINE_READ:

# (this new one is a generic channel-read error, but the testsuite
# only hits it in one place)
- s/TLS error on connection to \d{1,3}(.\d{1,3}){3} \[\d{1,3}(.\d{1,3}){3}\] \(gnutls_handshake\): Error in the pull function\./a TLS session is required for ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4], but an attempt to start TLS failed/g;
+ s/TLS error on connection \(gnutls_handshake\): Error in the pull function\./a TLS session is required but an attempt to start TLS failed/g;

# (replace old with new, hoping that old only happens in one situation)
s/TLS error on connection to \d{1,3}(.\d{1,3}){3} \[\d{1,3}(.\d{1,3}){3}\] \(gnutls_handshake\): A TLS packet with unexpected length was received./a TLS session is required for ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4], but an attempt to start TLS failed/g;
@@ -754,7 +754,7 @@ RESET_AFTER_EXTRA_LINE_READ:
# numbers, or handle specific bad conditions in different ways, leading to
# different wording in the error messages, so we cannot compare them.

- s/(TLS error on connection (?:from|to) .*? \(SSL_\w+\): error:)(.*)/$1 <<detail omitted>>/;
+ s/(TLS error on connection (?:from .* )?\(SSL_\w+\): error:)(.*)/$1 <<detail omitted>>/;

# ======== Maildir things ========
# timestamp output in maildir processing
diff --git a/test/stderr/0217 b/test/stderr/0217
index 4d05830..259df46 100644
--- a/test/stderr/0217
+++ b/test/stderr/0217
@@ -414,407 +414,407 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 403 Sorry temp data error
SMTP>> QUIT
LOG: MAIN
- == yes@??? R=client T=send_to_server defer (-46): SMTP error from remote mail server after pipelined DATA: host 127.0.0.1 [127.0.0.1]: 403 Sorry temp data error
+ == yes@??? 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
- ** n00@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n00@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n00@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n00@???>: 550 NO
LOG: MAIN
- ** n01@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n01@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n01@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n01@???>: 550 NO
LOG: MAIN
- ** n02@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n02@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n02@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n02@???>: 550 NO
LOG: MAIN
- ** n03@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n03@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n03@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n03@???>: 550 NO
LOG: MAIN
- ** n04@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n04@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n04@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n04@???>: 550 NO
LOG: MAIN
- ** n05@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n05@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n05@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n05@???>: 550 NO
LOG: MAIN
- ** n06@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n06@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n06@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n06@???>: 550 NO
LOG: MAIN
- ** n07@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n07@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n07@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n07@???>: 550 NO
LOG: MAIN
- ** n08@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n08@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n08@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n08@???>: 550 NO
LOG: MAIN
- ** n09@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n09@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n09@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n09@???>: 550 NO
LOG: MAIN
- ** n10@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n10@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n10@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n10@???>: 550 NO
LOG: MAIN
- ** n11@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n11@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n11@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n11@???>: 550 NO
LOG: MAIN
- ** n12@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n12@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n12@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n12@???>: 550 NO
LOG: MAIN
- ** n13@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n13@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n13@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n13@???>: 550 NO
LOG: MAIN
- ** n14@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n14@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n14@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n14@???>: 550 NO
LOG: MAIN
- ** n15@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n15@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n15@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n15@???>: 550 NO
LOG: MAIN
- ** n16@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n16@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n16@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n16@???>: 550 NO
LOG: MAIN
- ** n17@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n17@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n17@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n17@???>: 550 NO
LOG: MAIN
- ** n18@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n18@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n18@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n18@???>: 550 NO
LOG: MAIN
- ** n19@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n19@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n19@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n19@???>: 550 NO
LOG: MAIN
- ** n20@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n20@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n20@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n20@???>: 550 NO
LOG: MAIN
- ** n21@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n21@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n21@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n21@???>: 550 NO
LOG: MAIN
- ** n22@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n22@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n22@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n22@???>: 550 NO
LOG: MAIN
- ** n23@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n23@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n23@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n23@???>: 550 NO
LOG: MAIN
- ** n24@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n24@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n24@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n24@???>: 550 NO
LOG: MAIN
- ** n25@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n25@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n25@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n25@???>: 550 NO
LOG: MAIN
- ** n26@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n26@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n26@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n26@???>: 550 NO
LOG: MAIN
- ** n27@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n27@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n27@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n27@???>: 550 NO
LOG: MAIN
- ** n28@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n28@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n28@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n28@???>: 550 NO
LOG: MAIN
- ** n29@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n29@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n29@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n29@???>: 550 NO
LOG: MAIN
- ** n30@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n30@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n30@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n30@???>: 550 NO
LOG: MAIN
- ** n31@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n31@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n31@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n31@???>: 550 NO
LOG: MAIN
- ** n32@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n32@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n32@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n32@???>: 550 NO
LOG: MAIN
- ** n33@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n33@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n33@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n33@???>: 550 NO
LOG: MAIN
- ** n34@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n34@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n34@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n34@???>: 550 NO
LOG: MAIN
- ** n35@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n35@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n35@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n35@???>: 550 NO
LOG: MAIN
- ** n36@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n36@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n36@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n36@???>: 550 NO
LOG: MAIN
- ** n37@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n37@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n37@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n37@???>: 550 NO
LOG: MAIN
- ** n38@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n38@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n38@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n38@???>: 550 NO
LOG: MAIN
- ** n39@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n39@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n39@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n39@???>: 550 NO
LOG: MAIN
- ** n40@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n40@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n40@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n40@???>: 550 NO
LOG: MAIN
- ** n41@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n41@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n41@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n41@???>: 550 NO
LOG: MAIN
- ** n42@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n42@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n42@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n42@???>: 550 NO
LOG: MAIN
- ** n43@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n43@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n43@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n43@???>: 550 NO
LOG: MAIN
- ** n44@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n44@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n44@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n44@???>: 550 NO
LOG: MAIN
- ** n45@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n45@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n45@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n45@???>: 550 NO
LOG: MAIN
- ** n46@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n46@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n46@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n46@???>: 550 NO
LOG: MAIN
- ** n47@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n47@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n47@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n47@???>: 550 NO
LOG: MAIN
- ** n48@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n48@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n48@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n48@???>: 550 NO
LOG: MAIN
- ** n49@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n49@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n49@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n49@???>: 550 NO
LOG: MAIN
- ** n50@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n50@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n50@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n50@???>: 550 NO
LOG: MAIN
- ** n51@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n51@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n51@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n51@???>: 550 NO
LOG: MAIN
- ** n52@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n52@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n52@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n52@???>: 550 NO
LOG: MAIN
- ** n53@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n53@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n53@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n53@???>: 550 NO
LOG: MAIN
- ** n54@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n54@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n54@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n54@???>: 550 NO
LOG: MAIN
- ** n55@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n55@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n55@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n55@???>: 550 NO
LOG: MAIN
- ** n56@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n56@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n56@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n56@???>: 550 NO
LOG: MAIN
- ** n57@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n57@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n57@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n57@???>: 550 NO
LOG: MAIN
- ** n58@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n58@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n58@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n58@???>: 550 NO
LOG: MAIN
- ** n59@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n59@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n59@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n59@???>: 550 NO
LOG: MAIN
- ** n60@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n60@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n60@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n60@???>: 550 NO
LOG: MAIN
- ** n61@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n61@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n61@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n61@???>: 550 NO
LOG: MAIN
- ** n62@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n62@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n62@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n62@???>: 550 NO
LOG: MAIN
- ** n63@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n63@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n63@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n63@???>: 550 NO
LOG: MAIN
- ** n64@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n64@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n64@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n64@???>: 550 NO
LOG: MAIN
- ** n65@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n65@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n65@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n65@???>: 550 NO
LOG: MAIN
- ** n66@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n66@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n66@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n66@???>: 550 NO
LOG: MAIN
- ** n67@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n67@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n67@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n67@???>: 550 NO
LOG: MAIN
- ** n68@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n68@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n68@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n68@???>: 550 NO
LOG: MAIN
- ** n69@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n69@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n69@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n69@???>: 550 NO
LOG: MAIN
- ** n70@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n70@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n70@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n70@???>: 550 NO
LOG: MAIN
- ** n71@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n71@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n71@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n71@???>: 550 NO
LOG: MAIN
- ** n72@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n72@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n72@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n72@???>: 550 NO
LOG: MAIN
- ** n73@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n73@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n73@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n73@???>: 550 NO
LOG: MAIN
- ** n74@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n74@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n74@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n74@???>: 550 NO
LOG: MAIN
- ** n75@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n75@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n75@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n75@???>: 550 NO
LOG: MAIN
- ** n76@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n76@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n76@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n76@???>: 550 NO
LOG: MAIN
- ** n77@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n77@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n77@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n77@???>: 550 NO
LOG: MAIN
- ** n78@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n78@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n78@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n78@???>: 550 NO
LOG: MAIN
- ** n79@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n79@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n79@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n79@???>: 550 NO
LOG: MAIN
- ** n80@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n80@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n80@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n80@???>: 550 NO
LOG: MAIN
- ** n81@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n81@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n81@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n81@???>: 550 NO
LOG: MAIN
- ** n82@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n82@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n82@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n82@???>: 550 NO
LOG: MAIN
- ** n83@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n83@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n83@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n83@???>: 550 NO
LOG: MAIN
- ** n84@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n84@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n84@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n84@???>: 550 NO
LOG: MAIN
- ** n85@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n85@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n85@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n85@???>: 550 NO
LOG: MAIN
- ** n86@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n86@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n86@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n86@???>: 550 NO
LOG: MAIN
- ** n87@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n87@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n87@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n87@???>: 550 NO
LOG: MAIN
- ** n88@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n88@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n88@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n88@???>: 550 NO
LOG: MAIN
- ** n89@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n89@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n89@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n89@???>: 550 NO
LOG: MAIN
- ** n90@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n90@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n90@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n90@???>: 550 NO
LOG: MAIN
- ** n91@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n91@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n91@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n91@???>: 550 NO
LOG: MAIN
- ** n92@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n92@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n92@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n92@???>: 550 NO
LOG: MAIN
- ** n93@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n93@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n93@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n93@???>: 550 NO
LOG: MAIN
- ** n94@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n94@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n94@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n94@???>: 550 NO
LOG: MAIN
- ** n95@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n95@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n95@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n95@???>: 550 NO
LOG: MAIN
- ** n96@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n96@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n96@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n96@???>: 550 NO
LOG: MAIN
- ** n97@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n97@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n97@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n97@???>: 550 NO
LOG: MAIN
- ** n98@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n98@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n98@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n98@???>: 550 NO
LOG: MAIN
- ** n99@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n99@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n99@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n99@???>: 550 NO
LOG: MAIN
- ** n100@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n100@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n100@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n100@???>: 550 NO
LOG: MAIN
- ** n101@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n101@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n101@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n101@???>: 550 NO
LOG: MAIN
- ** n102@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n102@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n102@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n102@???>: 550 NO
LOG: MAIN
- ** n103@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n103@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n103@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n103@???>: 550 NO
LOG: MAIN
- ** n104@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n104@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n104@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n104@???>: 550 NO
LOG: MAIN
- ** n105@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n105@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n105@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n105@???>: 550 NO
LOG: MAIN
- ** n106@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n106@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n106@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n106@???>: 550 NO
LOG: MAIN
- ** n107@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n107@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n107@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n107@???>: 550 NO
LOG: MAIN
- ** n108@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n108@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n108@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n108@???>: 550 NO
LOG: MAIN
- ** n109@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n109@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n109@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n109@???>: 550 NO
LOG: MAIN
- ** n110@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n110@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n110@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n110@???>: 550 NO
LOG: MAIN
- ** n111@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n111@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n111@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n111@???>: 550 NO
LOG: MAIN
- ** n112@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n112@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n112@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n112@???>: 550 NO
LOG: MAIN
- ** n113@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n113@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n113@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n113@???>: 550 NO
LOG: MAIN
- ** n114@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n114@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n114@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n114@???>: 550 NO
LOG: MAIN
- ** n115@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n115@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n115@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n115@???>: 550 NO
LOG: MAIN
- ** n116@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n116@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n116@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n116@???>: 550 NO
LOG: MAIN
- ** n117@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n117@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n117@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n117@???>: 550 NO
LOG: MAIN
- ** n118@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n118@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n118@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n118@???>: 550 NO
LOG: MAIN
- ** n119@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n119@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n119@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n119@???>: 550 NO
LOG: MAIN
- ** n120@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n120@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n120@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n120@???>: 550 NO
LOG: MAIN
- ** n121@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n121@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n121@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n121@???>: 550 NO
LOG: MAIN
- ** n122@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n122@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n122@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n122@???>: 550 NO
LOG: MAIN
- ** n123@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n123@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n123@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n123@???>: 550 NO
LOG: MAIN
- ** n124@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n124@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n124@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n124@???>: 550 NO
LOG: MAIN
- ** n125@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n125@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n125@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n125@???>: 550 NO
LOG: MAIN
- ** n126@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n126@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n126@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n126@???>: 550 NO
LOG: MAIN
- ** n127@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n127@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n127@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n127@???>: 550 NO
LOG: MAIN
- ** n128@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n128@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n128@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n128@???>: 550 NO
LOG: MAIN
- ** n129@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n129@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n129@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n129@???>: 550 NO
LOG: MAIN
- ** n130@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n130@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n130@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n130@???>: 550 NO
LOG: MAIN
- ** n131@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n131@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n131@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n131@???>: 550 NO
LOG: MAIN
- ** n132@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n132@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n132@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n132@???>: 550 NO
LOG: MAIN
- ** n133@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n133@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n133@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n133@???>: 550 NO
LOG: MAIN
- ** n134@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n134@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n134@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n134@???>: 550 NO
LOG: MAIN
- ** n135@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n135@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n135@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n135@???>: 550 NO
LOG: MAIN
- ** n136@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n136@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n136@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n136@???>: 550 NO
LOG: MAIN
- ** n137@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n137@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n137@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n137@???>: 550 NO
LOG: MAIN
- ** n138@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n138@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n138@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n138@???>: 550 NO
LOG: MAIN
- ** n139@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n139@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n139@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n139@???>: 550 NO
LOG: MAIN
- ** n140@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n140@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n140@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n140@???>: 550 NO
LOG: MAIN
- ** n141@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n141@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n141@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n141@???>: 550 NO
LOG: MAIN
- ** n142@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n142@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n142@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n142@???>: 550 NO
LOG: MAIN
- ** n143@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n143@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n143@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n143@???>: 550 NO
LOG: MAIN
- ** n144@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n144@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n144@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n144@???>: 550 NO
LOG: MAIN
- ** n145@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n145@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n145@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n145@???>: 550 NO
LOG: MAIN
- ** n146@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n146@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n146@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n146@???>: 550 NO
LOG: MAIN
- ** n147@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n147@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n147@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n147@???>: 550 NO
LOG: MAIN
- ** n148@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n148@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n148@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n148@???>: 550 NO
LOG: MAIN
- ** n149@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n149@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n149@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n149@???>: 550 NO
LOG: MAIN
- ** n150@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n150@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n150@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n150@???>: 550 NO
LOG: MAIN
- ** n151@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n151@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n151@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n151@???>: 550 NO
LOG: MAIN
- ** n152@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n152@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n152@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n152@???>: 550 NO
LOG: MAIN
- ** n153@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n153@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n153@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n153@???>: 550 NO
LOG: MAIN
- ** n154@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n154@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n154@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n154@???>: 550 NO
LOG: MAIN
- ** n155@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n155@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n155@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n155@???>: 550 NO
LOG: MAIN
- ** n156@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n156@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n156@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n156@???>: 550 NO
LOG: MAIN
- ** n157@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n157@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n157@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n157@???>: 550 NO
LOG: MAIN
- ** n158@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n158@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n158@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n158@???>: 550 NO
LOG: MAIN
- ** n159@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n159@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n159@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n159@???>: 550 NO
LOG: MAIN
- ** n160@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n160@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n160@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n160@???>: 550 NO
LOG: MAIN
- ** n161@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n161@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n161@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n161@???>: 550 NO
LOG: MAIN
- ** n162@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n162@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n162@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n162@???>: 550 NO
LOG: MAIN
- ** n163@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n163@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n163@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n163@???>: 550 NO
LOG: MAIN
- ** n164@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n164@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n164@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n164@???>: 550 NO
LOG: MAIN
- ** n165@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n165@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n165@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n165@???>: 550 NO
LOG: MAIN
- ** n166@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n166@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n166@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n166@???>: 550 NO
LOG: MAIN
- ** n167@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n167@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n167@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n167@???>: 550 NO
LOG: MAIN
- ** n168@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n168@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n168@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n168@???>: 550 NO
LOG: MAIN
- ** n169@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n169@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n169@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n169@???>: 550 NO
LOG: MAIN
- ** n170@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n170@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n170@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n170@???>: 550 NO
LOG: MAIN
- ** n171@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n171@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n171@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n171@???>: 550 NO
LOG: MAIN
- ** n172@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n172@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n172@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n172@???>: 550 NO
LOG: MAIN
- ** n173@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n173@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n173@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n173@???>: 550 NO
LOG: MAIN
- ** n174@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n174@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n174@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n174@???>: 550 NO
LOG: MAIN
- ** n175@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n175@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n175@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n175@???>: 550 NO
LOG: MAIN
- ** n176@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n176@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n176@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n176@???>: 550 NO
LOG: MAIN
- ** n177@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n177@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n177@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n177@???>: 550 NO
LOG: MAIN
- ** n178@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n178@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n178@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n178@???>: 550 NO
LOG: MAIN
- ** n179@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n179@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n179@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n179@???>: 550 NO
LOG: MAIN
- ** n180@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n180@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n180@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n180@???>: 550 NO
LOG: MAIN
- ** n181@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n181@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n181@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n181@???>: 550 NO
LOG: MAIN
- ** n182@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n182@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n182@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n182@???>: 550 NO
LOG: MAIN
- ** n183@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n183@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n183@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n183@???>: 550 NO
LOG: MAIN
- ** n184@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n184@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n184@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n184@???>: 550 NO
LOG: MAIN
- ** n185@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n185@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n185@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n185@???>: 550 NO
LOG: MAIN
- ** n186@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n186@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n186@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n186@???>: 550 NO
LOG: MAIN
- ** n187@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n187@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n187@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n187@???>: 550 NO
LOG: MAIN
- ** n188@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n188@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n188@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n188@???>: 550 NO
LOG: MAIN
- ** n189@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n189@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n189@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n189@???>: 550 NO
LOG: MAIN
- ** n190@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n190@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n190@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n190@???>: 550 NO
LOG: MAIN
- ** n191@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n191@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n191@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n191@???>: 550 NO
LOG: MAIN
- ** n192@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n192@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n192@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n192@???>: 550 NO
LOG: MAIN
- ** n193@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n193@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n193@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n193@???>: 550 NO
LOG: MAIN
- ** n194@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n194@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n194@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n194@???>: 550 NO
LOG: MAIN
- ** n195@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n195@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n195@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n195@???>: 550 NO
LOG: MAIN
- ** n196@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n196@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n196@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n196@???>: 550 NO
LOG: MAIN
- ** n197@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n197@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n197@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n197@???>: 550 NO
LOG: MAIN
- ** n198@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n198@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n198@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n198@???>: 550 NO
LOG: MAIN
- ** n199@??? R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n199@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** n199@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n199@???>: 550 NO
LOG: MAIN
<= <> R=10HmbL-0005vi-00 U=EXIMUSER P=local S=sss
delivering 10HmbM-0005vi-00
diff --git a/test/stderr/0218 b/test/stderr/0218
index bf01762..4c74ff2 100644
--- a/test/stderr/0218
+++ b/test/stderr/0218
@@ -86,7 +86,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 503 Unexpected DATA
SMTP>> QUIT
LOG: MAIN
- ** a@??? F=<CALLER@???> R=client T=send_to_server: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** a@??? F=<CALLER@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: 550 NO
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -101,7 +101,7 @@ R: client (ACL)
T: send_to_server (ACL)
Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
LOG: MAIN
- 127.0.0.1 [127.0.0.1] Connection refused
+ H=127.0.0.1 [127.0.0.1] Connection refused
LOG: MAIN
== b@??? R=client T=send_to_server defer (dd): Connection refused
LOG: queue_run MAIN
@@ -143,7 +143,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP>> RSET
SMTP<< 250 OK
LOG: MAIN
- ** b@??? F=<CALLER@???> R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 550 Unknown
+ ** b@??? F=<CALLER@???> 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@???>: 550 Unknown
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
diff --git a/test/stderr/0276 b/test/stderr/0276
index c721ff7..2b01713 100644
--- a/test/stderr/0276
+++ b/test/stderr/0276
@@ -15,13 +15,13 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 500 NO
SMTP>> QUIT
LOG: MAIN
- ** userx@??? R=r1 T=t1: SMTP error from remote mail server after pipelined DATA: host 127.0.0.1 [127.0.0.1]: 500 NO
+ ** userx@??? 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
<= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
delivering 10HmaY-0005vi-00
Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
LOG: MAIN
- 127.0.0.1 [127.0.0.1] Connection refused
+ H=127.0.0.1 [127.0.0.1] Connection refused
LOG: MAIN
== CALLER@??? R=r1 T=t1 defer (dd): Connection refused
LOG: MAIN
@@ -48,13 +48,13 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 500 NO
SMTP>> QUIT
LOG: MAIN
- ** userx@??? R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 500 NO
+ ** userx@??? 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
<= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss
delivering 10HmbA-0005vi-00
Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
LOG: MAIN
- 127.0.0.1 [127.0.0.1] Connection refused
+ H=127.0.0.1 [127.0.0.1] Connection refused
LOG: MAIN
== CALLER@??? R=r1 T=t1 defer (dd): Connection refused
LOG: MAIN
diff --git a/test/stderr/0357 b/test/stderr/0357
index 4b7798c..6073e8c 100644
--- a/test/stderr/0357
+++ b/test/stderr/0357
@@ -28,7 +28,7 @@ added retry item for R:userx@???:<CALLER@???>: errno=-44 more_errno=dd,A
reading retry information for R:userx@???:<CALLER@???> from subprocess
added retry item
LOG: MAIN
- == userx@??? R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+ == userx@??? R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
Processing retry items
Succeeded addresses:
Failed addresses:
@@ -39,7 +39,7 @@ retry for R:userx@???:<CALLER@???> = * 0 0
failing_interval=ttt message_age=ttt
Writing retry data for R:userx@???:<CALLER@???>
first failed=dddd last try=dddd next try=+1 expired=0
- errno=-44 more_errno=dd,A SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+ errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
end of retry processing
>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>

@@ -79,7 +79,7 @@ reading retry information for R:userx@??? from subprocess
reading retry information for R:userx@???:<CALLER@???> from subprocess
delete item not added: non-delete item exists
LOG: MAIN
- == userx@??? R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+ == userx@??? R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
Processing retry items
Succeeded addresses:
Failed addresses:
@@ -92,7 +92,7 @@ retry for R:userx@???:<CALLER@???> = * 0 0
failing_interval=ttt message_age=ttt
Writing retry data for R:userx@???:<CALLER@???>
first failed=dddd last try=dddd next try=+1 expired=0
- errno=-44 more_errno=dd,A SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+ errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
end of retry processing
LOG: queue_run MAIN
End queue run: pid=pppp
@@ -133,7 +133,7 @@ reading retry information for R:userx@??? from subprocess
reading retry information for R:userx@???:<CALLER@???> from subprocess
delete item not added: non-delete item exists
LOG: MAIN
- == userx@??? R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+ == userx@??? R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
Processing retry items
Succeeded addresses:
Failed addresses:
@@ -146,7 +146,7 @@ retry for R:userx@???:<CALLER@???> = * 0 0
failing_interval=ttt message_age=ttt
Writing retry data for R:userx@???:<CALLER@???>
first failed=dddd last try=dddd next try=+2 expired=0
- errno=-44 more_errno=dd,A SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+ errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
end of retry processing
LOG: queue_run MAIN
End queue run: pid=pppp
diff --git a/test/stderr/0358 b/test/stderr/0358
index b2d9a13..7eec3d4 100644
--- a/test/stderr/0358
+++ b/test/stderr/0358
@@ -36,9 +36,9 @@ reading retry information for R:userx@???:<CALLER@???> from subprocess
reading retry information for R:usery@???:<CALLER@???> from subprocess
added retry item
LOG: MAIN
- == userx@??? R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+ == userx@??? R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
LOG: MAIN
- == usery@??? R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<usery@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+ == usery@??? R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@???>: 451 Temporary error
Processing retry items
Succeeded addresses:
Failed addresses:
@@ -49,13 +49,13 @@ retry for R:usery@???:<CALLER@???> = * 0 0
failing_interval=ttt message_age=ttt
Writing retry data for R:usery@???:<CALLER@???>
first failed=dddd last try=dddd next try=+1 expired=0
- errno=-44 more_errno=dd,A SMTP error from remote mail server after RCPT TO:<usery@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+ errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@???>: 451 Temporary error
userx@???
retry for R:userx@???:<CALLER@???> = * 0 0
failing_interval=ttt message_age=ttt
Writing retry data for R:userx@???:<CALLER@???>
first failed=dddd last try=dddd next try=+1 expired=0
- errno=-44 more_errno=dd,A SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+ errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
end of retry processing
>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>

@@ -114,9 +114,9 @@ reading retry information for R:usery@??? from subprocess
reading retry information for R:usery@???:<CALLER@???> from subprocess
delete item not added: non-delete item exists
LOG: MAIN
- == userx@??? R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+ == userx@??? R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
LOG: MAIN
- == usery@??? R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<usery@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+ == usery@??? R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@???>: 451 Temporary error
Processing retry items
Succeeded addresses:
Failed addresses:
@@ -129,7 +129,7 @@ retry for R:usery@???:<CALLER@???> = * 0 0
failing_interval=ttt message_age=ttt
Writing retry data for R:usery@???:<CALLER@???>
first failed=dddd last try=dddd next try=+2 expired=0
- errno=-44 more_errno=dd,A SMTP error from remote mail server after RCPT TO:<usery@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+ errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@???>: 451 Temporary error
userx@???
deleted retry information for R:userx@???
deleted retry information for R:test.ex
@@ -137,7 +137,7 @@ retry for R:userx@???:<CALLER@???> = * 0 0
failing_interval=ttt message_age=ttt
Writing retry data for R:userx@???:<CALLER@???>
first failed=dddd last try=dddd next try=+2 expired=0
- errno=-44 more_errno=dd,A SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+ errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
end of retry processing
LOG: queue_run MAIN
End queue run: pid=pppp
diff --git a/test/stderr/0374 b/test/stderr/0374
index cf11041..05bc246 100644
--- a/test/stderr/0374
+++ b/test/stderr/0374
@@ -370,11 +370,11 @@ LOG: MAIN
=> d1@??? R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1] C="250 OK"
locking TESTSUITE/spool/db/retry.lockfile
LOG: MAIN
- == d2@??? R=ut4 T=ut4 defer (-44): SMTP error from remote mail server after RCPT TO:<d2@???>: host 127.0.0.1 [127.0.0.1]: 450 soft error
+ == d2@??? 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@???>: 450 soft error
locking TESTSUITE/spool/db/retry.lockfile
locking TESTSUITE/spool/db/wait-ut4.lockfile
LOG: MAIN
- ** d3@??? R=ut4 T=ut4: SMTP error from remote mail server after RCPT TO:<d3@???>: host 127.0.0.1 [127.0.0.1]: 550 hard error
+ ** d3@??? R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d3@???>: 550 hard error
locking TESTSUITE/spool/db/retry.lockfile
Exim version x.yz ....
configuration file is TESTSUITE/test-config
diff --git a/test/stderr/0375 b/test/stderr/0375
index 37ed2d8..6135f0f 100644
--- a/test/stderr/0375
+++ b/test/stderr/0375
@@ -806,17 +806,17 @@ LOG: MAIN
log writing disabled
locking TESTSUITE/spool/db/retry.lockfile
LOG: MAIN
- == d2@??? R=ut4 T=ut4 defer (-44): SMTP error from remote mail server after RCPT TO:<d2@???>: host 127.0.0.1 [127.0.0.1]: 450 soft error
+ == d2@??? 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@???>: 450 soft error
log writing disabled
locking TESTSUITE/spool/db/retry.lockfile
locking TESTSUITE/spool/db/wait-ut4.lockfile
LOG: MAIN
- ** d3@??? P=<> R=ut4 T=ut4: SMTP error from remote mail server after RCPT TO:<d3@???>: host 127.0.0.1 [127.0.0.1]: 550 hard error
+ ** d3@??? P=<> R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d3@???>: 550 hard error
log writing disabled
locking TESTSUITE/spool/db/retry.lockfile
locking TESTSUITE/spool/db/wait-ut5.lockfile
LOG: MAIN
- ** e1@??? P=<> R=ut5 T=ut5: SMTP error from remote mail server after RCPT TO:<e1@???>: host 127.0.0.1 [127.0.0.1]: 550 hard error
+ ** e1@??? P=<> R=ut5 T=ut5 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<e1@???>: 550 hard error
log writing disabled
locking TESTSUITE/spool/db/retry.lockfile
locking TESTSUITE/spool/db/wait-ut6.lockfile
@@ -825,12 +825,12 @@ LOG: MAIN
log writing disabled
locking TESTSUITE/spool/db/retry.lockfile
LOG: MAIN
- == f2@??? R=ut6 T=ut6 defer (-44): SMTP error from remote mail server after RCPT TO:<f2@???>: host 127.0.0.1 [127.0.0.1]: 450 soft error
+ == f2@??? 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@???>: 450 soft error
log writing disabled
locking TESTSUITE/spool/db/retry.lockfile
locking TESTSUITE/spool/db/wait-ut6.lockfile
LOG: MAIN
- ** f3@??? P=<CALLER@???> R=ut6 T=ut6: SMTP error from remote mail server after RCPT TO:<f3@???>: host 127.0.0.1 [127.0.0.1]: 550 hard error
+ ** f3@??? P=<CALLER@???> R=ut6 T=ut6 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<f3@???>: 550 hard error
log writing disabled
locking TESTSUITE/spool/db/retry.lockfile
LOG: MAIN
diff --git a/test/stderr/0388 b/test/stderr/0388
index 98df1fd..a7a2664 100644
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -91,7 +91,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP>> RCPT TO:<x@y>
SMTP<< 451 Temporary error
LOG: MAIN
- SMTP error from remote mail server after RCPT TO:<x@y>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+ H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@y>: 451 Temporary error
added retry item for R:x@y: errno=-44 more_errno=dd,A flags=0
SMTP>> QUIT
set_process_info: pppp delivering 10HmaX-0005vi-00: just tried 127.0.0.1 [127.0.0.1] for x@y: result OK
@@ -108,7 +108,7 @@ V4NET.0.0.0 in serialize_hosts? no (option unset)
set_process_info: pppp delivering 10HmaX-0005vi-00 to V4NET.0.0.0 [V4NET.0.0.0] (x@y)
Connecting to V4NET.0.0.0 [V4NET.0.0.0]:1224 ... failed: Network Error
LOG: MAIN
- V4NET.0.0.0 [V4NET.0.0.0] Network Error
+ H=V4NET.0.0.0 [V4NET.0.0.0] Network Error
set_process_info: pppp delivering 10HmaX-0005vi-00: just tried V4NET.0.0.0 [V4NET.0.0.0] for x@y: result DEFER
added retry item for T:V4NET.0.0.0:V4NET.0.0.0:1224: errno=dd more_errno=dd,A flags=2
set_process_info: pppp delivering 10HmaX-0005vi-00 (just run smtp for x@y in subprocess)
@@ -120,7 +120,7 @@ reading retry information for T:V4NET.0.0.0:V4NET.0.0.0:1224 from subprocess
reading retry information for R:x@y from subprocess
added retry item
LOG: MAIN
- == x@y R=r1 T=smtp defer (dd): Network Error
+ == x@y R=r1 T=smtp defer (dd): Network Error H=127.0.0.1 [127.0.0.1]
changed uid/gid: post-delivery tidying
uid=EXIM_UID gid=EXIM_GID pid=pppp
set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00
@@ -142,7 +142,7 @@ dbfn_read: key=R:x@y
failing_interval=ttt message_age=ttt
Writing retry data for R:x@y
first failed=dddd last try=dddd next try=+1 expired=1
- errno=-44 more_errno=dd,A SMTP error from remote mail server after RCPT TO:<x@y>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+ errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@y>: 451 Temporary error
dbfn_write: key=R:x@y
address match test: subject=*@V4NET.0.0.0 pattern=*
V4NET.0.0.0 in "*"? yes (matched "*")
diff --git a/test/stderr/0426 b/test/stderr/0426
index ef478aa..2be2c7d 100644
--- a/test/stderr/0426
+++ b/test/stderr/0426
@@ -48,7 +48,7 @@ After routing:
locking TESTSUITE/spool/db/retry.lockfile
locking TESTSUITE/spool/db/wait-t1.lockfile
LOG: MAIN
- ** x@??? R=r1 T=t1: SMTP error from remote mail server after RCPT TO:<x@???>: host uppercase.test.ex [127.0.0.1]: 550 Unknown
+ ** x@??? R=r1 T=t1 H=uppercase.test.ex [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@???>: 550 Unknown
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
diff --git a/test/stderr/0450 b/test/stderr/0450
index aeadb6f..24e66a1 100644
--- a/test/stderr/0450
+++ b/test/stderr/0450
@@ -19,7 +19,7 @@ checking status of 127.0.0.1
delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@???)
Connecting to 127.0.0.1 [127.0.0.1]:1225 ... failed: Connection refused
LOG: MAIN
- 127.0.0.1 [127.0.0.1] Connection refused
+ H=127.0.0.1 [127.0.0.1] Connection refused
added retry item for T:127.0.0.1:127.0.0.1:1225: errno=dd more_errno=dd,A flags=2
all IP addresses skipped or deferred at least one address
updating wait-t1 database
@@ -47,7 +47,7 @@ no message retry record
delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@???)
Connecting to 127.0.0.1 [127.0.0.1]:1226 ... failed: Connection refused
LOG: MAIN
- 127.0.0.1 [127.0.0.1] Connection refused
+ H=127.0.0.1 [127.0.0.1] Connection refused
added retry item for T:127.0.0.1:127.0.0.1:1226: errno=dd more_errno=dd,A flags=2
all IP addresses skipped or deferred at least one address
updating wait-t1 database
diff --git a/test/stderr/0476 b/test/stderr/0476
index b6e954e..f0dc336 100644
--- a/test/stderr/0476
+++ b/test/stderr/0476
@@ -28,20 +28,20 @@ using PIPELINING
SMTP>> DATA
SMTP<< 250 OK
SMTP<< 550 NO
-Remote host 127.0.0.1 [127.0.0.1] closed connection in response to pipelined DATA
+Remote host closed connection in response to pipelined DATA
error for DATA ignored: pipelining is in use and there were no good recipients
ok=1 send_quit=1 send_rset=1 continue_more=0 yield=0 first_address is NULL
transport_check_waiting entered
sequence=1 local_max=500 global_max=-1
SMTP>> RSET
-Remote host 127.0.0.1 [127.0.0.1] closed connection in response to RSET
+H=127.0.0.1 [127.0.0.1] Remote host closed connection in response to RSET
set_process_info: pppp delivering 10HmaX-0005vi-00: just tried 127.0.0.1 [127.0.0.1] for userx@???: result OK
Leaving t1 transport
set_process_info: pppp delivering 10HmaX-0005vi-00 (just run t1 for userx@??? in subprocess)
set_process_info: pppp delivering 10HmaX-0005vi-00: waiting for a remote delivery subprocess to finish
set_process_info: pppp delivering 10HmaX-0005vi-00
LOG: MAIN
- ** userx@??? R=r1 T=t1: SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
+ ** userx@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 550 NO
set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00
writing data block fd=dddd size=sss timeout=0
Exim version x.yz ....
@@ -68,7 +68,7 @@ delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (CALLER@???
set_process_info: pppp delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (CALLER@???)
Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
LOG: MAIN
- 127.0.0.1 [127.0.0.1] Connection refused
+ H=127.0.0.1 [127.0.0.1] Connection refused
set_process_info: pppp delivering 10HmaZ-0005vi-00: just tried 127.0.0.1 [127.0.0.1] for CALLER@???: result DEFER
added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2
all IP addresses skipped or deferred at least one address
diff --git a/test/stderr/0495 b/test/stderr/0495
index d9d8a9a..b00cfd5 100644
--- a/test/stderr/0495
+++ b/test/stderr/0495
@@ -1,7 +1,7 @@
Delivery failed: Connection refused
-Delivery failed: SMTP error from remote mail server after RCPT TO:<b@???>: host 127.0.0.1 [127.0.0.1]: 550 NOTOK
-Delivery failed: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: host 127.0.0.1 [127.0.0.1]: 550 BAD MAIL
-Delivery failed: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: host 127.0.0.1 [127.0.0.1]: 450 TEMPORARY MAIL FAIL
+Delivery failed: H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<b@???>: 550 NOTOK
+Delivery failed: H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: 550 BAD MAIL
+Delivery failed: H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: 450 TEMPORARY MAIL FAIL
routing file@??? yielded a local delivery
routing fail@??? yielded a failed delivery: forcible fail message
routing defer@??? yielded a deferred delivery: forcible defer message
@@ -9,6 +9,6 @@ delivery to smarthost failed (configuration problem)
delivery to smarthost failed (configuration problem)
Daemon cannot be run when mua_wrapper is set
Delivery failed: Connection refused
-Delivery failed: Connection timed out: SMTP timeout while connected to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] after RCPT TO:<b@???>
+Delivery failed: Connection timed out: H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP timeout after RCPT TO:<b@???>
Delivery failed: TCP port "nonexistent" is not defined for t4 transport
-Delivery failed: SMTP error from remote mail server after RCPT TO:<a@???>: host 127.0.0.1 [127.0.0.1]: 550 SORRY
+Delivery failed: H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<a@???>: 550 SORRY
diff --git a/test/stderr/0512 b/test/stderr/0512
index c1da4dc..e107ff3 100644
--- a/test/stderr/0512
+++ b/test/stderr/0512
@@ -16,7 +16,7 @@ delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@???)
hosts_max_try limit reached with this host
Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
LOG: MAIN
- 127.0.0.1 [127.0.0.1] Connection refused
+ H=127.0.0.1 [127.0.0.1] Connection refused
added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2
temporary delivery error(s) override hosts_max_try (message older than host's retry time)
getting address for 127.0.0.1
@@ -27,7 +27,7 @@ delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@???)
hosts_max_try limit reached with this host
Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
LOG: MAIN
- 127.0.0.1 [127.0.0.1] Connection refused
+ H=127.0.0.1 [127.0.0.1] Connection refused
added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2
temporary delivery error(s) override hosts_max_try (message older than host's retry time)
getting address for 127.0.0.1
@@ -38,7 +38,7 @@ delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@???)
hosts_max_try limit reached with this host
Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
LOG: MAIN
- 127.0.0.1 [127.0.0.1] Connection refused
+ H=127.0.0.1 [127.0.0.1] Connection refused
added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2
temporary delivery error(s) override hosts_max_try (message older than host's retry time)
getting address for 127.0.0.1
@@ -49,7 +49,7 @@ delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@???)
hosts_max_try limit reached with this host
Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
LOG: MAIN
- 127.0.0.1 [127.0.0.1] Connection refused
+ H=127.0.0.1 [127.0.0.1] Connection refused
added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2
all IP addresses skipped or deferred at least one address
updating wait-t1 database
@@ -99,7 +99,7 @@ delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@???)
hosts_max_try limit reached with this host
Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
LOG: MAIN
- 127.0.0.1 [127.0.0.1] Connection refused
+ H=127.0.0.1 [127.0.0.1] Connection refused
added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2
temporary delivery error(s) override hosts_max_try (message older than host's retry time)
getting address for 127.0.0.1
@@ -110,7 +110,7 @@ delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@???)
hosts_max_try limit reached with this host
Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
LOG: MAIN
- 127.0.0.1 [127.0.0.1] Connection refused
+ H=127.0.0.1 [127.0.0.1] Connection refused
added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2
temporary delivery error(s) override hosts_max_try (message older than host's retry time)
all IP addresses skipped or deferred at least one address
diff --git a/test/stderr/0525 b/test/stderr/0525
index 3eecf9a..553f8c1 100644
--- a/test/stderr/0525
+++ b/test/stderr/0525
@@ -15,8 +15,8 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 354 SEND
SMTP>> writing message and terminating "."
LOG: MAIN
- SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after sending data block (ddd bytes written): Connection timed out
+ H=127.0.0.1 [127.0.0.1]: SMTP timeout after sending data block (ddd bytes written): Connection timed out
LOG: MAIN
- == def@pqr R=r1 T=t1 defer (dd): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after sending data block (ddd bytes written)
+ == def@pqr R=r1 T=t1 defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after sending data block (ddd bytes written)
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
diff --git a/test/stderr/0554 b/test/stderr/0554
index 17e8f4d..5cabbf9 100644
--- a/test/stderr/0554
+++ b/test/stderr/0554
@@ -21,7 +21,7 @@ added retry item for R:x@y:<CALLER@???>: errno=-44 more_errno=dd,A fl
reading retry information for R:x@y:<CALLER@???> from subprocess
added retry item
LOG: MAIN
- == x@y R=r1 T=smtp defer (-44): SMTP error from remote mail server after RCPT TO:<x@y>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+ == x@y R=r1 T=smtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@y>: 451 Temporary error
Processing retry items
Succeeded addresses:
Failed addresses:
@@ -32,7 +32,7 @@ retry for R:x@y:<CALLER@???> = * 0 0
failing_interval=ttt message_age=ttt
Writing retry data for R:x@y:<CALLER@???>
first failed=dddd last try=dddd next try=+1 expired=0
- errno=-44 more_errno=dd,A SMTP error from remote mail server after RCPT TO:<x@y>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+ errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@y>: 451 Temporary error
end of retry processing
>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>

Exim version x.yz ....
diff --git a/test/stdout/0213 b/test/stdout/0213
index 2d5a760..d3dd7cf 100644
--- a/test/stdout/0213
+++ b/test/stdout/0213
@@ -1,5 +1,5 @@
+++++++++++++++++++++++++++
- T:127.0.0.1:127.0.0.1:1224 -19 65 Malformed SMTP reply from 127.0.0.1 [127.0.0.1] in response to RCPT TO:<userx@domain1>: 550 The answer is no, but I am going to make sure it is a very
+ T:127.0.0.1:127.0.0.1:1224 -19 65 H=127.0.0.1 [127.0.0.1]: Malformed SMTP reply in response to RCPT TO:<userx@domain1>: 550 The answer is no, but I am going to make sure it is a very l
first failed = time last try = time2 next try = time2 + 3600

******** SERVER ********
diff --git a/test/stdout/0357 b/test/stdout/0357
index f7864bf..648513e 100644
--- a/test/stdout/0357
+++ b/test/stdout/0357
@@ -1,11 +1,11 @@
+++++++++++++++++++++++++++
- R:userx@???:<CALLER@???> -44 13121 SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+ R:userx@???:<CALLER@???> -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
first failed = time last try = time2 next try = time2 + 1
+++++++++++++++++++++++++++
- R:userx@???:<CALLER@???> -44 13121 SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+ R:userx@???:<CALLER@???> -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
first failed = time last try = time2 next try = time2 + 1
+++++++++++++++++++++++++++
- R:userx@???:<CALLER@???> -44 13121 SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+ R:userx@???:<CALLER@???> -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
first failed = time last try = time2 next try = time2 + 2

******** SERVER ********
diff --git a/test/stdout/0358 b/test/stdout/0358
index ab77a78..80553ee 100644
--- a/test/stdout/0358
+++ b/test/stdout/0358
@@ -1,12 +1,12 @@
+++++++++++++++++++++++++++
- R:userx@???:<CALLER@???> -44 13121 SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+ R:userx@???:<CALLER@???> -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
first failed = time last try = time2 next try = time2 + 1
- R:usery@???:<CALLER@???> -44 13121 SMTP error from remote mail server after RCPT TO:<usery@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+ R:usery@???:<CALLER@???> -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@???>: 451 Temporary error
first failed = time last try = time2 next try = time2 + 1
+++++++++++++++++++++++++++
- R:userx@???:<CALLER@???> -44 13121 SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+ R:userx@???:<CALLER@???> -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
first failed = time last try = time2 next try = time2 + 2
- R:usery@???:<CALLER@???> -44 13121 SMTP error from remote mail server after RCPT TO:<usery@???>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+ R:usery@???:<CALLER@???> -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@???>: 451 Temporary error
first failed = time last try = time2 next try = time2 + 2

******** SERVER ********
diff --git a/test/stdout/0474 b/test/stdout/0474
index ee42c1e..f00a7d8 100644
--- a/test/stdout/0474
+++ b/test/stdout/0474
@@ -1,11 +1,11 @@
+++++++++++++++++++++++++++
- T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 0 65 SMTP error from remote mail server after end of data: host 127.0.0.1 [127.0.0.1]: 850 NONSENSE
+ T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 0 65 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 850 NONSENSE
first failed = time last try = time2 next try = time2 + 10
+++++++++++++++++++++++++++
- T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 0 65 SMTP error from remote mail server after MAIL FROM:<CALLER@???>: host 127.0.0.1 [127.0.0.1]: 850 RUBBISH
+ T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 0 65 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: 850 RUBBISH
first failed = time last try = time2 next try = time2 + 10
+++++++++++++++++++++++++++
- R:abcd@xyz:<CALLER@???> -44 12865 SMTP error from remote mail server after RCPT TO:<abcd@xyz>: host 127.0.0.1 [127.0.0.1]: 850 RUBBISH
+ R:abcd@xyz:<CALLER@???> -44 12865 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<abcd@xyz>: 850 RUBBISH
first failed = time last try = time2 next try = time2 + 10

******** SERVER ********
diff --git a/test/stdout/0497 b/test/stdout/0497
index 3462fd1..e179e58 100644
--- a/test/stdout/0497
+++ b/test/stdout/0497
@@ -1,8 +1,8 @@
+++++++++++++++++++++++++++
- T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 -45 13377 SMTP error from remote mail server after MAIL FROM:<CALLER@???>: host 127.0.0.1 [127.0.0.1]: 452 temporary error
+ T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 -45 13377 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: 452 temporary error
first failed = time last try = time2 next try = time2 + 0 *
+++++++++++++++++++++++++++
- R:userx@???:<CALLER@???> -44 13377 SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 452 temporary error
+ R:userx@???:<CALLER@???> -44 13377 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 452 temporary error
first failed = time last try = time2 next try = time2 + 0 *

******** SERVER ********
diff --git a/test/stdout/0498 b/test/stdout/0498
index f1448ba..61a27be 100644
--- a/test/stdout/0498
+++ b/test/stdout/0498
@@ -1,5 +1,5 @@
+++++++++++++++++++++++++++
- T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 -45 12865 SMTP error from remote mail server after MAIL FROM:<CALLER@???>: host 127.0.0.1 [127.0.0.1]: 450 DELAY
+ T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 -45 12865 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: 450 DELAY
first failed = time last try = time2 next try = time2 + 10

******** SERVER ********
diff --git a/test/stdout/0548 b/test/stdout/0548
index b12491f..7f7d788 100644
--- a/test/stdout/0548
+++ b/test/stdout/0548
@@ -1,15 +1,15 @@
+++++++++++++++++++++++++++
- R:userx@???:<CALLER@???> -44 13121 SMTP error from remote mail server after RCPT TO:<userx@???>: host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]: 451 Recipient deferred
+ R:userx@???:<CALLER@???> -44 13121 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Recipient deferred
first failed = time last try = time2 next try = time2 + 1
- T:thishost.test.ex:127.0.0.1:1225 0 65 SMTP error from remote mail server after initial connection: host thishost.test.ex [127.0.0.1]: 451 host deferred
+ T:thishost.test.ex:127.0.0.1:1225 0 65 H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred
first failed = time last try = time2 next try = time2 + 1
+++++++++++++++++++++++++++
- R:userx@???:<CALLER@???> -44 13121 SMTP error from remote mail server after RCPT TO:<userx@???>: host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]: 451 Recipient deferred
+ R:userx@???:<CALLER@???> -44 13121 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Recipient deferred
first failed = time last try = time2 next try = time2 + 5 *
- T:thishost.test.ex:127.0.0.1:1225 0 65 SMTP error from remote mail server after initial connection: host thishost.test.ex [127.0.0.1]: 451 host deferred
+ T:thishost.test.ex:127.0.0.1:1225 0 65 H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred
first failed = time last try = time2 next try = time2 + 1
+++++++++++++++++++++++++++
- R:userx@???:<CALLER@???> -44 13121 SMTP error from remote mail server after RCPT TO:<userx@???>: host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]: 451 Recipient deferred
+ R:userx@???:<CALLER@???> -44 13121 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Recipient deferred
first failed = time last try = time2 next try = time2 + 5 *
- T:thishost.test.ex:127.0.0.1:1225 0 65 SMTP error from remote mail server after initial connection: host thishost.test.ex [127.0.0.1]: 451 host deferred
+ T:thishost.test.ex:127.0.0.1:1225 0 65 H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred
first failed = time last try = time2 next try = time2 + 1
diff --git a/test/stdout/0554 b/test/stdout/0554
index 8c0cfea..2f38af2 100644
--- a/test/stdout/0554
+++ b/test/stdout/0554
@@ -1,5 +1,5 @@
+++++++++++++++++++++++++++
- R:x@y:<CALLER@???> -44 13121 SMTP error from remote mail server after RCPT TO:<x@y>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+ R:x@y:<CALLER@???> -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@y>: 451 Temporary error
first failed = time last try = time2 next try = time2 + 1
+++++++++++++++++++++++++++