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

Note this may affect utilities which parse logs.

diff --git a/src/src/deliver.c b/src/src/deliver.c
index c6339c62fc2b9430184adbde67372a26aa6fe1af..6fac6d8db54082cb8a19f5d93e891999f7d8b78e 100644 (file)
--- 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 480933542de4c43672182d831babba363f7419f4..55ffd5c6fe1fdd51d47e70756dc0919ee5007853 100644 (file)
--- 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 14cdd12d439724b3cddf426c6a1015bec290cb4f..593319393f1690afb3a736a5fdc2996291eed9d7 100644 (file)
--- 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 cb2e94f94159f7627e97034f1f05569f7b2640f6..43ea8a0d2ec31a42b550b538ea8d574fa461a6af 100644 (file)
--- 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 9986e80f4b9603cd1d06ba1489596b2dfd244157..6d34922952ae6f0575c33f0f00b11e450506e231 100644 (file)
--- 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 29d7b13286d51c2c2971cdcfd3b641441d28b655..db35aa5751c904b26edc120b688953b2a0ceb746 100644 (file)
--- 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 6cf0aa39c5575327b45cb317e938a3e7dc862608..6de357a8a75117aea24527e8b6400deef769f307 100644 (file)
--- 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@test.ex 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@some.domain 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@test.ex 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@another.test.ex R=alias defer (-1): This address has been forced to defer.
 1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@test.ex 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@some.domain 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@test.ex 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@connection.refused 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@test.ex routing defer (-51): retry time not reached
@@ -51,7 +51,7 @@
 1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@test.ex routing defer (-51): retry time not reached
 1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@another.test.ex routing defer (-51): retry time not reached
 1999-03-02 09:44:33 10HmbB-0005vi-00 == xxxx@some.domain 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@connection.refused 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@test.ex> 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@some.domain 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@test.ex> 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@connection.refused 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@test.ex> R=localuser T=local_delivery

diff --git a/test/log/0099 b/test/log/0099
index 2d221a956a43e3817342f3e0d0cebbfb839c3242..beb27f7eeab6c89a65571af822bdd78d20441e84 100644 (file)
--- a/test/log/0099
+++ b/test/log/0099
@@ -1,10 +1,10 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex 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@far.away.ex 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@far.away.ex 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@far.away.ex 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 c48586597c2b19fa094dc850205b3d9397b9be02..80fe546cf0e12bc0c5f217b2d263ec554b35ec16 100644 (file)
--- a/test/log/0106
+++ b/test/log/0106
@@ -1,5 +1,5 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex 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@domain1.com 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@domain1.com 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@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 == userx@domain2.com 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@myhost.test.ex>
+1999-03-02 09:44:33 10HmaY-0005vi-00 == userx@domain2.com R=all T=smtp defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after MAIL FROM:<CALLER@myhost.test.ex>

diff --git a/test/log/0109 b/test/log/0109
index 3f7ec953aa6b6d5c56c41cf7f7721a4fa9f94dec..6ba3686b3ea52c35a6003726945c95f6b6b03026 100644 (file)
--- a/test/log/0109
+++ b/test/log/0109
@@ -1,4 +1,4 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex 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@non-exist.test.ex R=remote T=smtp defer (dd): Connection refused

diff --git a/test/log/0135 b/test/log/0135
index a2b7fcc2f118d984afaa57141ffbc278a73e6654..35bc9e63abc649d90874a170f71e136dea60ca0a 100644 (file)
--- 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@test.ex 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@test.ex 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@unknown.ex 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@known.ex R=default T=smtp defer (dd): Network Error
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** b@known.ex: retry timeout exceeded
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** c@test.ex: 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@test.ex 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@unknown.ex R=default T=smtp defer (dd): Network Error
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** a@unknown.ex: retry timeout exceeded
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** d@test.ex: 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@known.ex R=default T=smtp defer (dd): Network Error
 1999-03-02 09:44:33 10HmbA-0005vi-00 ** b@known.ex: retry timeout exceeded
 1999-03-02 09:44:33 10HmbA-0005vi-00 b@known.ex: error ignored

diff --git a/test/log/0160 b/test/log/0160
index 8cf2b14aeb80ffd201e50acbf5fb4f5f4ce75b81..bb3c00f9ac240eff9f168ec7da2626e3ccf235e1 100644 (file)
--- a/test/log/0160
+++ b/test/log/0160
@@ -1,9 +1,9 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex 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@domain.com R=all T=smtp defer (-44): SMTP error from remote mail server after RCPT TO:<userx@domain.com>: host 127.0.0.1 [127.0.0.1]: 452 Temporary error
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain.com 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@domain.com>: 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@domain.com R=all T=smtp defer (-44): SMTP error from remote mail server after RCPT TO:<userx@domain.com>: host 127.0.0.1 [127.0.0.1]: 452 Temporary error
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain.com 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@domain.com>: 452 Temporary error
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@domain.com: 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 5ce001774f221ae452afc8e247cab6a6385b7031..f4002bf7c1a35db56d470149c864c65611725ee0 100644 (file)
--- a/test/log/0163
+++ b/test/log/0163
@@ -1,6 +1,6 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex 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@domain.com 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@domain.com 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@domain.com 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 59d29fd64ab70cbf95b85f81b885302301fb4518..9e063c49e41755a59890143405e7b917e4c34996 100644 (file)
--- a/test/log/0197
+++ b/test/log/0197
@@ -1,7 +1,7 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@copy.domain R=checkcopy T=makecopy
 1999-03-02 09:44:33 10HmaX-0005vi-00 -> usery@copy.domain 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@copy.domain R=passall T=pass_on defer (dd): Network Error
 1999-03-02 09:44:33 10HmaX-0005vi-00 == usery@copy.domain 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@copy.domain 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@copy.domain R=passall T=pass_on defer (dd): Network Error
 1999-03-02 09:44:33 10HmaX-0005vi-00 == usery@copy.domain 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@copy.domain R=passall T=pass_on defer (dd): Network Error
 1999-03-02 09:44:33 10HmaY-0005vi-00 == y@copy.domain 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 facb8ff71ca831c02be52edf3492967a4593b9a5..f587cb8a21343ad0a38c300599307f25a6fc9c44 100644 (file)
--- a/test/log/0198
+++ b/test/log/0198
@@ -1,6 +1,6 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-bsmtp S=sss id=E10HmaY-0005vi-00@the.local.host.name
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** usery@copy.domain: 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@copy.domain 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@the.local.host.name 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 ea96c1e950f82405056077a964f3abbf39ddd054..78b3565818c6e0cdb9ba50980fd5e85e486ad6f1 100644 (file)
--- a/test/log/0201
+++ b/test/log/0201
@@ -1,2 +1,2 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@myhost.test.ex R=r1 T=t1 defer (-24): transport filter process failed (99)
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@myhost.test.ex 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 8c11047c48d353f8126efb8bda8c8c0ae9afe7bc..2df80335c157a619fd2ea89557bb3eb9649966eb 100644 (file)
--- 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@test.ex>: 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@test.ex>: 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@test.ex: 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 ed7ce39bb64eff331c2abfbc00ecb89496965919..2326a486c276139d58dc22c7a2257b3bbc21f25a 100644 (file)
--- a/test/log/0208
+++ b/test/log/0208
@@ -3,7 +3,7 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** fail.direct@test.ex: Unrouteable address
 1999-03-02 09:44:33 10HmaX-0005vi-00 == defer@test.ex R=defer defer (-1): don't do this yet
 1999-03-02 09:44:33 10HmaX-0005vi-00 => ok <ok@test.ex> R=ok T=succeed
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** fail.transport@test.ex R=fail_transport T=fail: SMTP error from remote mail server after RCPT TO:<fail.transport@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 Recipient refused
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** fail.transport@test.ex 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@test.ex>: 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@test.ex: Unrouteable address
 1999-03-02 09:44:33 10HmaY-0005vi-00 CALLER@test.ex: error ignored
@@ -13,7 +13,7 @@
 1999-03-02 09:44:33 10HmaZ-0005vi-00 ** fail.direct@test.ex: Unrouteable address
 1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@test.ex R=defer defer (-1): don't do this yet
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => ok <ok@test.ex> R=ok T=succeed
-1999-03-02 09:44:33 10HmaZ-0005vi-00 ** fail.transport@test.ex R=fail_transport T=fail: SMTP error from remote mail server after RCPT TO:<fail.transport@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 Recipient refused
+1999-03-02 09:44:33 10HmaZ-0005vi-00 ** fail.transport@test.ex 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@test.ex>: 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@test.ex: Unrouteable address
 1999-03-02 09:44:33 10HmbA-0005vi-00 CALLER@test.ex: error ignored

diff --git a/test/log/0209 b/test/log/0209
index 7d3c22cc533b3604613ac6e818388b2cf4e6c35a..aae3d4986d29e1edd6a73b87e524bfa156fd3ccf 100644 (file)
--- a/test/log/0209
+++ b/test/log/0209
@@ -3,7 +3,7 @@
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex 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 d993b6222a3cf757e8547f0dc939cbbd0953b1f4..07deb3b123379ddd9396ba42cd5e9808af54c829 100644 (file)
--- a/test/log/0211
+++ b/test/log/0211
@@ -1,20 +1,20 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex 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@test.ex> 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@test.ex> 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@test.ex> 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@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaZ-0005vi-00 ** userx@domain1 F=<CALLER@test.ex> 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@test.ex> 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@test.ex> 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@test.ex> 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@test.ex> 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 615aa918c29334b45b39ce630fa8a48c56854102..7ffcf4b6dc6af11ba93bac624ed6f43fad3a100d 100644 (file)
--- a/test/log/0213
+++ b/test/log/0213
@@ -1,3 +1,3 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex 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 317478108b1b1d862abbfcc3f54dbf64ec7df2c7..307ae60024f99e69918d3f6a24092280b367d26e 100644 (file)
--- 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@myhost.test.ex U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@myhost.test.ex F=<CALLER@myhost.test.ex> 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@myhost.test.ex R=smartuser T=lmtp defer (0): LMTP error after DATA: 440 Temporary error
-1999-03-02 09:44:33 10HmaY-0005vi-00 ** userxy@myhost.test.ex F=<CALLER@myhost.test.ex> R=smartuser T=lmtp: LMTP error after DATA: 550 Bad user
+1999-03-02 09:44:33 10HmaY-0005vi-00 == userxx@myhost.test.ex 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@myhost.test.ex F=<CALLER@myhost.test.ex> 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@myhost.test.ex F=<CALLER@myhost.test.ex> 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@myhost.test.ex R=smartuser T=lmtp defer (0): LMTP error after DATA: 440 Temporary error
-1999-03-02 09:44:33 10HmaY-0005vi-00 ** useryy@myhost.test.ex F=<CALLER@myhost.test.ex> R=smartuser T=lmtp: LMTP error after DATA: 550 Bad user
+1999-03-02 09:44:33 10HmaY-0005vi-00 == useryx@myhost.test.ex 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@myhost.test.ex F=<CALLER@myhost.test.ex> 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@myhost.test.ex> 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@myhost.test.ex U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmbA-0005vi-00 => userx@myhost.test.ex F=<CALLER@myhost.test.ex> 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@myhost.test.ex R=smartuser T=lmtp defer (0): LMTP error after DATA: 440 Temporary error
-1999-03-02 09:44:33 10HmbA-0005vi-00 ** userxy@myhost.test.ex F=<CALLER@myhost.test.ex> 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@myhost.test.ex 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@myhost.test.ex F=<CALLER@myhost.test.ex> 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@myhost.test.ex F=<CALLER@myhost.test.ex> 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@myhost.test.ex 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@myhost.test.ex F=<CALLER@myhost.test.ex> R=smartuser T=lmtp: LMTP error after DATA: 550 Bad user
+1999-03-02 09:44:33 10HmbA-0005vi-00 == useryx@myhost.test.ex 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@myhost.test.ex F=<CALLER@myhost.test.ex> 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@myhost.test.ex> 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@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbC-0005vi-00 ** userx@myhost.test.ex F=<CALLER@myhost.test.ex> R=smartuser T=lmtp: SMTP error from remote mail server after RCPT TO:<userx@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 550 Receiver BAD
-1999-03-02 09:44:33 10HmbC-0005vi-00 == userxx@myhost.test.ex R=smartuser T=lmtp defer (0): LMTP error after DATA: 440 Temporary error
-1999-03-02 09:44:33 10HmbC-0005vi-00 == userxy@myhost.test.ex R=smartuser T=lmtp defer (-44): SMTP error from remote mail server after RCPT TO:<userxy@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 450 Receiver temporarily bad
-1999-03-02 09:44:33 10HmbC-0005vi-00 ** userxz@myhost.test.ex F=<CALLER@myhost.test.ex> 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@myhost.test.ex F=<CALLER@myhost.test.ex> R=smartuser T=lmtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@myhost.test.ex>: 550 Receiver BAD
+1999-03-02 09:44:33 10HmbC-0005vi-00 == userxx@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex>: 450 Receiver temporarily bad
+1999-03-02 09:44:33 10HmbC-0005vi-00 ** userxz@myhost.test.ex F=<CALLER@myhost.test.ex> 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@myhost.test.ex F=<CALLER@myhost.test.ex> 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@myhost.test.ex F=<CALLER@myhost.test.ex> R=smartuser T=lmtp: SMTP error from remote mail server after RCPT TO:<useryy@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 550 Receiver BAD
+1999-03-02 09:44:33 10HmbC-0005vi-00 ** useryy@myhost.test.ex F=<CALLER@myhost.test.ex> R=smartuser T=lmtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<useryy@myhost.test.ex>: 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@myhost.test.ex> 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@myhost.test.ex F=<CALLER@myhost.test.ex> 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@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbG-0005vi-00 == userx@myhost.test.ex R=smartuser T=lmtp defer (-44): SMTP error from remote mail server after RCPT TO:<userx@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 450 LATER
+1999-03-02 09:44:33 10HmbG-0005vi-00 == userx@myhost.test.ex 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@myhost.test.ex>: 450 LATER
 1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbH-0005vi-00 == userx@myhost.test.ex R=smartuser T=lmtp defer (-44): SMTP error from remote mail server after RCPT TO:<userx@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 450 LATER
+1999-03-02 09:44:33 10HmbH-0005vi-00 == userx@myhost.test.ex 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@myhost.test.ex>: 450 LATER

diff --git a/test/log/0217 b/test/log/0217
index 80a018be5c7011f0d6ef0e8be5958688de9d78db..1328a46dbd31d3fb71df05aabff9aa2a77e2b3b8 100644 (file)
--- a/test/log/0217
+++ b/test/log/0217
@@ -1,269 +1,269 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex 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@test.ex R=client T=send_to_server defer (-44): SMTP error from remote mail server after RCPT TO:<b@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temp error
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** c@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<c@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 Perm error
+1999-03-02 09:44:33 10HmaX-0005vi-00 == b@test.ex 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@test.ex>: 451 Temp error
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** c@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<c@test.ex>: 550 Perm error
 1999-03-02 09:44:33 10HmaX-0005vi-00 -> d@test.ex 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@test.ex R=bounce: just discard
 1999-03-02 09:44:33 10HmaY-0005vi-00 CALLER@test.ex: error ignored
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaZ-0005vi-00 == a@test.ex 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@test.ex>
-1999-03-02 09:44:33 10HmaZ-0005vi-00 == b@test.ex 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@test.ex>
-1999-03-02 09:44:33 10HmaZ-0005vi-00 == c@test.ex 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@test.ex>
+1999-03-02 09:44:33 10HmaZ-0005vi-00 == a@test.ex 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@test.ex>
+1999-03-02 09:44:33 10HmaZ-0005vi-00 == b@test.ex 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@test.ex>
+1999-03-02 09:44:33 10HmaZ-0005vi-00 == c@test.ex R=client T=send_to_server defer (dd): Connection timed out: SMTP timeout after RCPT TO:<b@test.ex>
 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbA-0005vi-00 == a@test.ex R=client T=send_to_server defer (-45): SMTP error from remote mail server after MAIL FROM:<CALLER@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temp error
-1999-03-02 09:44:33 10HmbA-0005vi-00 == b@test.ex R=client T=send_to_server defer (-45): SMTP error from remote mail server after MAIL FROM:<CALLER@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temp error
+1999-03-02 09:44:33 10HmbA-0005vi-00 == a@test.ex 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@test.ex>: 451 Temp error
+1999-03-02 09:44:33 10HmbA-0005vi-00 == b@test.ex 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@test.ex>: 451 Temp error
 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbB-0005vi-00 ** a@test.ex R=client T=send_to_server: SMTP error from remote mail server after MAIL FROM:<CALLER@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 Perm error
-1999-03-02 09:44:33 10HmbB-0005vi-00 ** b@test.ex R=client T=send_to_server: SMTP error from remote mail server after MAIL FROM:<CALLER@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 Perm error
+1999-03-02 09:44:33 10HmbB-0005vi-00 ** a@test.ex 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@test.ex>: 550 Perm error
+1999-03-02 09:44:33 10HmbB-0005vi-00 ** b@test.ex 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@test.ex>: 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@test.ex R=bounce: just discard
 1999-03-02 09:44:33 10HmbC-0005vi-00 CALLER@test.ex: 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@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbD-0005vi-00 == a@test.ex R=client T=send_to_server defer (-44): SMTP error from remote mail server after RCPT TO:<a@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temp error 1
-1999-03-02 09:44:33 10HmbD-0005vi-00 == b@test.ex R=client T=send_to_server defer (-44): SMTP error from remote mail server after RCPT TO:<b@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temp error 2
+1999-03-02 09:44:33 10HmbD-0005vi-00 == a@test.ex 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@test.ex>: 451 Temp error 1
+1999-03-02 09:44:33 10HmbD-0005vi-00 == b@test.ex 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@test.ex>: 451 Temp error 2
 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbE-0005vi-00 ** a@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<a@test.ex>: host 127.0.0.1 [127.0.0.1]: 551 Perm error 1
-1999-03-02 09:44:33 10HmbE-0005vi-00 ** b@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<b@test.ex>: host 127.0.0.1 [127.0.0.1]: 551 Perm error 2
+1999-03-02 09:44:33 10HmbE-0005vi-00 ** a@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<a@test.ex>: 551 Perm error 1
+1999-03-02 09:44:33 10HmbE-0005vi-00 ** b@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<b@test.ex>: 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@test.ex R=bounce: just discard
 1999-03-02 09:44:33 10HmbF-0005vi-00 CALLER@test.ex: 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@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbG-0005vi-00 == a@test.ex R=client T=send_to_server defer (-44): SMTP error from remote mail server after RCPT TO:<a@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temp error 1
-1999-03-02 09:44:33 10HmbG-0005vi-00 ** b@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<b@test.ex>: host 127.0.0.1 [127.0.0.1]: 551 Perm error 2
+1999-03-02 09:44:33 10HmbG-0005vi-00 == a@test.ex 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@test.ex>: 451 Temp error 1
+1999-03-02 09:44:33 10HmbG-0005vi-00 ** b@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<b@test.ex>: 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@test.ex R=bounce: just discard
 1999-03-02 09:44:33 10HmbH-0005vi-00 CALLER@test.ex: error ignored
 1999-03-02 09:44:33 10HmbH-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbI-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbI-0005vi-00 ** a@test.ex 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@test.ex 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@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined DATA: 503 Sorry perm data error
+1999-03-02 09:44:33 10HmbI-0005vi-00 ** b@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined 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@test.ex R=bounce: just discard
 1999-03-02 09:44:33 10HmbJ-0005vi-00 CALLER@test.ex: 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@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbK-0005vi-00 == a@test.ex 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@test.ex 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@test.ex R=client T=send_to_server defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined DATA: 403 Sorry temp data error
+1999-03-02 09:44:33 10HmbK-0005vi-00 == b@test.ex R=client T=send_to_server defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined DATA: 403 Sorry temp data error
 1999-03-02 09:44:33 10HmbL-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbL-0005vi-00 == yes@test.ex 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@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n00@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n01@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n01@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n02@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n02@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n03@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n03@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n04@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n04@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n05@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n05@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n06@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n06@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n07@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n07@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n08@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n08@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n09@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n09@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n10@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n10@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n11@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n11@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n12@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n12@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n13@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n13@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n14@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n14@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n15@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n15@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n16@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n16@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n17@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n17@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n18@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n18@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n19@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n19@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n20@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n20@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n21@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n21@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n22@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n22@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n23@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n23@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n24@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n24@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n25@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n25@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n26@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n26@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n27@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n27@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n28@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n28@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n29@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n29@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n30@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n30@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n31@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n31@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n32@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n32@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n33@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n33@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n34@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n34@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n35@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n35@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n36@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n36@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n37@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n37@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n38@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n38@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n39@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n39@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n40@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n40@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n41@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n41@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n42@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n42@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n43@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n43@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n44@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n44@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n45@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n45@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n46@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n46@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n47@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n47@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n48@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n48@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n49@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n49@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n50@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n50@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n51@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n51@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n52@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n52@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n53@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n53@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n54@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n54@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n55@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n55@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n56@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n56@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n57@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n57@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n58@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n58@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n59@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n59@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n60@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n60@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n61@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n61@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n62@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n62@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n63@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n63@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n64@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n64@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n65@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n65@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n66@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n66@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n67@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n67@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n68@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n68@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n69@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n69@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n70@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n70@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n71@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n71@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n72@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n72@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n73@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n73@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n74@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n74@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n75@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n75@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n76@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n76@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n77@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n77@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n78@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n78@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n79@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n79@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n80@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n80@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n81@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n81@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n82@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n82@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n83@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n83@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n84@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n84@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n85@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n85@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n86@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n86@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n87@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n87@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n88@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n88@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n89@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n89@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n90@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n90@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n91@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n91@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n92@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n92@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n93@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n93@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n94@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n94@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n95@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n95@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n96@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n96@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n97@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n97@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n98@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n98@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n99@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n99@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n100@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n100@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n101@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n101@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n102@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n102@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n103@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n103@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n104@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n104@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n105@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n105@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n106@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n106@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n107@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n107@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n108@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n108@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n109@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n109@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n110@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n110@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n111@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n111@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n112@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n112@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n113@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n113@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n114@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n114@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n115@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n115@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n116@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n116@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n117@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n117@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n118@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n118@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n119@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n119@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n120@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n120@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n121@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n121@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n122@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n122@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n123@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n123@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n124@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n124@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n125@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n125@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n126@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n126@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n127@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n127@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n128@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n128@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n129@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n129@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n130@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n130@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n131@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n131@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n132@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n132@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n133@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n133@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n134@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n134@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n135@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n135@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n136@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n136@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n137@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n137@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n138@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n138@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n139@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n139@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n140@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n140@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n141@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n141@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n142@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n142@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n143@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n143@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n144@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n144@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n145@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n145@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n146@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n146@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n147@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n147@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n148@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n148@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n149@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n149@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n150@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n150@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n151@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n151@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n152@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n152@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n153@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n153@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n154@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n154@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n155@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n155@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n156@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n156@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n157@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n157@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n158@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n158@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n159@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n159@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n160@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n160@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n161@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n161@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n162@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n162@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n163@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n163@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n164@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n164@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n165@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n165@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n166@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n166@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n167@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n167@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n168@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n168@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n169@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n169@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n170@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n170@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n171@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n171@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n172@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n172@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n173@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n173@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n174@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n174@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n175@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n175@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n176@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n176@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n177@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n177@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n178@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n178@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n179@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n179@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n180@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n180@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n181@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n181@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n182@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n182@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n183@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n183@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n184@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n184@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n185@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n185@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n186@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n186@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n187@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n187@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n188@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n188@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n189@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n189@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n190@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n190@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n191@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n191@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n192@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n192@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n193@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n193@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n194@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n194@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n195@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n195@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n196@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n196@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n197@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n197@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n198@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n198@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** n199@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n199@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 == yes@test.ex R=client T=send_to_server defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined DATA: 403 Sorry temp data error
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n00@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n00@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n01@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n01@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n02@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n02@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n03@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n03@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n04@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n04@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n05@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n05@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n06@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n06@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n07@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n07@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n08@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n08@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n09@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n09@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n10@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n10@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n11@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n11@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n12@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n12@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n13@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n13@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n14@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n14@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n15@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n15@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n16@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n16@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n17@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n17@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n18@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n18@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n19@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n19@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n20@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n20@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n21@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n21@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n22@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n22@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n23@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n23@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n24@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n24@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n25@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n25@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n26@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n26@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n27@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n27@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n28@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n28@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n29@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n29@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n30@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n30@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n31@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n31@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n32@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n32@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n33@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n33@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n34@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n34@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n35@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n35@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n36@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n36@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n37@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n37@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n38@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n38@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n39@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n39@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n40@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n40@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n41@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n41@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n42@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n42@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n43@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n43@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n44@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n44@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n45@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n45@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n46@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n46@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n47@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n47@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n48@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n48@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n49@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n49@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n50@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n50@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n51@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n51@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n52@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n52@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n53@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n53@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n54@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n54@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n55@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n55@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n56@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n56@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n57@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n57@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n58@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n58@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n59@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n59@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n60@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n60@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n61@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n61@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n62@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n62@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n63@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n63@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n64@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n64@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n65@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n65@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n66@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n66@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n67@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n67@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n68@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n68@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n69@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n69@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n70@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n70@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n71@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n71@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n72@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n72@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n73@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n73@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n74@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n74@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n75@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n75@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n76@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n76@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n77@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n77@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n78@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n78@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n79@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n79@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n80@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n80@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n81@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n81@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n82@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n82@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n83@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n83@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n84@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n84@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n85@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n85@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n86@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n86@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n87@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n87@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n88@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n88@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n89@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n89@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n90@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n90@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n91@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n91@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n92@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n92@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n93@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n93@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n94@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n94@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n95@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n95@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n96@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n96@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n97@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n97@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n98@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n98@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n99@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n99@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n100@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n100@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n101@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n101@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n102@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n102@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n103@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n103@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n104@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n104@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n105@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n105@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n106@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n106@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n107@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n107@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n108@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n108@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n109@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n109@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n110@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n110@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n111@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n111@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n112@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n112@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n113@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n113@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n114@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n114@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n115@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n115@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n116@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n116@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n117@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n117@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n118@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n118@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n119@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n119@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n120@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n120@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n121@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n121@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n122@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n122@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n123@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n123@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n124@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n124@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n125@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n125@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n126@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n126@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n127@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n127@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n128@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n128@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n129@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n129@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n130@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n130@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n131@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n131@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n132@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n132@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n133@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n133@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n134@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n134@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n135@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n135@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n136@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n136@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n137@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n137@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n138@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n138@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n139@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n139@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n140@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n140@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n141@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n141@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n142@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n142@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n143@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n143@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n144@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n144@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n145@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n145@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n146@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n146@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n147@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n147@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n148@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n148@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n149@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n149@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n150@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n150@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n151@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n151@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n152@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n152@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n153@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n153@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n154@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n154@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n155@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n155@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n156@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n156@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n157@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n157@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n158@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n158@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n159@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n159@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n160@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n160@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n161@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n161@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n162@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n162@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n163@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n163@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n164@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n164@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n165@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n165@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n166@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n166@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n167@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n167@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n168@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n168@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n169@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n169@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n170@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n170@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n171@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n171@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n172@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n172@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n173@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n173@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n174@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n174@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n175@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n175@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n176@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n176@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n177@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n177@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n178@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n178@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n179@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n179@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n180@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n180@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n181@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n181@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n182@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n182@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n183@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n183@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n184@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n184@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n185@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n185@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n186@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n186@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n187@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n187@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n188@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n188@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n189@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n189@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n190@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n190@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n191@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n191@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n192@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n192@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n193@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n193@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n194@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n194@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n195@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n195@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n196@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n196@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n197@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n197@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n198@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n198@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** n199@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n199@test.ex>: 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@test.ex R=bounce: just discard
 1999-03-02 09:44:33 10HmbM-0005vi-00 CALLER@test.ex: error ignored
 1999-03-02 09:44:33 10HmbM-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbN-0005vi-00 <= CALLER@test.ex 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@test.ex>
-1999-03-02 09:44:33 10HmbN-0005vi-00 == a@test.ex 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@test.ex>
-1999-03-02 09:44:33 10HmbN-0005vi-00 ** b@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<b@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
-1999-03-02 09:44:33 10HmbN-0005vi-00 == c@test.ex 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@test.ex>
-1999-03-02 09:44:33 10HmbN-0005vi-00 == d@test.ex 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@test.ex>
-1999-03-02 09:44:33 10HmbN-0005vi-00 == e@test.ex 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@test.ex>
+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@test.ex>
+1999-03-02 09:44:33 10HmbN-0005vi-00 == a@test.ex 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@test.ex>
+1999-03-02 09:44:33 10HmbN-0005vi-00 ** b@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<b@test.ex>: 550 NO
+1999-03-02 09:44:33 10HmbN-0005vi-00 == c@test.ex 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@test.ex>
+1999-03-02 09:44:33 10HmbN-0005vi-00 == d@test.ex 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@test.ex>
+1999-03-02 09:44:33 10HmbN-0005vi-00 == e@test.ex 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@test.ex>
 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@test.ex R=bounce: just discard
 1999-03-02 09:44:33 10HmbO-0005vi-00 CALLER@test.ex: error ignored

diff --git a/test/log/0218 b/test/log/0218
index e246b2c848930a0e6239bbea5f6f65e73e7d2cd5..4aac50dabf154ee0a2202c92409c35b656bb45b8 100644 (file)
--- a/test/log/0218
+++ b/test/log/0218
@@ -9,10 +9,10 @@
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@test.ex 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@test.ex F=<CALLER@test.ex> R=client T=send_to_server: SMTP error from remote mail server after MAIL FROM:<CALLER@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+1999-03-02 09:44:33 10HmaZ-0005vi-00 ** a@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@test.ex>: 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@test.ex 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@test.ex U=CALLER P=local S=sss
@@ -20,7 +20,7 @@
 1999-03-02 09:44:33 10HmbB-0005vi-00 ** CALLER@test.ex F=<> R=bounce: just discard
 1999-03-02 09:44:33 10HmbB-0005vi-00 CALLER@test.ex: error ignored
 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbA-0005vi-00 ** b@test.ex F=<CALLER@test.ex> R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<b@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 Unknown
+1999-03-02 09:44:33 10HmbA-0005vi-00 ** b@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<b@test.ex>: 550 Unknown
 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@test.ex F=<CALLER@test.ex> 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 2ca77203fe697833be27ad649a34d3fa87d4191e..646034c585298edd8f48b3cece298f4e9ce8d90e 100644 (file)
--- a/test/log/0228
+++ b/test/log/0228
@@ -1,3 +1,3 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex 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@x.y.z 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 10da189fa9cbaceff82860be1bf08c88adb9536d..193bf3c1aee523e42c5fdd6699e3a063f7c22516 100644 (file)
--- a/test/log/0229
+++ b/test/log/0229
@@ -1,7 +1,7 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex 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@test.ex R=all T=smtp defer (dd): Connection refused

diff --git a/test/log/0253 b/test/log/0253
index 527cb1a836358ebf60af50a56a2843664106b2ae..57b00c823211a75b43794ae29f50e434776fd924 100644 (file)
--- a/test/log/0253
+++ b/test/log/0253
@@ -7,7 +7,7 @@
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= pqr@x.y.z U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx@myhost.test.ex P=<pqr=userx+myhost.test.ex@verp.domain> 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@myhost.test.ex P=<pqr=phil+myhost.test.ex@verp.domain> 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@myhost.test.ex P=<pqr=fail+myhost.test.ex@verp.domain> R=r3 T=t3: SMTP error from remote mail server after RCPT TO:<fail@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
+1999-03-02 09:44:33 10HmaZ-0005vi-00 ** fail@myhost.test.ex P=<pqr=fail+myhost.test.ex@verp.domain> R=r3 T=t3 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<fail@myhost.test.ex>: 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@myhost.test.ex> 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 49461e2cbd0302290774b2ce3e78df3a279b1e8b..8822a6ef0cb3cb6f3678795f735a221d9d733352 100644 (file)
--- a/test/log/0257
+++ b/test/log/0257
@@ -1,4 +1,4 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex 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@ten-1.test.ex R=all T=smtp defer (dd): Network Error

diff --git a/test/log/0276 b/test/log/0276
index e2b75e67fabe861e90a1c6d7f0c93064082e4bb0..b5a5613a3d45860b40e33650c77838a3621d15c6 100644 (file)
--- a/test/log/0276
+++ b/test/log/0276
@@ -1,16 +1,16 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@test.ex 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@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined DATA: 500 NO
 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@test.ex R=r1 T=t1 defer (dd): Connection refused
 1999-03-02 09:44:33 10HmaY-0005vi-00 ** CALLER@test.ex: retry timeout exceeded
 1999-03-02 09:44:33 10HmaY-0005vi-00 CALLER@test.ex: 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@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaZ-0005vi-00 ** userx@test.ex 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@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after DATA: 500 NO
 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@test.ex R=r1 T=t1 defer (dd): Connection refused
 1999-03-02 09:44:33 10HmbA-0005vi-00 ** CALLER@test.ex: retry timeout exceeded
 1999-03-02 09:44:33 10HmbA-0005vi-00 CALLER@test.ex: error ignored

diff --git a/test/log/0285 b/test/log/0285
index b0c90f109955808f2b048fc80a68e8f33c1b3468..4e46a52e598bbc5e9a0b9f830e3b7f64fa091cb0 100644 (file)
--- 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@test.ex 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@test.ex 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@test.ex R=all T=smtp: SMTP error from remote mail server after RCPT TO:<c@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** d@test.ex R=all T=smtp: SMTP error from remote mail server after RCPT TO:<d@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** c@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<c@test.ex>: 550 Recipient not OK
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** d@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d@test.ex>: 550 Recipient not OK
 1999-03-02 09:44:33 10HmaX-0005vi-00 => e@test.ex 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@test.ex 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@test.ex 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@test.ex 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@test.ex R=all T=smtp: SMTP error from remote mail server after RCPT TO:<c@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
-1999-03-02 09:44:33 10HmaZ-0005vi-00 ** d@test.ex R=all T=smtp: SMTP error from remote mail server after RCPT TO:<d@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
+1999-03-02 09:44:33 10HmaZ-0005vi-00 ** c@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<c@test.ex>: 550 Recipient not OK
+1999-03-02 09:44:33 10HmaZ-0005vi-00 ** d@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d@test.ex>: 550 Recipient not OK
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => e@test.ex 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@test.ex 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@test.ex 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 52e28a4f8c38c5045d8814a2f364c7b5ae1c8452..a8e02ed6705d7397047626a58cebeac70874c547 100644 (file)
--- 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@test.ex 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@test.ex 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@test.ex R=all T=smtp: SMTP error from remote mail server after RCPT TO:<c@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** d@test.ex R=all T=smtp: SMTP error from remote mail server after RCPT TO:<d@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** c@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<c@test.ex>: 550 Recipient not OK
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** d@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d@test.ex>: 550 Recipient not OK
 1999-03-02 09:44:33 10HmaX-0005vi-00 => e@test.ex 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@test.ex 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@test.ex 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@test.ex R=all T=smtp: SMTP error from remote mail server after RCPT TO:<a@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
-1999-03-02 09:44:33 10HmaZ-0005vi-00 ** b@test.ex R=all T=smtp: SMTP error from remote mail server after RCPT TO:<b@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
+1999-03-02 09:44:33 10HmaZ-0005vi-00 ** a@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<a@test.ex>: 550 Recipient not OK
+1999-03-02 09:44:33 10HmaZ-0005vi-00 ** b@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<b@test.ex>: 550 Recipient not OK
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => c@test.ex 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@test.ex 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@test.ex R=all T=smtp: SMTP error from remote mail server after RCPT TO:<e@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
-1999-03-02 09:44:33 10HmaZ-0005vi-00 ** f@test.ex R=all T=smtp: SMTP error from remote mail server after RCPT TO:<f@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 Recipient not OK
+1999-03-02 09:44:33 10HmaZ-0005vi-00 ** e@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<e@test.ex>: 550 Recipient not OK
+1999-03-02 09:44:33 10HmaZ-0005vi-00 ** f@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<f@test.ex>: 550 Recipient not OK
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => g@test.ex 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@test.ex 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 e90cb9c7e606502caff93941688465d1ffdcf0d6..0c45cc5d22cf50aeb36000213773ae82b8bf2f11 100644 (file)
--- a/test/log/0322
+++ b/test/log/0322
@@ -1,32 +1,32 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex 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@test.ex 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@test.ex 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@test.ex: 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@myhost.test.ex> 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@myhost.test.ex 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@test.ex>
-1999-03-02 09:44:33 10HmaZ-0005vi-00 == x@test.ex 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@test.ex>
+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@test.ex>
+1999-03-02 09:44:33 10HmaZ-0005vi-00 == x@test.ex 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@test.ex>
 1999-03-02 09:44:33 10HmaZ-0005vi-00 ** x@test.ex: 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@myhost.test.ex> 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@myhost.test.ex 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@myhost.test.ex>
-1999-03-02 09:44:33 10HmbB-0005vi-00 == x@test.ex 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@myhost.test.ex>
+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@myhost.test.ex>
+1999-03-02 09:44:33 10HmbB-0005vi-00 == x@test.ex 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@myhost.test.ex>
 1999-03-02 09:44:33 10HmbB-0005vi-00 ** x@test.ex: 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@myhost.test.ex> 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@myhost.test.ex 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@test.ex>
-1999-03-02 09:44:33 10HmbD-0005vi-00 == x@test.ex 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@test.ex>
-1999-03-02 09:44:33 10HmbD-0005vi-00 == y@test.ex 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@test.ex>
-1999-03-02 09:44:33 10HmbD-0005vi-00 == z@test.ex 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@test.ex>
+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@test.ex>
+1999-03-02 09:44:33 10HmbD-0005vi-00 == x@test.ex 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@test.ex>
+1999-03-02 09:44:33 10HmbD-0005vi-00 == y@test.ex 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@test.ex>
+1999-03-02 09:44:33 10HmbD-0005vi-00 == z@test.ex 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@test.ex>
 1999-03-02 09:44:33 10HmbD-0005vi-00 ** z@test.ex: retry timeout exceeded
 1999-03-02 09:44:33 10HmbD-0005vi-00 ** y@test.ex: retry timeout exceeded
 1999-03-02 09:44:33 10HmbD-0005vi-00 ** x@test.ex: 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@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbF-0005vi-00 == a@test.ex R=remote T=smtp defer (-44): SMTP error from remote mail server after RCPT TO:<a@test.ex>: host 127.0.0.1 [127.0.0.1]: 450 Recipient bad
-1999-03-02 09:44:33 10HmbF-0005vi-00 == b@test.ex R=remote T=smtp defer (-44): SMTP error from remote mail server after RCPT TO:<b@test.ex>: host 127.0.0.1 [127.0.0.1]: 450 Recipient bad
+1999-03-02 09:44:33 10HmbF-0005vi-00 == a@test.ex 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@test.ex>: 450 Recipient bad
+1999-03-02 09:44:33 10HmbF-0005vi-00 == b@test.ex 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@test.ex>: 450 Recipient bad
 1999-03-02 09:44:33 10HmbF-0005vi-00 ** b@test.ex: retry timeout exceeded
 1999-03-02 09:44:33 10HmbF-0005vi-00 ** a@test.ex: 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@myhost.test.ex 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@test.ex 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@test.ex 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@test.ex: 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@myhost.test.ex> 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@myhost.test.ex 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@test.ex>
-1999-03-02 09:44:33 10HmbJ-0005vi-00 == x@test.ex 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@test.ex>
+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@test.ex>
+1999-03-02 09:44:33 10HmbJ-0005vi-00 == x@test.ex 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@test.ex>
 1999-03-02 09:44:33 10HmbJ-0005vi-00 ** x@test.ex: 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@myhost.test.ex> 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@myhost.test.ex 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@myhost.test.ex>
-1999-03-02 09:44:33 10HmbL-0005vi-00 == x@test.ex 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@myhost.test.ex>
+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@myhost.test.ex>
+1999-03-02 09:44:33 10HmbL-0005vi-00 == x@test.ex 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@myhost.test.ex>
 1999-03-02 09:44:33 10HmbL-0005vi-00 ** x@test.ex: 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@myhost.test.ex> 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@myhost.test.ex 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@test.ex>
-1999-03-02 09:44:33 10HmbN-0005vi-00 == x@test.ex 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@test.ex>
-1999-03-02 09:44:33 10HmbN-0005vi-00 == y@test.ex 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@test.ex>
-1999-03-02 09:44:33 10HmbN-0005vi-00 == z@test.ex 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@test.ex>
+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@test.ex>
+1999-03-02 09:44:33 10HmbN-0005vi-00 == x@test.ex 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@test.ex>
+1999-03-02 09:44:33 10HmbN-0005vi-00 == y@test.ex 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@test.ex>
+1999-03-02 09:44:33 10HmbN-0005vi-00 == z@test.ex 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@test.ex>
 1999-03-02 09:44:33 10HmbN-0005vi-00 ** z@test.ex: retry timeout exceeded
 1999-03-02 09:44:33 10HmbN-0005vi-00 ** y@test.ex: retry timeout exceeded
 1999-03-02 09:44:33 10HmbN-0005vi-00 ** x@test.ex: retry timeout exceeded

diff --git a/test/log/0343 b/test/log/0343
index 560bdd0043731e361ea03d47d4169a24a1fcdb49..cdeaab3f02b0aa3a03faf97bbf451341a6ddad31 100644 (file)
--- a/test/log/0343
+++ b/test/log/0343
@@ -1,4 +1,4 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex 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 0aa9fd78782ec134ca7b431552e0f901ac2025ef..4a4ed55cdbbba75d51dbd235c1965bcc3667a2c6 100644 (file)
--- a/test/log/0357
+++ b/test/log/0357
@@ -1,10 +1,10 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex 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@test.ex>: 451 Temporary error
 1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex 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@test.ex>: 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@test.ex R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex 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@test.ex>: 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@test.ex routing defer (-51): retry time not reached

diff --git a/test/log/0358 b/test/log/0358
index 233e6bd405d24585243f1858f5e9195b93fbdfd5..86351c377600d3483b26dc295e674ea6a3a2e759 100644 (file)
--- a/test/log/0358
+++ b/test/log/0358
@@ -1,7 +1,7 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
-1999-03-02 09:44:33 10HmaX-0005vi-00 == usery@test.ex R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<usery@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex 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@test.ex>: 451 Temporary error
+1999-03-02 09:44:33 10HmaX-0005vi-00 == usery@test.ex 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@test.ex>: 451 Temporary error
 1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
-1999-03-02 09:44:33 10HmaX-0005vi-00 == usery@test.ex R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<usery@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex 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@test.ex>: 451 Temporary error
+1999-03-02 09:44:33 10HmaX-0005vi-00 == usery@test.ex 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@test.ex>: 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 0104bededc02a1132c6d0db543ad3d36073792aa..62afef028708eab3cea965ff88104dee4e2697b6 100644 (file)
--- a/test/log/0366
+++ b/test/log/0366
@@ -1,20 +1,20 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex 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@mxt99.test.ex 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@mxt99.test.ex R=r1 T=smtp defer (dd): Network Error
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@mxt99.test.ex: 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 b3a8400185a0e9d89b9c055d640ad1a5924ca7c4..abbd3addf90eb2eaba1bc8218f60e8057c349e49 100644 (file)
--- a/test/log/0374
+++ b/test/log/0374
@@ -9,13 +9,13 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** b1@myhost.test.ex 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@myhost.test.ex R=ut3 T=ut3 defer (0): Child process of ut3 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file
 1999-03-02 09:44:33 10HmaX-0005vi-00 => d1@myhost.test.ex 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@myhost.test.ex R=ut4 T=ut4 defer (-44): SMTP error from remote mail server after RCPT TO:<d2@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 450 soft error
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** d3@myhost.test.ex R=ut4 T=ut4: SMTP error from remote mail server after RCPT TO:<d3@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 550 hard error
+1999-03-02 09:44:33 10HmaX-0005vi-00 == d2@myhost.test.ex R=ut4 T=ut4 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d2@myhost.test.ex>: 450 soft error
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** d3@myhost.test.ex R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d3@myhost.test.ex>: 550 hard error
 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@myhost.test.ex> 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@myhost.test.ex R=ut3 T=ut3 defer (0): Child process of ut3 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file
-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@myhost.test.ex 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 094a3ba22090191516419424aec624e3cbe1fb84..5e454152c501af3d2e5ea31f0dfc28e7c45a6297 100644 (file)
--- a/test/log/0388
+++ b/test/log/0388
@@ -1,7 +1,7 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex 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@myhost.test.ex> R=r0

diff --git a/test/log/0426 b/test/log/0426
index b5ff4c5ca8fb3973fdaa17a3c12bf2059aac7d59..c6d7d565f6cb2d945153efaca504edb59de61924 100644 (file)
--- a/test/log/0426
+++ b/test/log/0426
@@ -1,5 +1,5 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** x@uppercase.test.ex R=r1 T=t1: SMTP error from remote mail server after RCPT TO:<x@UpperCase.test.ex>: host uppercase.test.ex [127.0.0.1]: 550 Unknown
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** x@uppercase.test.ex R=r1 T=t1 H=uppercase.test.ex [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@UpperCase.test.ex>: 550 Unknown
 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@test.ex> R=r0
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed

diff --git a/test/log/0429 b/test/log/0429
index c98100071496121a12db06515f6e7ed54f515b56..cb75f6cf450b0c1f47ab2c44c152b66d3acade36 100644 (file)
--- a/test/log/0429
+++ b/test/log/0429
@@ -1,6 +1,6 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex 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 91af1eb3065ee0241cc5b974379c29d0db90de26..5069ceb535f6d46d73c6070d0aff04ca24b0c935 100644 (file)
--- a/test/log/0447
+++ b/test/log/0447
@@ -1,12 +1,12 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex 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@test.ex 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@test.ex 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@test.ex 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@test.ex U=CALLER P=local S=sss

diff --git a/test/log/0450 b/test/log/0450
index 18c9a84d3a83d52dd8af44c13dcabcbd155cd62f..e5df92aad0992b7649667a8840c5afa5e5e8bbc2 100644 (file)
--- a/test/log/0450
+++ b/test/log/0450
@@ -1,7 +1,7 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex 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@test.ex 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@test.ex 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 caeab737b0e8f08a22adb79ee3fce12c9ecfbb47..a755cfad226bfcc07bf3bc217bd16edb5a02cec8 100644 (file)
--- a/test/log/0455
+++ b/test/log/0455
@@ -1,11 +1,11 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex 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@mxt97.test.ex 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@mxt97.test.ex R=r1 T=smtp defer (dd): Network Error
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@mxt97.test.ex: 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 db36aa5eee018675f4f8362c7fc95c5366a1ac31..49370d55826a2a61325a2a8f3f307726d4fe2079 100644 (file)
--- a/test/log/0461
+++ b/test/log/0461
@@ -1,13 +1,13 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex 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@test.ex 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@test.ex 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@test.ex 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@test.ex 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@test.ex 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@test.ex 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@test.ex 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@test.ex 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@test.ex R=r1 T=t1 defer (dd): Network Error
 1999-03-02 09:44:33 10HmbC-0005vi-00 ** userx@test.ex: 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 92eb69de245df5e5c52dd6362227b516d98822da..127663c74be0fe50740a4a9feb27e305101844ac 100644 (file)
--- a/test/log/0474
+++ b/test/log/0474
@@ -1,8 +1,8 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name 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@the.local.host.name>: 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@the.local.host.name>: 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 c48ae1b53a9e65b78ee229a413ac16244aaea310..c2d8ce42db7a7b4e3644a50ae9f4a95e607de253 100644 (file)
--- a/test/log/0476
+++ b/test/log/0476
@@ -3,9 +3,9 @@
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@test.ex 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@test.ex R=r1 T=t1: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 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@the.local.host.name 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@test.ex R=r1 T=t1 defer (-53): retry time not reached for any host

diff --git a/test/log/0477 b/test/log/0477
index b5c85234223f771edcccff9e205955fdfb70b0a4..bd08227a613e088880044452559e378faa497232 100644 (file)
--- a/test/log/0477
+++ b/test/log/0477
@@ -1,3 +1,3 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name 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@test.ex R=r1 T=t1 defer (dd): Network Error

diff --git a/test/log/0478 b/test/log/0478
index 591069f8841f4c19bd43507d141fa87fbdab1a85..5a521578cb0b1efb85e71e410b803b76c8c165a6 100644 (file)
--- 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@test.ex 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@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaY-0005vi-00@the.local.host.name
-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@test.ex R=r1 T=t1 defer (dd): Network Error

diff --git a/test/log/0495 b/test/log/0495
index 20f15c67824450b8601ae62148536658764b76fc..17886a809fc68d1748958a43b8d001560050a93d 100644 (file)
--- a/test/log/0495
+++ b/test/log/0495
@@ -1,6 +1,6 @@
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex 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@test.ex 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@myhost.test.ex U=CALLER P=local S=sss
@@ -8,16 +8,16 @@
 1999-03-02 09:44:33 10HmaZ-0005vi-00 -> b@x.y 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@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbA-0005vi-00 ** a@x.y R=r9 T=t1: SMTP error from remote mail server after RCPT TO:<b@x.y>: host 127.0.0.1 [127.0.0.1]: 550 NOTOK
-1999-03-02 09:44:33 10HmbA-0005vi-00 ** b@x.y R=r9 T=t1: SMTP error from remote mail server after RCPT TO:<b@x.y>: host 127.0.0.1 [127.0.0.1]: 550 NOTOK
+1999-03-02 09:44:33 10HmbA-0005vi-00 ** a@x.y R=r9 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<b@x.y>: 550 NOTOK
+1999-03-02 09:44:33 10HmbA-0005vi-00 ** b@x.y R=r9 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<b@x.y>: 550 NOTOK
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbB-0005vi-00 ** a@x.y R=r9 T=t1: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 550 BAD MAIL
-1999-03-02 09:44:33 10HmbB-0005vi-00 ** b@x.y R=r9 T=t1: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 550 BAD MAIL
+1999-03-02 09:44:33 10HmbB-0005vi-00 ** a@x.y R=r9 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: 550 BAD MAIL
+1999-03-02 09:44:33 10HmbB-0005vi-00 ** b@x.y R=r9 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: 550 BAD MAIL
 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbC-0005vi-00 ** a@x.y R=r9 T=t1: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 450 TEMPORARY MAIL FAIL
-1999-03-02 09:44:33 10HmbC-0005vi-00 ** b@x.y R=r9 T=t1: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 450 TEMPORARY MAIL FAIL
+1999-03-02 09:44:33 10HmbC-0005vi-00 ** a@x.y R=r9 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: 450 TEMPORARY MAIL FAIL
+1999-03-02 09:44:33 10HmbC-0005vi-00 ** b@x.y R=r9 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: 450 TEMPORARY MAIL FAIL
 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmbD-0005vi-00 => pm@p.q <postmaster@x.y> 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@x.y 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@x.y R=r9 T=t1: Connection refused
 1999-03-02 09:44:33 10HmbK-0005vi-00 ** b@x.y 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@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** a@x.y R=r9 T=t1: Connection timed out: SMTP timeout while connected to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] after RCPT TO:<b@x.y>
-1999-03-02 09:44:33 10HmbL-0005vi-00 ** b@x.y R=r9 T=t1: Connection timed out: SMTP timeout while connected to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] after RCPT TO:<b@x.y>
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** a@x.y R=r9 T=t1 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: Connection timed out: SMTP timeout after RCPT TO:<b@x.y>
+1999-03-02 09:44:33 10HmbL-0005vi-00 ** b@x.y R=r9 T=t1 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: Connection timed out: SMTP timeout after RCPT TO:<b@x.y>
 1999-03-02 09:44:33 10HmbL-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex 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@x.y R=r9 T=t1: SMTP error from remote mail server after RCPT TO:<a@x.y>: host 127.0.0.1 [127.0.0.1]: 550 SORRY
+1999-03-02 09:44:33 10HmbM-0005vi-00 ** a@x.y R=r9 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<a@x.y>: 550 SORRY
 1999-03-02 09:44:33 10HmbM-0005vi-00 ** a@x.y 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 61f08ff1bf97e24e0276460459ec3af9cc261316..9e55e5d29b2b79d0ffddd2f2ac47c69e55171122 100644 (file)
--- a/test/log/0497
+++ b/test/log/0497
@@ -1,62 +1,62 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@x.y R=r1 T=t1 defer (-45): SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 452 temporary error
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@x.y 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@myhost.test.ex>: 452 temporary error
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@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@myhost.test.ex> 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@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@x.y R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<userx@x.y>: host 127.0.0.1 [127.0.0.1]: 452 temporary error
+1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@x.y 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@x.y>: 452 temporary error
 1999-03-02 09:44:33 10HmaZ-0005vi-00 ** userx@x.y: 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@myhost.test.ex> 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@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbB-0005vi-00 == userx@x.y 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@x.y 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@x.y: 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@myhost.test.ex> 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@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbD-0005vi-00 == userx@x.y 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@x.y 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@x.y: 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@myhost.test.ex> 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@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbF-0005vi-00 == userx@x.y R=r1 T=t1 defer (-45): SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 452 temporary error
+1999-03-02 09:44:33 10HmbF-0005vi-00 == userx@x.y 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@myhost.test.ex>: 452 temporary error
 1999-03-02 09:44:33 10HmbF-0005vi-00 ** userx@x.y: 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@myhost.test.ex> 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@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbH-0005vi-00 == userx@x.y R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<userx@x.y>: host 127.0.0.1 [127.0.0.1]: 452 temporary error
+1999-03-02 09:44:33 10HmbH-0005vi-00 == userx@x.y 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@x.y>: 452 temporary error
 1999-03-02 09:44:33 10HmbH-0005vi-00 ** userx@x.y: 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@myhost.test.ex> 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@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbJ-0005vi-00 == userx@x.y 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@x.y 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@x.y: 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@myhost.test.ex> 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@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbL-0005vi-00 == userx@x.y 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@x.y 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@x.y: 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@myhost.test.ex> 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@myhost.test.ex 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@x.y>
-1999-03-02 09:44:33 10HmbN-0005vi-00 == userx@x.y R=r1 T=t1 defer (-18): Remote host 127.0.0.1 [127.0.0.1] closed connection in response to RCPT TO:<userx@x.y>
+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@x.y>
+1999-03-02 09:44:33 10HmbN-0005vi-00 == userx@x.y 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@x.y>
 1999-03-02 09:44:33 10HmbN-0005vi-00 ** userx@x.y: 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@myhost.test.ex> R=r0

diff --git a/test/log/0498 b/test/log/0498
index ae2dd0f273b02c62c4f3758c0cc4ac8b90a95bdc..4c8247684f248165fca33627eebb1c34764f5db7 100644 (file)
--- a/test/log/0498
+++ b/test/log/0498
@@ -1,7 +1,7 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@x.y R=r1 T=t1 defer (-45): SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 450 DELAY
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@x.y 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@myhost.test.ex>: 450 DELAY
 1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@x.y 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@x.y 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@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@myhost.test.ex> R=r0

diff --git a/test/log/0504 b/test/log/0504
index fe3424f87f0335cec71a2a4703bcddb74a4dd4a2..03158bb8bea76c26168c61868f405ea6e90af6bb 100644 (file)
--- a/test/log/0504
+++ b/test/log/0504
@@ -3,4 +3,4 @@
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmaY-0005vi-00 == userx@myhost.test.ex 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@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@myhost.test.ex 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@myhost.test.ex 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 139fe1433e2bbcf5f2350b644efc6b09db8303c3..677934db3c39e5da39e0121e86f32e6ea38718da 100644 (file)
--- a/test/log/0511
+++ b/test/log/0511
@@ -1,22 +1,22 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex R=r1 T=t1 defer (dd): Connection refused
 1999-03-02 09:44:33 10HmaY-0005vi-00 ** CALLER@myhost.test.ex: retry timeout exceeded
 1999-03-02 09:44:33 10HmaY-0005vi-00 CALLER@myhost.test.ex: error ignored

diff --git a/test/log/0512 b/test/log/0512
index e8f84b8a2a820d20e2b13d2a5aa924c12611683d..206a2e96add16f881b5c292997795e596b869919 100644 (file)
--- a/test/log/0512
+++ b/test/log/0512
@@ -1,11 +1,11 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex R=r1 T=t1 defer (dd): Connection refused
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@myhost.test.ex: 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@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex R=r1 T=t1 defer (dd): Connection refused
 1999-03-02 09:44:33 10HmaZ-0005vi-00 ** userx@myhost.test.ex: 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 4587a6f23c62f91dd9f28cbc25e4661d6ef8a932..27279fe54bf6b9a7cdd44b54e45d7844ce672f9f 100644 (file)
--- a/test/log/0519
+++ b/test/log/0519
@@ -1,9 +1,9 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex: 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@myhost.test.ex 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@myhost.test.ex: retry timeout exceeded
 1999-03-02 09:44:33 10HmaY-0005vi-00 CALLER@myhost.test.ex: error ignored

diff --git a/test/log/0525 b/test/log/0525
index dfedcf89c05537d22e9e2232f2d5c3d82e524765..330bfbffc31f46a3595534a3a0e7588719c9a47e 100644 (file)
--- a/test/log/0525
+++ b/test/log/0525
@@ -1,3 +1,3 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex 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 0426da0e46d63d6ee7e44368f066b0428ad6c1fe..2e1513073324140349859b5b47277448dbabb790 100644 (file)
--- a/test/log/0528
+++ b/test/log/0528
@@ -1,9 +1,9 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex 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 a960f3e7bfbf24ceb659daf1da228df71d7194de..89be9cb379e56df67d7fc833859e277833202ded 100644 (file)
--- a/test/log/0531
+++ b/test/log/0531
@@ -1,5 +1,5 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=smartuser T=lmtp defer (0): LMTP error after DATA: 450 TEMPERROR
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex 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@test.ex F=<CALLER@myhost.test.ex> 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@test.ex: 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@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@retry.test.ex R=smartuser T=lmtp defer (0): LMTP error after DATA: 450 TEMPERROR
+1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@retry.test.ex 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@retry.test.ex R=smartuser T=lmtp defer (0): LMTP error after DATA: 450 TEMPERROR
+1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@retry.test.ex 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.test.ex: 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@myhost.test.ex> 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@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbB-0005vi-00 == userx@test.ex R=smartuser T=lmtp defer (-44): SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 450 TEMPERROR
+1999-03-02 09:44:33 10HmbB-0005vi-00 == userx@test.ex 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@test.ex>: 450 TEMPERROR
 1999-03-02 09:44:33 10HmbB-0005vi-00 ** userx@test.ex: 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@myhost.test.ex> F=<> R=bounces T=t1

diff --git a/test/log/0543 b/test/log/0543
index b5853272ee3a1805c0f22b31a7f2fe0bf6bc994f..bce32c568d1a9a5f4c4be5ea35a809284f350819 100644 (file)
--- a/test/log/0543
+++ b/test/log/0543
@@ -1,7 +1,7 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex 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 cc614394ab3067eea81ef9e89cb292a4c7f293f5..0d024736be008618c448ecee8758f77d949d69d2 100644 (file)
--- a/test/log/0548
+++ b/test/log/0548
@@ -1,26 +1,26 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex 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@test.ex>: 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@test.ex 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@test.ex>: 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@test.ex 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@test.ex>: 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@test.ex 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@test.ex>: 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@test.ex 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@test.ex>: 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@test.ex 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@test.ex>: 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@test.ex 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@test.ex 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@test.ex>: host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]: 451 Recipient deferred
-1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@test.ex R=smarthost T=smtp defer (-44): SMTP error from remote mail server after RCPT TO:<usery@test.ex>: 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@test.ex>: 451 Recipient deferred
+1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@test.ex 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@test.ex>: 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@test.ex>: 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@test.ex 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@test.ex>: host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]: 451 Recipient deferred
-1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@test.ex R=smarthost T=smtp defer (-44): SMTP error from remote mail server after RCPT TO:<usery@test.ex>: 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@test.ex>: 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@test.ex 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@test.ex>: 451 Recipient deferred
+1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@test.ex 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@test.ex>: 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 30da3add6b542ffed3e5f142af29d4a4705dc787..674cd57222a143806ea8fc41e564aff0a54b277f 100644 (file)
--- a/test/log/0550
+++ b/test/log/0550
@@ -1,3 +1,3 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex 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@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 450 Defer
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=r1 T=t1 defer (-45): SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: 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@myhost.test.ex>: 450 Defer
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex 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@myhost.test.ex>: 450 Defer

diff --git a/test/log/0552 b/test/log/0552
index 64d499709481cfbd7efba41ca04c5ad752aab2a4..8148c5aeb99a69b56f50105068ece8f17200a46c 100644 (file)
--- 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@myhost.test.ex 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@test.ex 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@myhost.test.ex> SIZE=ssss
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx2@test.ex 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@myhost.test.ex> SIZE=ssss
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx3@test.ex 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@myhost.test.ex> SIZE=ssss
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx1@test.ex R=r1 T=t1 defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx2@test.ex R=r1 T=t1 defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx3@test.ex R=r1 T=t1 defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after MAIL FROM:<CALLER@myhost.test.ex> 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@test.ex 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 54f94fde05779837481d6e4414aec380812b80dd..322c9b3917f0d475bf64c2ea30342e4c19011edf 100644 (file)
--- a/test/log/0553
+++ b/test/log/0553
@@ -1,8 +1,8 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex 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@test.ex 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@test.ex>
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx2@test.ex 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@test.ex>
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx3@test.ex 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@test.ex>
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx1@test.ex R=t1 T=smtp defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after RCPT TO:<userx1@test.ex>
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx2@test.ex R=t1 T=smtp defer (dd): Connection timed out: SMTP timeout after RCPT TO:<userx1@test.ex>
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx3@test.ex R=t1 T=smtp defer (dd): Connection timed out: SMTP timeout after RCPT TO:<userx1@test.ex>
 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@test.ex 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 97784ca483dba0f6b30339fec68f4fecbf2dddae..bf0e8f6b52b0fbc70b8dab3f760d973338226d5e 100644 (file)
--- a/test/log/0554
+++ b/test/log/0554
@@ -1,4 +1,4 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex 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 6685d594441c30a26d44d9c7ad08265a8ec7b8ce..68c88a33037b9c87ae8115a7fbc5c65f4522b4bc 100644 (file)
--- a/test/log/2000
+++ b/test/log/2000
@@ -1,6 +1,6 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex 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@test.ex 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 da5a78a930542b1b961e5ad46ed6bf950f67975b..13cf3702a6c4fb161b006aa133b8eb30331f62a6 100644 (file)
--- a/test/log/2001
+++ b/test/log/2001
@@ -1,11 +1,11 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex 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@test.ex 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@test.ex 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@test.ex 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@test.ex 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 9e032264772a49c79c9530be1f503cb8058278e9..5da164aad671d65fe244454c26165b73f04f7534 100644 (file)
--- a/test/log/2009
+++ b/test/log/2009
@@ -1,6 +1,6 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex 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@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 encryption required
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 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 a557710994af00f80b0a3f2a9a4dd329461e5b8c..67c8836a860fddd23a92c567b5be93277bdf104a 100644 (file)
--- a/test/log/2010
+++ b/test/log/2010
@@ -1,12 +1,12 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex 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@test.ex 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@test.ex 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@test.ex 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@test.ex: 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 bcb1e6fd8309f064d7b965bb87f3c12b3a491400..48c75d2b83dbc5c701f8a1317f1e0c7ff10a2cf0 100644 (file)
--- a/test/log/2012
+++ b/test/log/2012
@@ -3,17 +3,17 @@
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex 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@test.ex 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@test.ex 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@test.ex: retry timeout exceeded
 1999-03-02 09:44:33 10HmaX-0005vi-00 userx@test.ex: 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@test.ex 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@test.ex 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@test.ex 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 f8c7604b7149063116b3fb838e1ae35e7e0d8396..d784bfceadc21d3118ea6d811f28986908a4e109 100644 (file)
--- a/test/log/2016
+++ b/test/log/2016
@@ -1,3 +1,3 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex 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 bcb988f2ddaa87e9339368fe8752550bd0e5d917..59e8330bf3ae5fa75fb744bfd368b2e423980304 100644 (file)
--- a/test/log/2021
+++ b/test/log/2021
@@ -1,10 +1,10 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex 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@myhost.test.ex 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 fafc68d5b23f9670d79fce6f922a76e245adac1e..f8e891059f4e8e83cccce95312094f416a219bf5 100644 (file)
--- a/test/log/2025
+++ b/test/log/2025
@@ -1,6 +1,6 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex 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@test.ex 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 a54d4a5a9e8a4e44b058df46623ad51fa040b022..72967c274432933a21f693d587ef1a0ed350b928 100644 (file)
--- 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@test.ex 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@test.ex 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 f4ea5c49c4e42af1b204d975156d569bbb30c2eb..02b6f0e607971f923a95dfb508fbf57a144494c0 100644 (file)
--- a/test/log/2100
+++ b/test/log/2100
@@ -1,7 +1,7 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex 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@test.ex 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 9131e00f48bfc129d4ee8f7a97016e8e91dcb1ec..5f8befe3e6955e0a96b0ee746943d2d1b589066f 100644 (file)
--- a/test/log/2101
+++ b/test/log/2101
@@ -1,13 +1,13 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex 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@test.ex 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@test.ex 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@test.ex 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@test.ex 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 9e032264772a49c79c9530be1f503cb8058278e9..5da164aad671d65fe244454c26165b73f04f7534 100644 (file)
--- a/test/log/2109
+++ b/test/log/2109
@@ -1,6 +1,6 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex 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@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 encryption required
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 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 3727c6acdc6654e16d0a925d33be911382782621..72f08dc2020aba84688e1139f1ff7c86f71763e6 100644 (file)
--- a/test/log/2110
+++ b/test/log/2110
@@ -1,12 +1,12 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex 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@test.ex 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@test.ex 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@test.ex 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@test.ex: 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 9668585806262fac35bb47aad00170a01aca8261..0fef3f4089ea153c4aeeb7203f4f7ef8e551f8cf 100644 (file)
--- a/test/log/2111
+++ b/test/log/2111
@@ -1,6 +1,6 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex 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@test.ex 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 ea09dd9a96b6c246881a37f57cf5e1d6d7fe1676..45a0458d7528ad970f8384dcb3dce2848ea8fe24 100644 (file)
--- a/test/log/2112
+++ b/test/log/2112
@@ -4,13 +4,13 @@
 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex 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@test.ex 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@test.ex 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@test.ex: retry timeout exceeded
 1999-03-02 09:44:33 10HmaX-0005vi-00 userx@test.ex: 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@test.ex 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@test.ex 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@test.ex 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 765cfdb9c3bc3c5cf75ff45851a4be6d0482a7e5..b7968201cdbbe0aac96bc3f5df1fe7da7952b17f 100644 (file)
--- a/test/log/2116
+++ b/test/log/2116
@@ -1,3 +1,3 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex 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 534f5b82ecde577a5c1a7b3ca05aa6e40c6d8c19..d27a6ef05c1580fabf8be70b8e338cd156e763dd 100644 (file)
--- a/test/log/2120
+++ b/test/log/2120
@@ -1,6 +1,6 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex 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@myhost.test.ex 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 bcb988f2ddaa87e9339368fe8752550bd0e5d917..59e8330bf3ae5fa75fb744bfd368b2e423980304 100644 (file)
--- a/test/log/2121
+++ b/test/log/2121
@@ -1,10 +1,10 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex 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@myhost.test.ex 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 5851340f864d501c3baaa3e2f9b4f940bf2ea5a6..eb4a638fb2183c7fde4f8630bcafff049a1ba839 100644 (file)
--- a/test/log/2125
+++ b/test/log/2125
@@ -1,6 +1,6 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex 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@test.ex 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 9ee15e4817b6e95f97a555dda62f76135fe26c17..c49d0afb6b4d9dd3c215f6167c9ecf3c47d6be23 100644 (file)
--- a/test/log/2126
+++ b/test/log/2126
@@ -1,5 +1,5 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex 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@myhost.test.ex>: 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@myhost.test.ex>: 451 Temporary local problem - please try later
 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@myhost.test.ex 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@myhost.test.ex 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 91f972adb43534d4cb6011271bcf58f28a46a130..5602f677f698c207225e12f96f515504ddd38571 100644 (file)
--- 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@test.ex 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@test.ex 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 70339183baf9c9fdae3c42a61c855e6622f28c5b..9fa703510c3a5f6052e6936392cb1c767ba1b822 100644 (file)
--- a/test/log/3209
+++ b/test/log/3209
@@ -1,5 +1,5 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmaX-0005vi-00 == x@ten-1.test.ex 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@mxt7.test.ex R=lookuphost T=smtp defer (dd): Network Error

diff --git a/test/log/3401 b/test/log/3401
index 8532e4ba26e7ef3d441c9f1de6fb679ad375cfb6..322db8e8d20c37e6713361c4d1048faee629d0f4 100644 (file)
--- a/test/log/3401
+++ b/test/log/3401
@@ -9,8 +9,8 @@
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx@domain.com 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@myhost.test.ex 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@domain.com 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@domain.com 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@myhost.test.ex 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@authdomain.com 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@myhost.test.ex 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@domain.com R=try T=smtp_try: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 550 Not now
+1999-03-02 09:44:33 10HmbG-0005vi-00 ** userx@domain.com R=try T=smtp_try H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: 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@myhost.test.ex: 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 4d600ebc62c2bed1066302f53f5d12d8450ad069..b90e6edb341cb76c362e82d329338f665b20085d 100644 (file)
--- a/test/log/5440
+++ b/test/log/5440
@@ -1,7 +1,7 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex 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@test.ex 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 2a8aec4e70c7cdc51ff068a4a1484544ba65a933..243215335e796ed2ef59ba6b018b29769904b49b 100644 (file)
--- a/test/log/5450
+++ b/test/log/5450
@@ -3,13 +3,13 @@
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex 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@test.ex 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@test.ex 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 86a9babfe7f3c81ccb5bd9a63a470e5bdd3f2be2..2e65e048f67670b0d98e3018ff6848d4e951fbf1 100644 (file)
--- 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@test.ex U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => usery@test.ex 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@test.ex 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@test.ex 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@test.ex 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@test.ex 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@test.ex 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@test.ex 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@test.ex 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@test.ex 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@test.ex 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@test.ex 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@test.ex 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@test.ex 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@test.ex 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@test.ex 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@test.ex 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@test.ex 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@test.ex 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@test.ex 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@test.ex 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@test.ex 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@test.ex 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 7c9a3b976c5be2474c7f3191b6ae8e390b001171..e5b3cec1128e83ea1cfec7e1c70b40ad269ee2b7 100644 (file)
--- 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@server1.example.com 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@test.ex 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@test.ex 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@server1.example.com 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@test.ex 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@test.ex 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@server1.example.com 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@test.ex 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@test.ex 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 a7115ad1e7f0b6e6612bfd50121f5393c59005d7..3ef1fec26b0ee48b56aca2909348a373fe12551a 100644 (file)
--- 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@server1.example.com 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@test.ex R=client T=send_to_server3 defer (-37): failure while setting up TLS session
+1999-03-02 09:44:33 10HmbF-0005vi-00 == failrequire@test.ex 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@server1.example.com 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@test.ex R=client T=send_to_server3 defer (-37): failure while setting up TLS session
+1999-03-02 09:44:33 10HmbG-0005vi-00 == failrevoked@test.ex 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@server1.example.com 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@test.ex R=client T=send_to_server3 defer (-37): failure while setting up TLS session
+1999-03-02 09:44:33 10HmbH-0005vi-00 == failexpired@test.ex 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 f19900e9e7f0b85c33e8b9775239cc698e522a61..b525299f1fb02fe9c536aacb76c7ad1c506c144c 100644 (file)
--- a/test/log/5651
+++ b/test/log/5651
@@ -8,14 +8,14 @@
 1999-03-02 09:44:33 10HmbB-0005vi-00 => CALLER@test.ex 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@server1.example.com 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@test.ex 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@test.ex 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@server1.example.com 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@test.ex 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@test.ex 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@server1.example.com 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@test.ex 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@test.ex 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 16f5b31f2259ece7138972dd24216291fcad19b8..7282a7ed43086d477f02bcbf78c2f0fc719311be 100644 (file)
--- 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@server1.example.com 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@test.ex R=client T=send_to_server3 defer (-37): failure while setting up TLS session
+1999-03-02 09:44:33 10HmbF-0005vi-00 == failrequire@test.ex 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@server1.example.com 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@test.ex R=client T=send_to_server3 defer (-37): failure while setting up TLS session
+1999-03-02 09:44:33 10HmbG-0005vi-00 == failrevoked@test.ex 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@server1.example.com 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@test.ex R=client T=send_to_server3 defer (-37): failure while setting up TLS session
+1999-03-02 09:44:33 10HmbH-0005vi-00 == failexpired@test.ex 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 7f5712983f484b9ffa026bd69bccbbdf45371e1d..c3fe6497f325e9c2ff2930a0aacdb0f1f5e4526f 100644 (file)
--- 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@the.local.host.name> 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 c13fe6a3b6062ada8e46c0c89d23cd884821c876..9e85d1a40a1c0654365a161abd369c2da5ad1338 100644 (file)
--- a/test/log/5750
+++ b/test/log/5750
@@ -2,7 +2,7 @@
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex 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 e8fd95fd26a9050c363f82f197d81cffbe358853..6d382cab4c077563dcda80f254e61223c649a1a7 100644 (file)
--- a/test/log/5760
+++ b/test/log/5760
@@ -2,7 +2,7 @@
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex 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 cd5f25b1a10e962f1801e7b687d3a732182457c9..4a9257c25cc1fc611017ae5d45e70d38f577dc5d 100644 (file)
--- 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 eeac8dc204be4f8917eaf6f1e12d11873ac872a5..ad1f0e61590516ae4d04b1b16d568a7e07be37a6 100644 (file)
--- 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@myhost.test.ex
+  host 127.0.0.1 [127.0.0.1]
     SMTP error from remote mail server after RCPT TO:<fail@myhost.test.ex>:
-  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 36e4ef01473f14a9891226a8564b362e90a5c9de..df8b523c719bc1ebb22b061e8dd660f1bfc217c9 100644 (file)
--- 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@myhost.test.ex
+  host 127.0.0.1 [127.0.0.1]
     SMTP error from remote mail server after RCPT TO:<d3@myhost.test.ex>:
-  host 127.0.0.1 [127.0.0.1]: 550 hard error
+    550 hard error
   b1@myhost.test.ex
     local delivery failed
 

diff --git a/test/mail/0375.CALLER b/test/mail/0375.CALLER
index 9fc9424a9629285122d0b644415e9a9af9d978ad..72ecd229586691ace0b3540890320a3ea8340ac2 100644 (file)
--- 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@myhost.test.ex
+  host 127.0.0.1 [127.0.0.1]
     SMTP error from remote mail server after RCPT TO:<e1@myhost.test.ex>:
-  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 a35a78259b3576c424f9780243c3421e9ae8b125..d945516b19340f4f11ecae3ccf195fc7cc16ef99 100644 (file)
--- 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@test.ex
+  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@retry.test.ex
+  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@test.ex
+  host 127.0.0.1 [127.0.0.1]
     SMTP error from remote mail server after RCPT TO:<userx@test.ex>:
-  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 996dc858c13ebfb5aac27e3414a450ed6bcb4275..f9bd430c0f82e95d33934083ac1d09830b67877b 100644 (file)
--- 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@test.ex 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@far.away.ex 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@far.away.ex 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 0ae4aaa9d7240ce5bdb6764882158ef23cfb3b5e..4d612288be8c78d7b42cc4411ee5945cd2298e45 100644 (file)
--- 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@myhost.test.ex 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@domain1.com 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@domain1.com 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 4c4f9b061b6d8aaf2b533a10d7dfb6c1074a96dc..af0eb72c007c10fdeaab2e282a1222b5686467f9 100644 (file)
--- 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@myhost.test.ex 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@myhost.test.ex>: Connection timed out
-1999-03-02 09:44:33 userx@domain2.com 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@myhost.test.ex>
+1999-03-02 09:44:33 H=127.0.0.1 [127.0.0.1] SMTP timeout after MAIL FROM:<CALLER@myhost.test.ex>: Connection timed out
+1999-03-02 09:44:33 userx@domain2.com R=all T=smtp defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after MAIL FROM:<CALLER@myhost.test.ex>

diff --git a/test/msglog/0109.10HmaX-0005vi-00 b/test/msglog/0109.10HmaX-0005vi-00
index 573dae32645a64fc5826ffb0291ce6a1d2b9e4f3..842e692b46e423aa49869e089f12340e43434146 100644 (file)
--- 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@test.ex 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@non-exist.test.ex 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 5fb436cf66b3ffa17f3b44e761b11af52b90e2b3..51efc622893e1b88925ae73dad4991886b32604c 100644 (file)
--- 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@the.local.host.name U=CALLER P=local S=sss
 1999-03-02 09:44:33 userx@copy.domain <userx@copy.domain>: makecopy transport succeeded
 1999-03-02 09:44:33 usery@copy.domain <usery@copy.domain>: 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@copy.domain R=passall T=pass_on defer (dd): Network Error
 1999-03-02 09:44:33 usery@copy.domain 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@copy.domain R=passall T=pass_on defer (dd): Network Error
 1999-03-02 09:44:33 usery@copy.domain 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 9ca30818e6ea894a76c6ee9551a91cc1ec2bec52..a046fcdbadce5f405c183127509052f88d9d7aa2 100644 (file)
--- 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@copy.domain R=passall T=pass_on defer (-53): retry time not reached for any host
 1999-03-02 09:44:33 y@copy.domain 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@copy.domain R=passall T=pass_on defer (dd): Network Error
 1999-03-02 09:44:33 y@copy.domain 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 61ba18aae0b7f9625a58108f4563d9a4eecf78ae..858bd1826f657caeb6d3a050a251653f02f68000 100644 (file)
--- 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@the.local.host.name U=CALLER P=local-bsmtp S=sss id=E10HmaY-0005vi-00@the.local.host.name
 1999-03-02 09:44:33 routing failed for usery@copy.domain: 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@copy.domain 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 530806ba8d2ac1d40344b33c8579aa54215c5b02..3ac99ebd0666ee8faf3b39f00f7f7ef5d27a40ee 100644 (file)
--- 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@test.ex: Unrouteable address
 1999-03-02 09:44:33 defer@test.ex R=defer defer (-1): don't do this yet
 1999-03-02 09:44:33 ok@test.ex: succeed transport succeeded
-1999-03-02 09:44:33 SMTP error from remote mail server after RCPT TO:<fail.transport@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 Recipient refused
-1999-03-02 09:44:33 fail.transport@test.ex R=fail_transport T=fail: SMTP error from remote mail server after RCPT TO:<fail.transport@test.ex>: 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@test.ex>: 550 Recipient refused
+1999-03-02 09:44:33 fail.transport@test.ex 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@test.ex>: 550 Recipient refused

diff --git a/test/runtest b/test/runtest
index bfc02eda28e2176b9c24d3585556d673ee599a9a..421e0b3805d3c7db1208eac502f56e0b75541b13 100755 (executable)
--- 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 4d05830964b93cf84957b2e4c90dec68ba3c9235..259df4604216f7717cb6eb8fd9e4754a9d89207f 100644 (file)
--- 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@test.ex 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@test.ex R=client T=send_to_server defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined DATA: 403 Sorry temp data error
 LOG: MAIN
-  ** n00@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n00@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n00@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n00@test.ex>: 550 NO
 LOG: MAIN
-  ** n01@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n01@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n01@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n01@test.ex>: 550 NO
 LOG: MAIN
-  ** n02@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n02@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n02@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n02@test.ex>: 550 NO
 LOG: MAIN
-  ** n03@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n03@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n03@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n03@test.ex>: 550 NO
 LOG: MAIN
-  ** n04@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n04@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n04@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n04@test.ex>: 550 NO
 LOG: MAIN
-  ** n05@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n05@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n05@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n05@test.ex>: 550 NO
 LOG: MAIN
-  ** n06@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n06@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n06@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n06@test.ex>: 550 NO
 LOG: MAIN
-  ** n07@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n07@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n07@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n07@test.ex>: 550 NO
 LOG: MAIN
-  ** n08@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n08@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n08@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n08@test.ex>: 550 NO
 LOG: MAIN
-  ** n09@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n09@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n09@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n09@test.ex>: 550 NO
 LOG: MAIN
-  ** n10@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n10@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n10@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n10@test.ex>: 550 NO
 LOG: MAIN
-  ** n11@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n11@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n11@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n11@test.ex>: 550 NO
 LOG: MAIN
-  ** n12@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n12@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n12@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n12@test.ex>: 550 NO
 LOG: MAIN
-  ** n13@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n13@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n13@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n13@test.ex>: 550 NO
 LOG: MAIN
-  ** n14@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n14@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n14@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n14@test.ex>: 550 NO
 LOG: MAIN
-  ** n15@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n15@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n15@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n15@test.ex>: 550 NO
 LOG: MAIN
-  ** n16@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n16@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n16@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n16@test.ex>: 550 NO
 LOG: MAIN
-  ** n17@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n17@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n17@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n17@test.ex>: 550 NO
 LOG: MAIN
-  ** n18@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n18@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n18@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n18@test.ex>: 550 NO
 LOG: MAIN
-  ** n19@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n19@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n19@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n19@test.ex>: 550 NO
 LOG: MAIN
-  ** n20@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n20@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n20@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n20@test.ex>: 550 NO
 LOG: MAIN
-  ** n21@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n21@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n21@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n21@test.ex>: 550 NO
 LOG: MAIN
-  ** n22@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n22@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n22@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n22@test.ex>: 550 NO
 LOG: MAIN
-  ** n23@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n23@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n23@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n23@test.ex>: 550 NO
 LOG: MAIN
-  ** n24@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n24@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n24@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n24@test.ex>: 550 NO
 LOG: MAIN
-  ** n25@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n25@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n25@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n25@test.ex>: 550 NO
 LOG: MAIN
-  ** n26@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n26@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n26@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n26@test.ex>: 550 NO
 LOG: MAIN
-  ** n27@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n27@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n27@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n27@test.ex>: 550 NO
 LOG: MAIN
-  ** n28@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n28@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n28@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n28@test.ex>: 550 NO
 LOG: MAIN
-  ** n29@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n29@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n29@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n29@test.ex>: 550 NO
 LOG: MAIN
-  ** n30@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n30@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n30@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n30@test.ex>: 550 NO
 LOG: MAIN
-  ** n31@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n31@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n31@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n31@test.ex>: 550 NO
 LOG: MAIN
-  ** n32@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n32@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n32@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n32@test.ex>: 550 NO
 LOG: MAIN
-  ** n33@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n33@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n33@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n33@test.ex>: 550 NO
 LOG: MAIN
-  ** n34@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n34@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n34@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n34@test.ex>: 550 NO
 LOG: MAIN
-  ** n35@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n35@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n35@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n35@test.ex>: 550 NO
 LOG: MAIN
-  ** n36@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n36@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n36@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n36@test.ex>: 550 NO
 LOG: MAIN
-  ** n37@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n37@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n37@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n37@test.ex>: 550 NO
 LOG: MAIN
-  ** n38@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n38@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n38@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n38@test.ex>: 550 NO
 LOG: MAIN
-  ** n39@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n39@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n39@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n39@test.ex>: 550 NO
 LOG: MAIN
-  ** n40@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n40@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n40@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n40@test.ex>: 550 NO
 LOG: MAIN
-  ** n41@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n41@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n41@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n41@test.ex>: 550 NO
 LOG: MAIN
-  ** n42@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n42@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n42@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n42@test.ex>: 550 NO
 LOG: MAIN
-  ** n43@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n43@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n43@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n43@test.ex>: 550 NO
 LOG: MAIN
-  ** n44@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n44@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n44@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n44@test.ex>: 550 NO
 LOG: MAIN
-  ** n45@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n45@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n45@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n45@test.ex>: 550 NO
 LOG: MAIN
-  ** n46@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n46@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n46@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n46@test.ex>: 550 NO
 LOG: MAIN
-  ** n47@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n47@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n47@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n47@test.ex>: 550 NO
 LOG: MAIN
-  ** n48@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n48@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n48@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n48@test.ex>: 550 NO
 LOG: MAIN
-  ** n49@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n49@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n49@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n49@test.ex>: 550 NO
 LOG: MAIN
-  ** n50@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n50@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n50@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n50@test.ex>: 550 NO
 LOG: MAIN
-  ** n51@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n51@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n51@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n51@test.ex>: 550 NO
 LOG: MAIN
-  ** n52@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n52@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n52@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n52@test.ex>: 550 NO
 LOG: MAIN
-  ** n53@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n53@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n53@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n53@test.ex>: 550 NO
 LOG: MAIN
-  ** n54@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n54@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n54@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n54@test.ex>: 550 NO
 LOG: MAIN
-  ** n55@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n55@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n55@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n55@test.ex>: 550 NO
 LOG: MAIN
-  ** n56@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n56@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n56@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n56@test.ex>: 550 NO
 LOG: MAIN
-  ** n57@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n57@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n57@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n57@test.ex>: 550 NO
 LOG: MAIN
-  ** n58@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n58@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n58@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n58@test.ex>: 550 NO
 LOG: MAIN
-  ** n59@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n59@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n59@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n59@test.ex>: 550 NO
 LOG: MAIN
-  ** n60@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n60@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n60@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n60@test.ex>: 550 NO
 LOG: MAIN
-  ** n61@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n61@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n61@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n61@test.ex>: 550 NO
 LOG: MAIN
-  ** n62@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n62@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n62@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n62@test.ex>: 550 NO
 LOG: MAIN
-  ** n63@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n63@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n63@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n63@test.ex>: 550 NO
 LOG: MAIN
-  ** n64@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n64@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n64@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n64@test.ex>: 550 NO
 LOG: MAIN
-  ** n65@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n65@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n65@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n65@test.ex>: 550 NO
 LOG: MAIN
-  ** n66@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n66@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n66@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n66@test.ex>: 550 NO
 LOG: MAIN
-  ** n67@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n67@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n67@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n67@test.ex>: 550 NO
 LOG: MAIN
-  ** n68@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n68@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n68@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n68@test.ex>: 550 NO
 LOG: MAIN
-  ** n69@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n69@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n69@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n69@test.ex>: 550 NO
 LOG: MAIN
-  ** n70@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n70@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n70@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n70@test.ex>: 550 NO
 LOG: MAIN
-  ** n71@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n71@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n71@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n71@test.ex>: 550 NO
 LOG: MAIN
-  ** n72@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n72@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n72@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n72@test.ex>: 550 NO
 LOG: MAIN
-  ** n73@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n73@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n73@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n73@test.ex>: 550 NO
 LOG: MAIN
-  ** n74@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n74@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n74@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n74@test.ex>: 550 NO
 LOG: MAIN
-  ** n75@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n75@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n75@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n75@test.ex>: 550 NO
 LOG: MAIN
-  ** n76@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n76@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n76@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n76@test.ex>: 550 NO
 LOG: MAIN
-  ** n77@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n77@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n77@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n77@test.ex>: 550 NO
 LOG: MAIN
-  ** n78@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n78@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n78@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n78@test.ex>: 550 NO
 LOG: MAIN
-  ** n79@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n79@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n79@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n79@test.ex>: 550 NO
 LOG: MAIN
-  ** n80@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n80@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n80@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n80@test.ex>: 550 NO
 LOG: MAIN
-  ** n81@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n81@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n81@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n81@test.ex>: 550 NO
 LOG: MAIN
-  ** n82@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n82@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n82@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n82@test.ex>: 550 NO
 LOG: MAIN
-  ** n83@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n83@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n83@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n83@test.ex>: 550 NO
 LOG: MAIN
-  ** n84@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n84@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n84@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n84@test.ex>: 550 NO
 LOG: MAIN
-  ** n85@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n85@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n85@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n85@test.ex>: 550 NO
 LOG: MAIN
-  ** n86@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n86@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n86@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n86@test.ex>: 550 NO
 LOG: MAIN
-  ** n87@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n87@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n87@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n87@test.ex>: 550 NO
 LOG: MAIN
-  ** n88@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n88@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n88@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n88@test.ex>: 550 NO
 LOG: MAIN
-  ** n89@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n89@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n89@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n89@test.ex>: 550 NO
 LOG: MAIN
-  ** n90@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n90@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n90@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n90@test.ex>: 550 NO
 LOG: MAIN
-  ** n91@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n91@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n91@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n91@test.ex>: 550 NO
 LOG: MAIN
-  ** n92@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n92@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n92@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n92@test.ex>: 550 NO
 LOG: MAIN
-  ** n93@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n93@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n93@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n93@test.ex>: 550 NO
 LOG: MAIN
-  ** n94@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n94@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n94@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n94@test.ex>: 550 NO
 LOG: MAIN
-  ** n95@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n95@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n95@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n95@test.ex>: 550 NO
 LOG: MAIN
-  ** n96@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n96@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n96@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n96@test.ex>: 550 NO
 LOG: MAIN
-  ** n97@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n97@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n97@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n97@test.ex>: 550 NO
 LOG: MAIN
-  ** n98@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n98@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n98@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n98@test.ex>: 550 NO
 LOG: MAIN
-  ** n99@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n99@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n99@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n99@test.ex>: 550 NO
 LOG: MAIN
-  ** n100@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n100@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n100@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n100@test.ex>: 550 NO
 LOG: MAIN
-  ** n101@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n101@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n101@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n101@test.ex>: 550 NO
 LOG: MAIN
-  ** n102@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n102@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n102@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n102@test.ex>: 550 NO
 LOG: MAIN
-  ** n103@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n103@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n103@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n103@test.ex>: 550 NO
 LOG: MAIN
-  ** n104@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n104@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n104@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n104@test.ex>: 550 NO
 LOG: MAIN
-  ** n105@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n105@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n105@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n105@test.ex>: 550 NO
 LOG: MAIN
-  ** n106@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n106@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n106@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n106@test.ex>: 550 NO
 LOG: MAIN
-  ** n107@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n107@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n107@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n107@test.ex>: 550 NO
 LOG: MAIN
-  ** n108@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n108@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n108@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n108@test.ex>: 550 NO
 LOG: MAIN
-  ** n109@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n109@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n109@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n109@test.ex>: 550 NO
 LOG: MAIN
-  ** n110@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n110@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n110@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n110@test.ex>: 550 NO
 LOG: MAIN
-  ** n111@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n111@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n111@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n111@test.ex>: 550 NO
 LOG: MAIN
-  ** n112@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n112@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n112@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n112@test.ex>: 550 NO
 LOG: MAIN
-  ** n113@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n113@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n113@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n113@test.ex>: 550 NO
 LOG: MAIN
-  ** n114@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n114@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n114@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n114@test.ex>: 550 NO
 LOG: MAIN
-  ** n115@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n115@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n115@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n115@test.ex>: 550 NO
 LOG: MAIN
-  ** n116@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n116@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n116@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n116@test.ex>: 550 NO
 LOG: MAIN
-  ** n117@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n117@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n117@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n117@test.ex>: 550 NO
 LOG: MAIN
-  ** n118@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n118@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n118@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n118@test.ex>: 550 NO
 LOG: MAIN
-  ** n119@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n119@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n119@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n119@test.ex>: 550 NO
 LOG: MAIN
-  ** n120@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n120@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n120@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n120@test.ex>: 550 NO
 LOG: MAIN
-  ** n121@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n121@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n121@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n121@test.ex>: 550 NO
 LOG: MAIN
-  ** n122@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n122@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n122@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n122@test.ex>: 550 NO
 LOG: MAIN
-  ** n123@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n123@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n123@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n123@test.ex>: 550 NO
 LOG: MAIN
-  ** n124@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n124@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n124@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n124@test.ex>: 550 NO
 LOG: MAIN
-  ** n125@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n125@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n125@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n125@test.ex>: 550 NO
 LOG: MAIN
-  ** n126@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n126@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n126@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n126@test.ex>: 550 NO
 LOG: MAIN
-  ** n127@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n127@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n127@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n127@test.ex>: 550 NO
 LOG: MAIN
-  ** n128@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n128@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n128@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n128@test.ex>: 550 NO
 LOG: MAIN
-  ** n129@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n129@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n129@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n129@test.ex>: 550 NO
 LOG: MAIN
-  ** n130@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n130@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n130@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n130@test.ex>: 550 NO
 LOG: MAIN
-  ** n131@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n131@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n131@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n131@test.ex>: 550 NO
 LOG: MAIN
-  ** n132@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n132@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n132@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n132@test.ex>: 550 NO
 LOG: MAIN
-  ** n133@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n133@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n133@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n133@test.ex>: 550 NO
 LOG: MAIN
-  ** n134@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n134@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n134@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n134@test.ex>: 550 NO
 LOG: MAIN
-  ** n135@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n135@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n135@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n135@test.ex>: 550 NO
 LOG: MAIN
-  ** n136@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n136@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n136@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n136@test.ex>: 550 NO
 LOG: MAIN
-  ** n137@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n137@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n137@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n137@test.ex>: 550 NO
 LOG: MAIN
-  ** n138@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n138@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n138@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n138@test.ex>: 550 NO
 LOG: MAIN
-  ** n139@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n139@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n139@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n139@test.ex>: 550 NO
 LOG: MAIN
-  ** n140@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n140@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n140@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n140@test.ex>: 550 NO
 LOG: MAIN
-  ** n141@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n141@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n141@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n141@test.ex>: 550 NO
 LOG: MAIN
-  ** n142@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n142@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n142@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n142@test.ex>: 550 NO
 LOG: MAIN
-  ** n143@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n143@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n143@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n143@test.ex>: 550 NO
 LOG: MAIN
-  ** n144@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n144@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n144@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n144@test.ex>: 550 NO
 LOG: MAIN
-  ** n145@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n145@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n145@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n145@test.ex>: 550 NO
 LOG: MAIN
-  ** n146@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n146@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n146@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n146@test.ex>: 550 NO
 LOG: MAIN
-  ** n147@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n147@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n147@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n147@test.ex>: 550 NO
 LOG: MAIN
-  ** n148@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n148@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n148@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n148@test.ex>: 550 NO
 LOG: MAIN
-  ** n149@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n149@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n149@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n149@test.ex>: 550 NO
 LOG: MAIN
-  ** n150@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n150@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n150@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n150@test.ex>: 550 NO
 LOG: MAIN
-  ** n151@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n151@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n151@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n151@test.ex>: 550 NO
 LOG: MAIN
-  ** n152@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n152@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n152@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n152@test.ex>: 550 NO
 LOG: MAIN
-  ** n153@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n153@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n153@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n153@test.ex>: 550 NO
 LOG: MAIN
-  ** n154@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n154@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n154@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n154@test.ex>: 550 NO
 LOG: MAIN
-  ** n155@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n155@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n155@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n155@test.ex>: 550 NO
 LOG: MAIN
-  ** n156@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n156@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n156@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n156@test.ex>: 550 NO
 LOG: MAIN
-  ** n157@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n157@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n157@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n157@test.ex>: 550 NO
 LOG: MAIN
-  ** n158@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n158@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n158@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n158@test.ex>: 550 NO
 LOG: MAIN
-  ** n159@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n159@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n159@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n159@test.ex>: 550 NO
 LOG: MAIN
-  ** n160@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n160@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n160@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n160@test.ex>: 550 NO
 LOG: MAIN
-  ** n161@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n161@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n161@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n161@test.ex>: 550 NO
 LOG: MAIN
-  ** n162@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n162@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n162@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n162@test.ex>: 550 NO
 LOG: MAIN
-  ** n163@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n163@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n163@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n163@test.ex>: 550 NO
 LOG: MAIN
-  ** n164@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n164@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n164@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n164@test.ex>: 550 NO
 LOG: MAIN
-  ** n165@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n165@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n165@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n165@test.ex>: 550 NO
 LOG: MAIN
-  ** n166@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n166@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n166@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n166@test.ex>: 550 NO
 LOG: MAIN
-  ** n167@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n167@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n167@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n167@test.ex>: 550 NO
 LOG: MAIN
-  ** n168@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n168@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n168@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n168@test.ex>: 550 NO
 LOG: MAIN
-  ** n169@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n169@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n169@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n169@test.ex>: 550 NO
 LOG: MAIN
-  ** n170@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n170@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n170@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n170@test.ex>: 550 NO
 LOG: MAIN
-  ** n171@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n171@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n171@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n171@test.ex>: 550 NO
 LOG: MAIN
-  ** n172@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n172@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n172@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n172@test.ex>: 550 NO
 LOG: MAIN
-  ** n173@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n173@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n173@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n173@test.ex>: 550 NO
 LOG: MAIN
-  ** n174@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n174@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n174@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n174@test.ex>: 550 NO
 LOG: MAIN
-  ** n175@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n175@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n175@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n175@test.ex>: 550 NO
 LOG: MAIN
-  ** n176@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n176@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n176@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n176@test.ex>: 550 NO
 LOG: MAIN
-  ** n177@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n177@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n177@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n177@test.ex>: 550 NO
 LOG: MAIN
-  ** n178@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n178@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n178@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n178@test.ex>: 550 NO
 LOG: MAIN
-  ** n179@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n179@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n179@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n179@test.ex>: 550 NO
 LOG: MAIN
-  ** n180@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n180@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n180@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n180@test.ex>: 550 NO
 LOG: MAIN
-  ** n181@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n181@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n181@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n181@test.ex>: 550 NO
 LOG: MAIN
-  ** n182@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n182@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n182@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n182@test.ex>: 550 NO
 LOG: MAIN
-  ** n183@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n183@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n183@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n183@test.ex>: 550 NO
 LOG: MAIN
-  ** n184@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n184@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n184@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n184@test.ex>: 550 NO
 LOG: MAIN
-  ** n185@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n185@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n185@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n185@test.ex>: 550 NO
 LOG: MAIN
-  ** n186@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n186@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n186@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n186@test.ex>: 550 NO
 LOG: MAIN
-  ** n187@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n187@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n187@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n187@test.ex>: 550 NO
 LOG: MAIN
-  ** n188@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n188@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n188@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n188@test.ex>: 550 NO
 LOG: MAIN
-  ** n189@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n189@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n189@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n189@test.ex>: 550 NO
 LOG: MAIN
-  ** n190@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n190@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n190@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n190@test.ex>: 550 NO
 LOG: MAIN
-  ** n191@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n191@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n191@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n191@test.ex>: 550 NO
 LOG: MAIN
-  ** n192@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n192@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n192@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n192@test.ex>: 550 NO
 LOG: MAIN
-  ** n193@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n193@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n193@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n193@test.ex>: 550 NO
 LOG: MAIN
-  ** n194@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n194@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n194@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n194@test.ex>: 550 NO
 LOG: MAIN
-  ** n195@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n195@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n195@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n195@test.ex>: 550 NO
 LOG: MAIN
-  ** n196@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n196@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n196@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n196@test.ex>: 550 NO
 LOG: MAIN
-  ** n197@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n197@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n197@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n197@test.ex>: 550 NO
 LOG: MAIN
-  ** n198@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n198@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n198@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n198@test.ex>: 550 NO
 LOG: MAIN
-  ** n199@test.ex R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<n199@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** n199@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n199@test.ex>: 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 bf017625609ca6296fd137c6324f6d7ced7f651a..4c74ff2943913bea1571507f9fe3d0d393cd770f 100644 (file)
--- 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@test.ex F=<CALLER@test.ex> R=client T=send_to_server: SMTP error from remote mail server after MAIL FROM:<CALLER@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** a@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@test.ex>: 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@test.ex 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@test.ex F=<CALLER@test.ex> R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<b@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 Unknown
+  ** b@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<b@test.ex>: 550 Unknown
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user

diff --git a/test/stderr/0276 b/test/stderr/0276
index c721ff784e06e95104d7b82dd2166a07d36500ef..2b01713f803c58258af9409020c5f4cbde16dd99 100644 (file)
--- 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@test.ex 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@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined DATA: 500 NO
 LOG: MAIN
   <= <> 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@test.ex 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@test.ex R=r1 T=t1: SMTP error from remote mail server after DATA: host 127.0.0.1 [127.0.0.1]: 500 NO
+  ** userx@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after DATA: 500 NO
 LOG: MAIN
   <= <> 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@test.ex R=r1 T=t1 defer (dd): Connection refused
 LOG: MAIN

diff --git a/test/stderr/0357 b/test/stderr/0357
index 4b7798c530dca05c9b9841fa18676422f0608e16..6073e8c62889b53bbe0a9522518b1c27295b0a49 100644 (file)
--- a/test/stderr/0357
+++ b/test/stderr/0357
@@ -28,7 +28,7 @@ added retry item for R:userx@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A
 reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess
   added retry item
 LOG: MAIN
-  == userx@test.ex R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+  == userx@test.ex 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@test.ex>: 451 Temporary error
 Processing retry items
 Succeeded addresses:
 Failed addresses:
@@ -39,7 +39,7 @@ retry for R:userx@test.ex:<CALLER@test.ex> = * 0 0
 failing_interval=ttt message_age=ttt
 Writing retry data for R:userx@test.ex:<CALLER@test.ex>
   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@test.ex>: 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@test.ex>: 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@test.ex from subprocess
 reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess
   delete item not added: non-delete item exists
 LOG: MAIN
-  == userx@test.ex R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+  == userx@test.ex 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@test.ex>: 451 Temporary error
 Processing retry items
 Succeeded addresses:
 Failed addresses:
@@ -92,7 +92,7 @@ retry for R:userx@test.ex:<CALLER@test.ex> = * 0 0
 failing_interval=ttt message_age=ttt
 Writing retry data for R:userx@test.ex:<CALLER@test.ex>
   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@test.ex>: 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@test.ex>: 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@test.ex from subprocess
 reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess
   delete item not added: non-delete item exists
 LOG: MAIN
-  == userx@test.ex R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+  == userx@test.ex 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@test.ex>: 451 Temporary error
 Processing retry items
 Succeeded addresses:
 Failed addresses:
@@ -146,7 +146,7 @@ retry for R:userx@test.ex:<CALLER@test.ex> = * 0 0
 failing_interval=ttt message_age=ttt
 Writing retry data for R:userx@test.ex:<CALLER@test.ex>
   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@test.ex>: 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@test.ex>: 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 b2d9a13a103d021474186005fb153d3f8f04070d..7eec3d43f8726c9bf04a4fe226fdac1c6a8d3688 100644 (file)
--- a/test/stderr/0358
+++ b/test/stderr/0358
@@ -36,9 +36,9 @@ reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess
 reading retry information for R:usery@test.ex:<CALLER@test.ex> from subprocess
   added retry item
 LOG: MAIN
-  == userx@test.ex R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+  == userx@test.ex 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@test.ex>: 451 Temporary error
 LOG: MAIN
-  == usery@test.ex R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<usery@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+  == usery@test.ex 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@test.ex>: 451 Temporary error
 Processing retry items
 Succeeded addresses:
 Failed addresses:
@@ -49,13 +49,13 @@ retry for R:usery@test.ex:<CALLER@test.ex> = * 0 0
 failing_interval=ttt message_age=ttt
 Writing retry data for R:usery@test.ex:<CALLER@test.ex>
   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@test.ex>: 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@test.ex>: 451 Temporary error
 userx@test.ex
 retry for R:userx@test.ex:<CALLER@test.ex> = * 0 0
 failing_interval=ttt message_age=ttt
 Writing retry data for R:userx@test.ex:<CALLER@test.ex>
   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@test.ex>: 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@test.ex>: 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@test.ex from subprocess
 reading retry information for R:usery@test.ex:<CALLER@test.ex> from subprocess
   delete item not added: non-delete item exists
 LOG: MAIN
-  == userx@test.ex R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+  == userx@test.ex 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@test.ex>: 451 Temporary error
 LOG: MAIN
-  == usery@test.ex R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<usery@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+  == usery@test.ex 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@test.ex>: 451 Temporary error
 Processing retry items
 Succeeded addresses:
 Failed addresses:
@@ -129,7 +129,7 @@ retry for R:usery@test.ex:<CALLER@test.ex> = * 0 0
 failing_interval=ttt message_age=ttt
 Writing retry data for R:usery@test.ex:<CALLER@test.ex>
   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@test.ex>: 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@test.ex>: 451 Temporary error
 userx@test.ex
 deleted retry information for R:userx@test.ex
 deleted retry information for R:test.ex
@@ -137,7 +137,7 @@ retry for R:userx@test.ex:<CALLER@test.ex> = * 0 0
 failing_interval=ttt message_age=ttt
 Writing retry data for R:userx@test.ex:<CALLER@test.ex>
   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@test.ex>: 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@test.ex>: 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 cf1104120e84ecb3cdfff6e00108177b8e894ef7..05bc2460e3ada038a4b1aa82a1ce80e6eba8d651 100644 (file)
--- a/test/stderr/0374
+++ b/test/stderr/0374
@@ -370,11 +370,11 @@ LOG: MAIN
   => d1@myhost.test.ex R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1] C="250 OK"
 locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
-  == d2@myhost.test.ex R=ut4 T=ut4 defer (-44): SMTP error from remote mail server after RCPT TO:<d2@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 450 soft error
+  == d2@myhost.test.ex R=ut4 T=ut4 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d2@myhost.test.ex>: 450 soft error
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-ut4.lockfile
 LOG: MAIN
-  ** d3@myhost.test.ex R=ut4 T=ut4: SMTP error from remote mail server after RCPT TO:<d3@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 550 hard error
+  ** d3@myhost.test.ex R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d3@myhost.test.ex>: 550 hard error
 locking TESTSUITE/spool/db/retry.lockfile
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config

diff --git a/test/stderr/0375 b/test/stderr/0375
index 37ed2d839bff155af196b341287fd27fb0c8afe9..6135f0f8015b454f46a744bdb9f4687d5459a07e 100644 (file)
--- 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@myhost.test.ex R=ut4 T=ut4 defer (-44): SMTP error from remote mail server after RCPT TO:<d2@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 450 soft error
+  == d2@myhost.test.ex R=ut4 T=ut4 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d2@myhost.test.ex>: 450 soft error
 log writing disabled
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-ut4.lockfile
 LOG: MAIN
-  ** d3@myhost.test.ex P=<> R=ut4 T=ut4: SMTP error from remote mail server after RCPT TO:<d3@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 550 hard error
+  ** d3@myhost.test.ex P=<> R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d3@myhost.test.ex>: 550 hard error
 log writing disabled
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-ut5.lockfile
 LOG: MAIN
-  ** e1@myhost.test.ex P=<> R=ut5 T=ut5: SMTP error from remote mail server after RCPT TO:<e1@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 550 hard error
+  ** e1@myhost.test.ex P=<> R=ut5 T=ut5 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<e1@myhost.test.ex>: 550 hard error
 log writing disabled
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-ut6.lockfile
@@ -825,12 +825,12 @@ LOG: MAIN
 log writing disabled
 locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
-  == f2@myhost.test.ex R=ut6 T=ut6 defer (-44): SMTP error from remote mail server after RCPT TO:<f2@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 450 soft error
+  == f2@myhost.test.ex R=ut6 T=ut6 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<f2@myhost.test.ex>: 450 soft error
 log writing disabled
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-ut6.lockfile
 LOG: MAIN
-  ** f3@myhost.test.ex P=<CALLER@myhost.test.ex> R=ut6 T=ut6: SMTP error from remote mail server after RCPT TO:<f3@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 550 hard error
+  ** f3@myhost.test.ex P=<CALLER@myhost.test.ex> R=ut6 T=ut6 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<f3@myhost.test.ex>: 550 hard error
 log writing disabled
 locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN

diff --git a/test/stderr/0388 b/test/stderr/0388
index 98df1fdb31bedc40d81a5ba9d0a1610a5a01722c..a7a266418c8b7dd83ad379c27e0ff532b0ecab4a 100644 (file)
--- 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 ef478aa3923ee4143d5a8935175a4756e1b1256a..2be2c7db19cfaa1edf91e11450832865ab347fc7 100644 (file)
--- 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@uppercase.test.ex R=r1 T=t1: SMTP error from remote mail server after RCPT TO:<x@UpperCase.test.ex>: host uppercase.test.ex [127.0.0.1]: 550 Unknown
+  ** x@uppercase.test.ex R=r1 T=t1 H=uppercase.test.ex [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@UpperCase.test.ex>: 550 Unknown
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user

diff --git a/test/stderr/0450 b/test/stderr/0450
index aeadb6ff25c7f90b0ab359fe847da91697665765..24e66a15219171260fab719de4c279d878fe3e27 100644 (file)
--- 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@test.ex)
 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@test.ex)
 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 b6e954eb05994b23209ffc0f4a04f3591a128a63..f0dc33650a4ec18adad5031cfc7778ca850f07db 100644 (file)
--- 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@test.ex: result OK
 Leaving t1 transport
 set_process_info: pppp delivering 10HmaX-0005vi-00 (just run t1 for userx@test.ex 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@test.ex R=r1 T=t1: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** userx@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 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@the.local.host.name
 set_process_info: pppp delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (CALLER@the.local.host.name)
 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@the.local.host.name: 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 d9d8a9a62c15db10ead2d0dca5a15e9647f43a1e..b00cfd572cc3d1c48062bd22f61b99e093ce164c 100644 (file)
--- 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@x.y>: host 127.0.0.1 [127.0.0.1]: 550 NOTOK
-Delivery failed: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 550 BAD MAIL
-Delivery failed: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: 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@x.y>: 550 NOTOK
+Delivery failed: H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: 550 BAD MAIL
+Delivery failed: H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: 450 TEMPORARY MAIL FAIL
 routing file@x.y yielded a local delivery
 routing fail@x.y yielded a failed delivery: forcible fail message
 routing defer@x.y 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@x.y>
+Delivery failed: Connection timed out: H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP timeout after RCPT TO:<b@x.y>
 Delivery failed: TCP port "nonexistent" is not defined for t4 transport
-Delivery failed: SMTP error from remote mail server after RCPT TO:<a@x.y>: 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@x.y>: 550 SORRY

diff --git a/test/stderr/0512 b/test/stderr/0512
index c1da4dc3e66ebe3a5f7a61e8e69909e3d6cf9335..e107ff313adcfcfbbda22c3771022d71bbe9534b 100644 (file)
--- 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@myhost.test.ex)
 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@myhost.test.ex)
 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@myhost.test.ex)
 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@myhost.test.ex)
 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@myhost.test.ex)
 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@myhost.test.ex)
 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 3eecf9ac5411379e82cae4f9fffc0d68d7d2e9cf..553f8c1ce3adff70a58feab901b71b0269406b56 100644 (file)
--- 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 17e8f4da419e8bc81e4bb88250412d8a1f819336..5cabbf9aed772f2cc8360fb63af72200c51e011d 100644 (file)
--- a/test/stderr/0554
+++ b/test/stderr/0554
@@ -21,7 +21,7 @@ added retry item for R:x@y:<CALLER@myhost.test.ex>: errno=-44 more_errno=dd,A fl
 reading retry information for R:x@y:<CALLER@myhost.test.ex> 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@myhost.test.ex> = * 0 0
 failing_interval=ttt message_age=ttt
 Writing retry data for R:x@y:<CALLER@myhost.test.ex>
   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 2d5a7602de4f6bd2ca6500cbac8ebf22314c44a7..d3dd7cffc24287a9770a59f0e1f3f49449c4e31a 100644 (file)
--- 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 f7864bf4b9dfea999658868e8ff1e156341caab6..648513eab4be55a3ef19d6e2fa12653fefd26c78 100644 (file)
--- a/test/stdout/0357
+++ b/test/stdout/0357
@@ -1,11 +1,11 @@
 +++++++++++++++++++++++++++
-  R:userx@test.ex:<CALLER@test.ex> -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+  R:userx@test.ex:<CALLER@test.ex> -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error
 first failed = time last try = time2 next try = time2 + 1
 +++++++++++++++++++++++++++
-  R:userx@test.ex:<CALLER@test.ex> -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+  R:userx@test.ex:<CALLER@test.ex> -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error
 first failed = time last try = time2 next try = time2 + 1
 +++++++++++++++++++++++++++
-  R:userx@test.ex:<CALLER@test.ex> -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+  R:userx@test.ex:<CALLER@test.ex> -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 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 ab77a784ee57a649e9a06c9c14ef4d39438b81c8..80553ee2b88db36a0d7a9eb08465820f5dd45321 100644 (file)
--- a/test/stdout/0358
+++ b/test/stdout/0358
@@ -1,12 +1,12 @@
 +++++++++++++++++++++++++++
-  R:userx@test.ex:<CALLER@test.ex> -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+  R:userx@test.ex:<CALLER@test.ex> -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error
 first failed = time last try = time2 next try = time2 + 1
-  R:usery@test.ex:<CALLER@test.ex> -44 13121 SMTP error from remote mail server after RCPT TO:<usery@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+  R:usery@test.ex:<CALLER@test.ex> -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@test.ex>: 451 Temporary error
 first failed = time last try = time2 next try = time2 + 1
 +++++++++++++++++++++++++++
-  R:userx@test.ex:<CALLER@test.ex> -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+  R:userx@test.ex:<CALLER@test.ex> -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error
 first failed = time last try = time2 next try = time2 + 2
-  R:usery@test.ex:<CALLER@test.ex> -44 13121 SMTP error from remote mail server after RCPT TO:<usery@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+  R:usery@test.ex:<CALLER@test.ex> -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@test.ex>: 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 ee42c1e3262553ecd11b6563ffaddac93a9bbd2a..f00a7d80b782c437e7f4cfaacfc66d9a1fd436c6 100644 (file)
--- 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@the.local.host.name>: 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@the.local.host.name>: 850 RUBBISH
 first failed = time last try = time2 next try = time2 + 10
 +++++++++++++++++++++++++++
-  R:abcd@xyz:<CALLER@the.local.host.name> -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@the.local.host.name> -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 3462fd1b349e872d1d3a6a7405a729eb92c00bb3..e179e58a2725025b679bd794416e9033a8c3c607 100644 (file)
--- 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@myhost.test.ex>: 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@myhost.test.ex>: 452 temporary error
 first failed = time last try = time2 next try = time2 + 0 *
 +++++++++++++++++++++++++++
-  R:userx@x.y:<CALLER@myhost.test.ex> -44 13377 SMTP error from remote mail server after RCPT TO:<userx@x.y>: host 127.0.0.1 [127.0.0.1]: 452 temporary error
+  R:userx@x.y:<CALLER@myhost.test.ex> -44 13377 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@x.y>: 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 f1448ba45eb8f4c56538a854072c166a43e7328f..61a27bee9aee38dc5b4393e7ae6ff1d22a678fef 100644 (file)
--- 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@myhost.test.ex>: 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@myhost.test.ex>: 450 DELAY
 first failed = time last try = time2 next try = time2 + 10
 
 ******** SERVER ********

diff --git a/test/stdout/0548 b/test/stdout/0548
index b12491f7a8dbd3bdef4a67a4fd5a9d3540a609fb..7f7d788b664afec34b1f1bb9ccb1c8c05a7ffc4c 100644 (file)
--- a/test/stdout/0548
+++ b/test/stdout/0548
@@ -1,15 +1,15 @@
 +++++++++++++++++++++++++++
-  R:userx@test.ex:<CALLER@test.ex> -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]: 451 Recipient deferred
+  R:userx@test.ex:<CALLER@test.ex> -44 13121 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 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@test.ex:<CALLER@test.ex> -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]: 451 Recipient deferred
+  R:userx@test.ex:<CALLER@test.ex> -44 13121 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 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@test.ex:<CALLER@test.ex> -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]: 451 Recipient deferred
+  R:userx@test.ex:<CALLER@test.ex> -44 13121 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 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 8c0cfea8abd33098537c89380b7ee2164c4ef646..2f38af2b5aeea32ab0e11bb02a23e00a20f6702b 100644 (file)
--- a/test/stdout/0554
+++ b/test/stdout/0554
@@ -1,5 +1,5 @@
 +++++++++++++++++++++++++++
-  R:x@y:<CALLER@myhost.test.ex> -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@myhost.test.ex> -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
 +++++++++++++++++++++++++++