Merge branch 'master' into 4.next

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index f3c7a060e8fbfd9da0dc3a6e0c657ee77cb23ae5..e3ac7f3b930bb2537b5c620d54a66ab98dbbdfda 100644 (file)
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -17133,6 +17133,9 @@ use when sending messages as a client, you must set the &%tls_certificate%&
 option in the relevant &(smtp)& transport.
 
 .new
+&*Note*&: If you use filenames based on IP addresses, change the list
+separator in the usual way to avoid confusion under IPv6.
+
 &*Note*&: Under current versions of OpenSSL, when a list of more than one
 file is used, the &$tls_in_ourcert$& veriable is unreliable.
 .wen
@@ -31327,6 +31330,7 @@ address and some time-based randomizing information. The &%prvs%& expansion
 item creates a signed address, and the &%prvscheck%& expansion item checks one.
 The syntax of these expansion items is described in section
 &<<SECTexpansionitems>>&.
+The validity period on signed addresses is seven days.
 
 As an example, suppose the secret per-address keys are stored in an MySQL
 database. A query to look up the key for an address could be defined as a macro

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 00377b9ff2af9a7c0ffa6c7a89e80822ef5fc7a6..0ea49a280132de83a34d923389ad0c31deea3a03 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -193,6 +193,10 @@ JH/33 Downgrade an unfound-list name (usually a typo in the config file) from
       something like "domains check lookup or other defer".  The SMTP 451
       message is still "Temporary local problem".
 
+JH/34 Bug 2199: Fix a use-after-free while reading smtp input for header lines.
+      A crafted sequence of BDAT commands could result in in-use memory beeing
+      freed.
+
 
 Exim version 4.89
 -----------------

diff --git a/src/src/configure.default b/src/src/configure.default
index b828ca20adb1f7af3b7c6ab1953d006007b23604..1dc9b913d95f93d841d5860344480cdcd2e7e7c7 100644 (file)
--- a/src/src/configure.default
+++ b/src/src/configure.default
@@ -154,7 +154,7 @@ acl_smtp_data = acl_check_data
 # tls_privatekey = /etc/ssl/exim.pem
 
 # For OpenSSL, prefer EC- over RSA-authenticated ciphers
-# tls_require_ciphers = ECDSA:RSA:!COMPLEMENTOFDEFAILT
+# tls_require_ciphers = ECDSA:RSA:!COMPLEMENTOFDEFAULT
 
 # In order to support roaming users who wish to send email from anywhere,
 # you may want to make Exim listen on other ports as well as port 25, in

diff --git a/src/src/deliver.c b/src/src/deliver.c
index a7f561c9c355fe6b4cb20d0b05b251c4b3d14aa2..de552f4cc0931642af59e2c227b878aa51111714 100644 (file)
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -8551,8 +8551,11 @@ if (cutthrough.fd >= 0 && cutthrough.callout_hold_only)
       goto fail;
 
     else if (pid == 0)         /* child: fork again to totally disconnect */
+      {
+      if (running_in_test_harness) millisleep(100); /* let parent debug out */
       /* does not return */
       smtp_proxy_tls(big_buffer, big_buffer_size, pfd, 5*60);
+      }
 
     DEBUG(D_transport) debug_printf("proxy-proc inter-pid %d\n", pid);
     close(pfd[0]);

diff --git a/src/src/expand.c b/src/src/expand.c
index f44ddf8b828c2c8f60cd2a8976b5862dd671a736..e754fbc8cd3c8d25531153754cf8ed66032539bb 100644 (file)
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -17,22 +17,22 @@ static uschar *expand_string_internal(const uschar *, BOOL, const uschar **, BOO
 static int_eximarith_t expanded_string_integer(const uschar *, BOOL);
 
 #ifdef STAND_ALONE
-#ifndef SUPPORT_CRYPTEQ
-#define SUPPORT_CRYPTEQ
-#endif
+# ifndef SUPPORT_CRYPTEQ
+#  define SUPPORT_CRYPTEQ
+# endif
 #endif
 
 #ifdef LOOKUP_LDAP
-#include "lookups/ldap.h"
+# include "lookups/ldap.h"
 #endif
 
 #ifdef SUPPORT_CRYPTEQ
-#ifdef CRYPT_H
-#include <crypt.h>
-#endif
-#ifndef HAVE_CRYPT16
+# ifdef CRYPT_H
+#  include <crypt.h>
+# endif
+# ifndef HAVE_CRYPT16
 extern char* crypt16(char*, char*);
-#endif
+# endif
 #endif
 
 /* The handling of crypt16() is a mess. I will record below the analysis of the
@@ -4494,25 +4494,25 @@ while (*s != 0)
       if (skipping) continue;
 
       /* sub_arg[0] is the address */
-      domain = Ustrrchr(sub_arg[0],'@');
-      if ( (domain == NULL) || (domain == sub_arg[0]) || (Ustrlen(domain) == 1) )
+      if (  !(domain = Ustrrchr(sub_arg[0],'@'))
+        || domain == sub_arg[0] || Ustrlen(domain) == 1)
         {
         expand_string_message = US"prvs first argument must be a qualified email address";
         goto EXPAND_FAILED;
         }
 
-      /* Calculate the hash. The second argument must be a single-digit
+      /* Calculate the hash. The third argument must be a single-digit
       key number, or unset. */
 
-      if (sub_arg[2] != NULL &&
-          (!isdigit(sub_arg[2][0]) || sub_arg[2][1] != 0))
+      if (  sub_arg[2]
+         && (!isdigit(sub_arg[2][0]) || sub_arg[2][1] != 0))
         {
-        expand_string_message = US"prvs second argument must be a single digit";
+        expand_string_message = US"prvs third argument must be a single digit";
         goto EXPAND_FAILED;
         }
 
-      p = prvs_hmac_sha1(sub_arg[0],sub_arg[1],sub_arg[2],prvs_daystamp(7));
-      if (p == NULL)
+      p = prvs_hmac_sha1(sub_arg[0], sub_arg[1], sub_arg[2], prvs_daystamp(7));
+      if (!p)
         {
         expand_string_message = US"prvs hmac-sha1 conversion failed";
         goto EXPAND_FAILED;
@@ -4628,7 +4628,7 @@ while (*s != 0)
             prvscheck_result = US"1";
             DEBUG(D_expand) debug_printf_indent("prvscheck: success, $pvrs_result set to 1\n");
             }
-            else
+         else
             {
             prvscheck_result = NULL;
             DEBUG(D_expand) debug_printf_indent("prvscheck: signature expired, $pvrs_result unset\n");

diff --git a/src/src/receive.c b/src/src/receive.c
index e7e518a921b3c3e6d42ac16ff978ac9f18b52940..d9b500102af6cad10275713fdbd4b34a5c22d22b 100644 (file)
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -1810,8 +1810,8 @@ for (;;)
   (and sometimes lunatic messages can have ones that are 100s of K long) we
   call store_release() for strings that have been copied - if the string is at
   the start of a block (and therefore the only thing in it, because we aren't
-  doing any other gets), the block gets freed. We can only do this because we
-  know there are no other calls to store_get() going on. */
+  doing any other gets), the block gets freed. We can only do this release if
+  there were no allocations since the once that we want to free. */
 
   if (ptr >= header_size - 4)
     {
@@ -1820,9 +1820,10 @@ for (;;)
     header_size *= 2;
     if (!store_extend(next->text, oldsize, header_size))
       {
+      BOOL release_ok = store_last_get[store_pool] == next->text;
       uschar *newtext = store_get(header_size);
       memcpy(newtext, next->text, ptr);
-      store_release(next->text);
+      if (release_ok) store_release(next->text);
       next->text = newtext;
       }
     }

diff --git a/src/src/route.c b/src/src/route.c
index c112169f79cdeb530ec91d011fc4a3b07c2ce16e..83cf468b0f5820daebcab48f38983c9e6ca36b9d 100644 (file)
--- a/src/src/route.c
+++ b/src/src/route.c
@@ -244,14 +244,12 @@ for (r = routers; r; r = r->next)
 
   /* Check for transport or no transport on certain routers */
 
-  if ((r->info->ri_flags & ri_yestransport) != 0 &&
-      r->transport_name == NULL &&
-      !r->verify_only)
+  if (  (r->info->ri_flags & ri_yestransport)
+     && !r->transport_name && !r->verify_only)
     log_write(0, LOG_PANIC_DIE|LOG_CONFIG, "%s router:\n  "
       "a transport is required for this router", r->name);
 
-  if ((r->info->ri_flags & ri_notransport) != 0 &&
-       r->transport_name != NULL)
+  if ((r->info->ri_flags & ri_notransport) && r->transport_name)
     log_write(0, LOG_PANIC_DIE|LOG_CONFIG, "%s router:\n  "
       "a transport must not be defined for this router", r->name);
 
@@ -292,14 +290,16 @@ for (r = routers; r; r = r->next)
 
   /* Check redirect_router and pass_router are valid */
 
-  if (r->redirect_router_name != NULL)
+  if (r->redirect_router_name)
     set_router(r, r->redirect_router_name, &(r->redirect_router), FALSE);
 
-  if (r->pass_router_name != NULL)
+  if (r->pass_router_name)
     set_router(r, r->pass_router_name, &(r->pass_router), TRUE);
 
+#ifdef notdef
   DEBUG(D_route) debug_printf("DSN: %s %s\n", r->name,
        r->dsn_lasthop ? "lasthop set" : "propagating DSN");
+#endif
   }
 }
 

diff --git a/src/src/tls-gnu.c b/src/src/tls-gnu.c
index 898e37cd690451fa30525731dbea1341aeb8a3e3..527ad28b216333c9f95ceb595891b9c40c9d68f7 100644 (file)
--- a/src/src/tls-gnu.c
+++ b/src/src/tls-gnu.c
@@ -221,7 +221,8 @@ static BOOL gnutls_buggy_ocsp = FALSE;
 
 /* Set this to control gnutls_global_set_log_level(); values 0 to 9 will setup
 the library logging; a value less than 0 disables the calls to set up logging
-callbacks. */
+callbacks.  Possibly GNuTLS also looks for an environment variable
+"GNUTLS_DEBUG_LEVEL". */
 #ifndef EXIM_GNUTLS_LIBRARY_LOG_LEVEL
 # define EXIM_GNUTLS_LIBRARY_LOG_LEVEL -1
 #endif

diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index f1176a63e512484937abca78c772505991148a6b..9816f734f3018a0bcf0638139c759a9dc144d7fa 100644 (file)
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -228,14 +228,13 @@ return host ? FAIL : DEFER;
 
 
 
-#ifdef EXIM_HAVE_EPHEM_RSA_KEX
 /*************************************************
 *        Callback to generate RSA key            *
 *************************************************/
 
 /*
 Arguments:
-  s          SSL connection
+  s          SSL connection (not used)
   export     not used
   keylength  keylength
 
@@ -270,7 +269,6 @@ if (!(rsa_key = RSA_generate_key(keylength, RSA_F4, NULL, NULL)))
   }
 return rsa_key;
 }
-#endif
 
 
 
@@ -977,8 +975,7 @@ if (!(x509 = X509_new()))
   goto err;
 
 where = US"generating pkey";
-               /* deprecated, use RSA_generate_key_ex() */
-if (!(rsa = RSA_generate_key(1024, RSA_F4, NULL, NULL)))
+if (!(rsa = rsa_callback(NULL, 0, 1024)))
   goto err;
 
 where = US"assigning pkey";

diff --git a/src/src/tlscert-openssl.c b/src/src/tlscert-openssl.c
index 3f0767926f04b37ba634c07c30eb9bb994876c10..d3bb8f4670442f381d42ddb3bb9047a704f64d9d 100644 (file)
--- a/src/src/tlscert-openssl.c
+++ b/src/src/tlscert-openssl.c
@@ -21,6 +21,9 @@ library. It is #included into the tls.c file when that library is used.
 # define EXIM_HAVE_ASN1_MACROS
 #endif
 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+# define ASN1_STRING_get0_data ASN1_STRING_data
+#endif
 
 /*****************************************************
 *  Export/import a certificate, binary/printable
@@ -373,17 +376,17 @@ while (sk_GENERAL_NAME_num(san) > 0)
     {
     case GEN_DNS:
       tag = US"DNS";
-      ele = ASN1_STRING_data(namePart->d.dNSName);
+      ele = US ASN1_STRING_get0_data(namePart->d.dNSName);
       len = ASN1_STRING_length(namePart->d.dNSName);
       break;
     case GEN_URI:
       tag = US"URI";
-      ele = ASN1_STRING_data(namePart->d.uniformResourceIdentifier);
+      ele = US ASN1_STRING_get0_data(namePart->d.uniformResourceIdentifier);
       len = ASN1_STRING_length(namePart->d.uniformResourceIdentifier);
       break;
     case GEN_EMAIL:
       tag = US"MAIL";
-      ele = ASN1_STRING_data(namePart->d.rfc822Name);
+      ele = US ASN1_STRING_get0_data(namePart->d.rfc822Name);
       len = ASN1_STRING_length(namePart->d.rfc822Name);
       break;
     default:
@@ -420,7 +423,7 @@ for (i = 0; i < adsnum; i++)
 
   if (ad && OBJ_obj2nid(ad->method) == NID_ad_OCSP)
     list = string_append_listele_n(list, sep,
-      ASN1_STRING_data(ad->location->d.ia5),
+      US ASN1_STRING_get0_data(ad->location->d.ia5),
       ASN1_STRING_length(ad->location->d.ia5));
   }
 sk_ACCESS_DESCRIPTION_free(ads);
@@ -455,7 +458,7 @@ if (dps) for (i = 0; i < dpsnum; i++)
         && np->type == GEN_URI
         )
        list = string_append_listele_n(list, sep,
-         ASN1_STRING_data(np->d.uniformResourceIdentifier),
+         US ASN1_STRING_get0_data(np->d.uniformResourceIdentifier),
          ASN1_STRING_length(np->d.uniformResourceIdentifier));
     }
 sk_DIST_POINT_free(dps);

diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index 9dc632e7fc271e92ec4d5bfa89d95ae475e3ead5..ef9309c471a0f296126cfb9aad2bbd9f0c8cf4d7 100644 (file)
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -623,34 +623,34 @@ return FALSE;
 /* This writes to the main log and to the message log.
 
 Arguments:
-  addr     the address item containing error information
   host     the current host
+  detail  the current message (addr_item->message)
+  basic_errno the errno (addr_item->basic_errno)
 
 Returns:   nothing
 */
 
 static void
-write_logs(address_item *addr, host_item *host)
+write_logs(const host_item *host, const uschar *suffix, int basic_errno)
 {
-uschar * message = LOGGING(outgoing_port)
+
+
+uschar *message = LOGGING(outgoing_port)
   ? string_sprintf("H=%s [%s]:%d", host->name, host->address,
                    host->port == PORT_NONE ? 25 : host->port)
   : string_sprintf("H=%s [%s]", host->name, host->address);
 
-if (addr->message)
+if (suffix)
   {
-  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);
-  deliver_msglog("%s %s\n", tod_stamp(tod_log), message);
+  message = string_sprintf("%s: %s", message, suffix);
+  if (basic_errno > 0)
+    message = string_sprintf("%s: %s", message, strerror(basic_errno));
   }
 else
-  {
-  const uschar * s = exim_errstr(addr->basic_errno);
-  log_write(0, LOG_MAIN, "%s %s", message, s);
-  deliver_msglog("%s %s %s\n", tod_stamp(tod_log), message, s);
-  }
+  message = string_sprintf("%s %s", message, exim_errstr(basic_errno));
+
+log_write(0, LOG_MAIN, "%s", message);
+deliver_msglog("%s %s\n", tod_stamp(tod_log), message);
 }
 
 static void
@@ -2607,6 +2607,7 @@ if ((rc = fork()))
   _exit(rc < 0 ? EXIT_FAILURE : EXIT_SUCCESS);
   }
 
+if (running_in_test_harness) millisleep(100); /* let parent debug out */
 set_process_info("proxying TLS connection for continued transport");
 FD_ZERO(&rfds);
 FD_SET(tls_out.active, &rfds);
@@ -3319,8 +3320,9 @@ if (!sx.ok)
        set_rc = DEFER;
         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);
-       msglog_line(host, message);
+
+        write_logs(host, message, sx.first_addr ? sx.first_addr->basic_errno : 0);
+
         *message_defer = TRUE;
         }
       }
@@ -3507,9 +3509,12 @@ propagate it from the initial
          {
          int pid = fork();
          if (pid == 0)         /* child; fork again to disconnect totally */
+           {
+           if (running_in_test_harness) millisleep(100); /* let parent debug out */
            /* does not return */
            smtp_proxy_tls(sx.buffer, sizeof(sx.buffer), pfd,
                            sx.ob->command_timeout);
+           }
 
          if (pid > 0)          /* parent */
            {
@@ -4325,7 +4330,7 @@ for (cutoff_retry = 0;
 
       if (rc == DEFER && first_addr->basic_errno != ERRNO_AUTHFAIL
                      && first_addr->basic_errno != ERRNO_TLSFAILURE)
-        write_logs(first_addr, host);
+        write_logs(host, first_addr->message, first_addr->basic_errno);
 
 #ifndef DISABLE_EVENT
       if (rc == DEFER)
@@ -4355,7 +4360,7 @@ for (cutoff_retry = 0;
         rc = smtp_deliver(addrlist, thost, host_af, defport, interface, tblock,
           &message_defer, TRUE);
         if (rc == DEFER && first_addr->basic_errno != ERRNO_AUTHFAIL)
-          write_logs(first_addr, host);
+          write_logs(host, first_addr->message, first_addr->basic_errno);
 # ifndef DISABLE_EVENT
         if (rc == DEFER)
           deferred_event_raise(first_addr, host);

diff --git a/test/log/0106 b/test/log/0106
index 80fe546cf0e12bc0c5f217b2d263ec554b35ec16..dbc3ba5d26bf07060eac2bb67bea001aea978d96 100644 (file)
--- a/test/log/0106
+++ b/test/log/0106
@@ -2,4 +2,5 @@
 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 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 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/0217 b/test/log/0217
index b3cf93c4b600148587618b808af999f01a9bf78d..e040be6c16d65c902921b7673bbe6f79d56bd344 100644 (file)
--- a/test/log/0217
+++ b/test/log/0217
@@ -12,6 +12,7 @@
 1999-03-02 09:44:33 10HmaZ-0005vi-00 == f@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:<f@test.ex>
 1999-03-02 09:44:33 10HmaZ-0005vi-00 == g@test.ex R=client T=send_to_server defer (dd): Connection timed out: SMTP timeout after RCPT TO:<f@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 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined MAIL FROM:<CALLER@test.ex>: 451 Temp error
 1999-03-02 09:44:33 10HmbA-0005vi-00 == h@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 pipelined MAIL FROM:<CALLER@test.ex>: 451 Temp error
 1999-03-02 09:44:33 10HmbA-0005vi-00 == i@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 pipelined 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
@@ -49,9 +50,11 @@
 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 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 == t@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 == u@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 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 == 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

diff --git a/test/log/0474 b/test/log/0474
index 127663c74be0fe50740a4a9feb27e305101844ac..db36867a761441562c64537d0c054b1d9b018342 100644 (file)
--- a/test/log/0474
+++ b/test/log/0474
@@ -1,6 +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 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 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 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 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

diff --git a/test/log/0497 b/test/log/0497
index 8d47ac2b528c100f76d7717f84553bcc54d46fd1..6a00ac1c4af75c93dd7fe4bc6159703d1986c1cc 100644 (file)
--- a/test/log/0497
+++ b/test/log/0497
@@ -1,4 +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 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 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
@@ -13,6 +14,7 @@
 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 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 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
@@ -20,6 +22,7 @@
 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 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 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
@@ -27,6 +30,7 @@
 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 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined MAIL FROM:<CALLER@myhost.test.ex>: 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 pipelined 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
@@ -41,6 +45,7 @@
 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 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 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
@@ -48,6 +53,7 @@
 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 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 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

diff --git a/test/log/0498 b/test/log/0498
index 4c8247684f248165fca33627eebb1c34764f5db7..c1bd86094dc587a637a855435088de23931a59eb 100644 (file)
--- a/test/log/0498
+++ b/test/log/0498
@@ -1,6 +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 10HmaX-0005vi-00 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 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 H=127.0.0.1 [127.0.0.1]: SMTP timeout after end of data (ddd bytes written): Connection timed out
 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

diff --git a/test/log/0550 b/test/log/0550
index 674cd57222a143806ea8fc41e564aff0a54b277f..66fe3c4489ba75b57a8d180c5965ef62d9d8c22e 100644 (file)
--- a/test/log/0550
+++ b/test/log/0550
@@ -1,3 +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 SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: 450 Defer
+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 MAIL FROM:<CALLER@myhost.test.ex>: 450 Defer
+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 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 4ce57b114546b2cf0ac1bc2bc511c856cda0f407..1c6e32f7ddd91b784df1a890f37564055c289dd2 100644 (file)
--- a/test/log/0552
+++ b/test/log/0552
@@ -1,6 +1,7 @@
 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 H=127.0.0.1 [127.0.0.1]: SMTP timeout after pipelined MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss: Connection timed out
 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 pipelined 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 pipelined 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 pipelined MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss

diff --git a/test/log/0582 b/test/log/0582
index 8953064ef320a8e2b76ad2663786c8aee1ba9e2d..fd431813f03ace76c6167649dd0c27f756491234 100644 (file)
--- a/test/log/0582
+++ b/test/log/0582
@@ -1,3 +1,4 @@
 1999-03-02 09:44:33 U=CALLER F=<userg@ok.example> temporarily rejected RCPT <userg@test.ex>: Could not complete recipient verify callout: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<userg@test.ex>: 451 not right now
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss for userh@test.ex
+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 end of data: 451 not right now
 1999-03-02 09:44:33 10HmaX-0005vi-00 == userh@test.ex 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: 451 not right now

diff --git a/test/log/0904 b/test/log/0904
index 92e4ae01a23bf321f647a3c14fe71e5bc424bfd2..28c972b5d5856ad65971bfd3364ec0be218c9333 100644 (file)
--- a/test/log/0904
+++ b/test/log/0904
@@ -2,6 +2,7 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] K C="250 OK"
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= sender@source.dom U=root P=local-bsmtp S=sss for b@test.ex
+1999-03-02 09:44:33 10HmaY-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP timeout after end of data (ddd bytes written): Connection timed out
 1999-03-02 09:44:33 10HmaY-0005vi-00 == b@test.ex R=to_server T=remote_smtp 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 10HmaZ-0005vi-00 <= sender@source.dom U=root P=local-bsmtp S=sss for c@test.ex
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => c@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] K C="250 OK"
@@ -11,11 +12,13 @@
 1999-03-02 09:44:33 10HmbA-0005vi-00 d@test.ex: error ignored
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbB-0005vi-00 <= sender@source.dom U=root P=local-bsmtp S=sss for e@test.ex
+1999-03-02 09:44:33 10HmbB-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 400 not right now
 1999-03-02 09:44:33 10HmbB-0005vi-00 == e@test.ex R=to_server T=remote_smtp defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 400 not right now
 1999-03-02 09:44:33 10HmbC-0005vi-00 <= sender@source.dom U=root P=local-bsmtp S=sss for p@test.ex
 1999-03-02 09:44:33 10HmbC-0005vi-00 => p@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] K C="250 OK bdat"
 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbD-0005vi-00 <= sender@source.dom U=root P=local-bsmtp S=sss for q@test.ex
+1999-03-02 09:44:33 10HmbD-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP timeout after pipelined end of data (ddd bytes written): Connection timed out
 1999-03-02 09:44:33 10HmbD-0005vi-00 == q@test.ex R=to_server T=remote_smtp defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after pipelined end of data (ddd bytes written)
 1999-03-02 09:44:33 10HmbE-0005vi-00 <= sender@source.dom U=root P=local-bsmtp S=sss for r@test.ex
 1999-03-02 09:44:33 10HmbE-0005vi-00 => r@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] K C="250 OK bdat"
@@ -25,6 +28,7 @@
 1999-03-02 09:44:33 10HmbF-0005vi-00 s@test.ex: error ignored
 1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbG-0005vi-00 <= sender@source.dom U=root P=local-bsmtp S=sss for s1@test.ex
+1999-03-02 09:44:33 10HmbG-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 450 greylisted mail-from
 1999-03-02 09:44:33 10HmbG-0005vi-00 == s1@test.ex R=to_server T=remote_smtp defer (-45) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 450 greylisted mail-from
 1999-03-02 09:44:33 10HmbH-0005vi-00 <= sender@source.dom U=root P=local-bsmtp S=sss for t@test.ex
 1999-03-02 09:44:33 10HmbH-0005vi-00 ** t@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<t@test.ex>: 550 no such recipient
@@ -35,4 +39,5 @@
 1999-03-02 09:44:33 10HmbI-0005vi-00 u@test.ex: error ignored
 1999-03-02 09:44:33 10HmbI-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbJ-0005vi-00 <= sender@source.dom U=root P=local-bsmtp S=sss for v@test.ex
+1999-03-02 09:44:33 10HmbJ-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 400 not right now bdat
 1999-03-02 09:44:33 10HmbJ-0005vi-00 == v@test.ex R=to_server T=remote_smtp defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 400 not right now bdat

diff --git a/test/log/0905 b/test/log/0905
index 9277e7336c86307fde8cb876374b429f5b4090ac..626b00b1c0313c05ce9e5afbcdfe1f1b9f3cf0dd 100644 (file)
--- a/test/log/0905
+++ b/test/log/0905
@@ -30,6 +30,7 @@
 1999-03-02 09:44:33 10HmbE-0005vi-00 v@test.ex: error ignored
 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbF-0005vi-00 <= sender@dom U=root P=local-bsmtp S=sss for u@test.ex
+1999-03-02 09:44:33 10HmbF-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined sending data block: 400 oops nonlast bdat
 1999-03-02 09:44:33 10HmbF-0005vi-00 == u@test.ex R=to_server T=remote_smtp defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined sending data block: 400 oops nonlast bdat
 1999-03-02 09:44:33 10HmbG-0005vi-00 <= sender@dom U=root P=local-bsmtp S=sss for p@test.ex
 1999-03-02 09:44:33 10HmbG-0005vi-00 => p@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] K C="250 OK bdat"

diff --git a/test/log/1008 b/test/log/1008
index 4e92c74cbaf8c2b4a880423d61cd6cc2559590b3..ec40c14afeb521781bbe67bf000fb9717799efdb 100644 (file)
--- a/test/log/1008
+++ b/test/log/1008
@@ -1,3 +1,4 @@
 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 SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: 450 Temporary 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 MAIL FROM:<CALLER@the.local.host.name>: 450 Temporary error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=::1 [::1]: SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: 450 Temporary error
 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=r1 T=t1 defer (-45) H=::1 [::1]: SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: 450 Temporary error

diff --git a/test/log/2037 b/test/log/2037
index 769b6f693f615905d96cd934fbd0d6bd2cc27e14..1083bab7d9d79dff300d09900a8e836d59ed328a 100644 (file)
--- a/test/log/2037
+++ b/test/log/2037
@@ -1,5 +1,6 @@
 1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <rcpt_defer@test.ex>: Could not complete recipient verify callout: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<rcpt_defer@test.ex>: 451 Temporary local problem - please try later
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss for data_defer@test.ex
+1999-03-02 09:44:33 10HmaY-0005vi-00 H=127.0.0.1 [127.0.0.1]:1111: SMTP error from remote mail server after end of data: 451 Temporary local problem - please try later
 1999-03-02 09:44:33 10HmaY-0005vi-00 == data_defer@test.ex R=client T=t1 defer (-46) H=127.0.0.1 [127.0.0.1]:1111: SMTP error from remote mail server after end of data: 451 Temporary local problem - please try later
 
 ******** SERVER ********

diff --git a/test/log/2137 b/test/log/2137
index f922c6b8f06235bfe10ff05cad4bf3786a9acf6e..7974598dc8a9534f8dbb91729da37490848175cd 100644 (file)
--- a/test/log/2137
+++ b/test/log/2137
@@ -1,5 +1,6 @@
 1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <rcpt_defer@test.ex>: Could not complete recipient verify callout: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<rcpt_defer@test.ex>: 451 Temporary local problem - please try later
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss for data_defer@test.ex
+1999-03-02 09:44:33 10HmaY-0005vi-00 H=127.0.0.1 [127.0.0.1]:1111: SMTP error from remote mail server after end of data: 451 Temporary local problem - please try later
 1999-03-02 09:44:33 10HmaY-0005vi-00 == data_defer@test.ex R=client T=t1 defer (-46) H=127.0.0.1 [127.0.0.1]:1111: SMTP error from remote mail server after end of data: 451 Temporary local problem - please try later
 
 ******** SERVER ********

diff --git a/test/log/5510 b/test/log/5510
index 2e65e048f67670b0d98e3018ff6848d4e951fbf1..84065d0765c60aeae323caed6e0eb44314bf3560 100644 (file)
--- a/test/log/5510
+++ b/test/log/5510
@@ -23,6 +23,7 @@
 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 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.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

diff --git a/test/log/5840 b/test/log/5840
index 98f18bd86f9cd6e654a406353151244a0eb3eaf1..6da82e43f64b1410aa3a2489303e857f0253da2e 100644 (file)
--- a/test/log/5840
+++ b/test/log/5840
@@ -8,12 +8,12 @@
 1999-03-02 09:44:33 End queue run: pid=pppp -qf
 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for CALLER@mxdane256ta.test.ex
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmbB-0005vi-00 DANE attempt failed; TLS connection to dane256ta.test.ex [ip4.ip4.ip4.ip4]: (SSL_connect): error:14090086:SSL routines:ssl3_get_server_certificate:certificate verify failed
+1999-03-02 09:44:33 10HmbB-0005vi-00 DANE attempt failed; TLS connection to dane256ta.test.ex [ip4.ip4.ip4.ip4]: (SSL_connect): error:xxxxxxxx:SSL routines:ssl3_get_server_certificate:certificate verify failed
 1999-03-02 09:44:33 10HmbB-0005vi-00 == CALLER@mxdane256ta.test.ex R=client T=send_to_server defer (-37) H=dane256ta.test.ex [ip4.ip4.ip4.ip4]: TLS session: (SSL_connect): error: <<detail omitted>>
 1999-03-02 09:44:33 End queue run: pid=pppp -qf
 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for CALLER@thishost.test.ex
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmbB-0005vi-00 DANE attempt failed; TLS connection to dane256ta.test.ex [ip4.ip4.ip4.ip4]: (SSL_connect): error:14090086:SSL routines:ssl3_get_server_certificate:certificate verify failed
+1999-03-02 09:44:33 10HmbB-0005vi-00 DANE attempt failed; TLS connection to dane256ta.test.ex [ip4.ip4.ip4.ip4]: (SSL_connect): error:xxxxxxxx:SSL routines:ssl3_get_server_certificate:certificate verify failed
 1999-03-02 09:44:33 10HmbB-0005vi-00 == CALLER@mxdane256ta.test.ex R=client T=send_to_server defer (-37) H=dane256ta.test.ex [ip4.ip4.ip4.ip4]: TLS session: (SSL_connect): error: <<detail omitted>>
 1999-03-02 09:44:33 10HmbC-0005vi-00 [127.0.0.1] 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 10HmbC-0005vi-00 [127.0.0.1] SSL verify error: certificate name mismatch: DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" H="thishost.test.ex"
@@ -22,7 +22,7 @@
 1999-03-02 09:44:33 End queue run: pid=pppp -qf
 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for CALLER@thishost.test.ex
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmbB-0005vi-00 DANE attempt failed; TLS connection to dane256ta.test.ex [ip4.ip4.ip4.ip4]: (SSL_connect): error:14090086:SSL routines:ssl3_get_server_certificate:certificate verify failed
+1999-03-02 09:44:33 10HmbB-0005vi-00 DANE attempt failed; TLS connection to dane256ta.test.ex [ip4.ip4.ip4.ip4]: (SSL_connect): error:xxxxxxxx:SSL routines:ssl3_get_server_certificate:certificate verify failed
 1999-03-02 09:44:33 10HmbB-0005vi-00 == CALLER@mxdane256ta.test.ex R=client T=send_to_server defer (-37) H=dane256ta.test.ex [ip4.ip4.ip4.ip4]: TLS session: (SSL_connect): error: <<detail omitted>>
 1999-03-02 09:44:33 10HmbE-0005vi-00 => CALLER@thishost.test.ex R=client T=send_to_server H=thishost.test.ex [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbF-0005vi-00"
 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
@@ -34,7 +34,7 @@
 1999-03-02 09:44:33 10HmbK-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for CALLER@dane.no.3.test.ex
 1999-03-02 09:44:33 10HmbL-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for CALLER@dane.no.4.test.ex
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmbB-0005vi-00 DANE attempt failed; TLS connection to dane256ta.test.ex [ip4.ip4.ip4.ip4]: (SSL_connect): error:14090086:SSL routines:ssl3_get_server_certificate:certificate verify failed
+1999-03-02 09:44:33 10HmbB-0005vi-00 DANE attempt failed; TLS connection to dane256ta.test.ex [ip4.ip4.ip4.ip4]: (SSL_connect): error:xxxxxxxx:SSL routines:ssl3_get_server_certificate:certificate verify failed
 1999-03-02 09:44:33 10HmbB-0005vi-00 == CALLER@mxdane256ta.test.ex R=client T=send_to_server defer (-37) H=dane256ta.test.ex [ip4.ip4.ip4.ip4]: TLS session: (SSL_connect): error: <<detail omitted>>
 1999-03-02 09:44:33 10HmbG-0005vi-00 H=danelazy.test.ex [ip4.ip4.ip4.ip4]: DANE error: tlsa lookup DEFER
 1999-03-02 09:44:33 10HmbG-0005vi-00 H=danelazy2.test.ex [127.0.0.1]: DANE error: tlsa lookup DEFER

diff --git a/test/log/5860 b/test/log/5860
index 79fbe0406e81a9d963761a3dbba289a0e9dc9f40..343759259d0d1ad561980a4d6d1e1fd59effae79 100644 (file)
--- a/test/log/5860
+++ b/test/log/5860
@@ -13,7 +13,7 @@
 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for CALLER@mxdane256ta.test.ex
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
 1999-03-02 09:44:33 10HmbB-0005vi-00 tls:cert depth = 2 <CN=clica CA rsa,O=example.com>
-1999-03-02 09:44:33 10HmbB-0005vi-00 DANE attempt failed; TLS connection to dane256ta.test.ex [ip4.ip4.ip4.ip4]: (SSL_connect): error:14090086:SSL routines:ssl3_get_server_certificate:certificate verify failed
+1999-03-02 09:44:33 10HmbB-0005vi-00 DANE attempt failed; TLS connection to dane256ta.test.ex [ip4.ip4.ip4.ip4]: (SSL_connect): error:xxxxxxxx:SSL routines:ssl3_get_server_certificate:certificate verify failed
 1999-03-02 09:44:33 10HmbB-0005vi-00 msg:host:defer dane=no
 1999-03-02 09:44:33 10HmbB-0005vi-00 == CALLER@mxdane256ta.test.ex R=client T=send_to_server defer (-37) H=dane256ta.test.ex [ip4.ip4.ip4.ip4]: TLS session: (SSL_connect): error: <<detail omitted>>
 1999-03-02 09:44:33 10HmbB-0005vi-00 ** CALLER@mxdane256ta.test.ex: retry timeout exceeded

diff --git a/test/msglog/0106.10HmaY-0005vi-00 b/test/msglog/0106.10HmaY-0005vi-00
index af0eb72c007c10fdeaab2e282a1222b5686467f9..23d8bab2f806a520ad75761f17fdd3f1132fe6ed 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 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 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/runtest b/test/runtest
index 5640a5f58fea0fcaacbbc5bd9eaaf10864f732bf..a1259f76920c8b73671e260c1d66d71a31bfd04c 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -553,8 +553,15 @@ RESET_AFTER_EXTRA_LINE_READ:
   s/((EC)?DHE-)?(RSA|ECDSA)-AES(128|256)-(GCM-SHA(256|384)|SHA):(128|256)/ke-$3-AES256-SHA:xxx/g;
 
   # LibreSSL
+  # TLSv1:AES256-GCM-SHA384:256
   # TLSv1:ECDHE-RSA-CHACHA20-POLY1305:256
-  s/((EC)?DHE-)?(RSA|ECDSA)-CHACHA20-POLY1305\b/ke-$3-AES256-SHA:xxx/g;
+  #
+  # ECDHE-RSA-CHACHA20-POLY1305
+  # AES256-GCM-SHA384
+
+  s/(?<!-)(AES256-GCM-SHA384)/RSA-$1/;
+  s/((EC)?DHE-)?(RSA|ECDSA)-(AES256|CHACHA20)-(GCM-SHA384|POLY1305)(?!:)/ke-$3-AES256-SHA/g;
+  s/((EC)?DHE-)?(RSA|ECDSA)-(AES256|CHACHA20)-(GCM-SHA384|POLY1305):256/ke-$3-AES256-SHA:xxx/g;
 
   # GnuTLS have seen:
   #   TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256
@@ -1176,6 +1183,7 @@ RESET_AFTER_EXTRA_LINE_READ:
 
     # openssl version variances
     s/(TLS error on connection [^:]*: error:)[0-9A-F]{8}(:system library):(?:fopen|func\(4095\)):(No such file or directory)$/$1xxxxxxxx$2:fopen:$3/;
+    s/(DANE attempt failed.*error:)[0-9A-F]{8}(:SSL routines:)(ssl3_get_server_certificate|tls_process_server_certificate|CONNECT_CR_CERT)(?=:certificate verify failed$)/$1xxxxxxxx$2ssl3_get_server_certificate/;
     }
 
   # ======== All files other than stderr ========
@@ -2754,6 +2762,9 @@ die "CONFIGURE_GROUP ($parm_configure_group) does not match the group invoking $
        if 0020 & (stat "$parm_cwd/test-config")[2]
        and $parm_configure_group != $);
 
+die "aux-fixed file is world-writeable; best to strip them all, recursively\n"
+       if 0020 & (stat "aux-fixed/0037.f-1")[2];
+
 
 open(EXIMINFO, "$parm_exim -d-all+transport -bV -C $parm_cwd/test-config -DDIR=$parm_cwd |") ||
   die "** Cannot run $parm_exim: $!\n";
@@ -3138,6 +3149,12 @@ unless (defined $parm_eximgroup)
   die "** ABANDONING.\n";
   }
 
+if ($parm_caller_home eq $parm_cwd)
+  {
+  print "will confuse working dir with homedir; change homedir\n";
+  die "** ABANDONING.\n";
+  }
+
 print "You need to be in the Exim group to run these tests. Checking ...";
 
 if (`groups` =~ /\b\Q$parm_eximgroup\E\b/)

diff --git a/test/scripts/2100-OpenSSL/2102 b/test/scripts/2100-OpenSSL/2102
index e9fdbfdcaee79e60e6c6a271740fead3ea87aa10..3904c50980619da587fa52aba019386237ffd9f3 100644 (file)
--- a/test/scripts/2100-OpenSSL/2102
+++ b/test/scripts/2100-OpenSSL/2102
@@ -1,5 +1,11 @@
 # TLS server: general ops and certificate extractions
-exim -DSERVER=server -bd -oX PORT_D
+#
+# NOTE: current OpenSSL libraries return faulty my-cert information
+# when more than one is loaded, which the conf for this testcase does.
+# As a result the expansion done and logged is misleading.
+#
+# Make RSA authentication the only acceptable
+exim -DSERVER=server -DORDER=RSA -bd -oX PORT_D
 ****
 client-ssl 127.0.0.1 PORT_D
 ??? 220

diff --git a/test/src/server.c b/test/src/server.c
index 5af86d96f76eb4075c2b05a0de962f996456abf5..d433ebe0e0331f1f0cbd4fb04027eb99d9249568 100644 (file)
--- a/test/src/server.c
+++ b/test/src/server.c
@@ -401,7 +401,7 @@ else
       sin6.sin6_addr = anyaddr6;
       if (bind(listen_socket[i], (struct sockaddr *)&sin6, sizeof(sin6)) < 0)
         {
-        printf("IPv6 socket bind() failed: %s\n", strerror(errno));
+        printf("IPv6 socket bind(port %d) failed: %s\n", port, strerror(errno));
         exit(1);
         }
       }
@@ -420,7 +420,7 @@ else
       if (bind(listen_socket[i], (struct sockaddr *)&sin4, sizeof(sin4)) < 0)
         if (listen_socket[v6n] < 0 || errno != EADDRINUSE)
           {
-          printf("IPv4 socket bind() failed: %s\n", strerror(errno));
+          printf("IPv4 socket bind(port %d) failed: %s\n", port, strerror(errno));
           exit(1);
           }
         else

diff --git a/test/stderr/0022 b/test/stderr/0022
index ab14c40ceed027e5708454ab57b27be7c15c8a17..c558b4226e1168698e0303621c044433a3c25026 100644 (file)
--- a/test/stderr/0022
+++ b/test/stderr/0022
@@ -5,7 +5,6 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: accept propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -73,7 +72,6 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: accept propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -144,7 +142,6 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: accept propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME

diff --git a/test/stderr/0037 b/test/stderr/0037
index 1d03f0d480e87ce836680972cece57dada0b1cb5..6889c9f7b0a06c0a301f504a75d5499e29b07de0 100644 (file)
--- a/test/stderr/0037
+++ b/test/stderr/0037
@@ -2,24 +2,12 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: check_vars propagating DSN
-DSN: fail_read_filter propagating DSN
-DSN: prepend_filter propagating DSN
-DSN: userfilter propagating DSN
-DSN: user_accept1 propagating DSN
-DSN: user_accept2 propagating DSN
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: check_vars propagating DSN
-DSN: fail_read_filter propagating DSN
-DSN: prepend_filter propagating DSN
-DSN: userfilter propagating DSN
-DSN: user_accept1 propagating DSN
-DSN: user_accept2 propagating DSN
 rda_interpret (file): TESTSUITE/aux-var/0037.F
 expanded: TESTSUITE/aux-var/0037.F
 ssss bytes read from TESTSUITE/aux-var/0037.F

diff --git a/test/stderr/0078 b/test/stderr/0078
index 3ab49c8202b338e6384e048e5d162ce7cb0f70e1..550e84f10a9376906904ddd95286394c1ed16ff7 100644 (file)
--- a/test/stderr/0078
+++ b/test/stderr/0078
@@ -1,9 +1,6 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: lookuphost propagating DSN
-DSN: self propagating DSN
-DSN: self2 propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xx@mxt6.test.ex
 --------> lookuphost router <--------
@@ -25,9 +22,6 @@ routed by lookuphost router
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: lookuphost propagating DSN
-DSN: self propagating DSN
-DSN: self2 propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing myhost.test.ex@mxt1.test.ex
 --------> lookuphost router <--------
@@ -63,9 +57,6 @@ routed by self router
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: lookuphost propagating DSN
-DSN: self propagating DSN
-DSN: self2 propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xx@mxt1.test.ex
 --------> lookuphost router <--------
@@ -115,9 +106,6 @@ routed by self2 router
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: lookuphost propagating DSN
-DSN: self propagating DSN
-DSN: self2 propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xx@not.exist
 --------> lookuphost router <--------

diff --git a/test/stderr/0084 b/test/stderr/0084
index cda7d1275a02a10b212aae2e5c29d89373c49cfa..4100ebe9ede8ef37120e341a4132a8e23e3ac87d 100644 (file)
--- a/test/stderr/0084
+++ b/test/stderr/0084
@@ -1,9 +1,6 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: smart propagating DSN
-DSN: forward propagating DSN
-DSN: localuser propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing yes@myhost.test.ex
 --------> smart router <--------

diff --git a/test/stderr/0085 b/test/stderr/0085
index 32705b79fe344feade9d31e89b227722642d5150..1b9995eb91b4f1acc5da8af74b4014e018e209a9 100644 (file)
--- a/test/stderr/0085
+++ b/test/stderr/0085
@@ -5,9 +5,6 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: smart1 propagating DSN
-DSN: fail_remote_domains propagating DSN
-DSN: smart2 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -207,9 +204,6 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: smart1 propagating DSN
-DSN: fail_remote_domains propagating DSN
-DSN: smart2 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME

diff --git a/test/stderr/0092 b/test/stderr/0092
index d2b3b5c2a7c258a5b6b198425668cff668777871..c06f9deaeb46607342628c55bfc6fe7f09dcdcff 100644 (file)
--- a/test/stderr/0092
+++ b/test/stderr/0092
@@ -39,8 +39,6 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: fail_remote_domains propagating DSN
-DSN: forward propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 sender_fullhost = [V4NET.0.0.1]

diff --git a/test/stderr/0094 b/test/stderr/0094
index efd339bf1b30a47eb6cb3dcca313d6fd19c54645..f612ed36ff9a09b936bb2748db5b7dae85937f9e 100644 (file)
--- a/test/stderr/0094
+++ b/test/stderr/0094
@@ -68,7 +68,6 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: localuser propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME

diff --git a/test/stderr/0117 b/test/stderr/0117
index 45325c3d946d25ac28188dd0a68600b07891d664..b4e5e8b2d975160b8e9d50fc1038b1b4bc02eb3d 100644 (file)
--- a/test/stderr/0117
+++ b/test/stderr/0117
@@ -1,7 +1,6 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: lookuphost propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xxx@mxt9.test.ex
 --------> lookuphost router <--------
@@ -23,7 +22,6 @@ routed by lookuphost router
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: lookuphost propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xxx@mxt9a.test.ex
 --------> lookuphost router <--------
@@ -45,7 +43,6 @@ routed by lookuphost router
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: lookuphost propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xxx@mxt9b.test.ex
 --------> lookuphost router <--------

diff --git a/test/stderr/0123 b/test/stderr/0123
index 6d51d325208094cf87a4ad94f8239a2b531c5e6d..25d6d4e1be7c0525d52c5741c6aa869b874251aa 100644 (file)
--- a/test/stderr/0123
+++ b/test/stderr/0123
@@ -3,12 +3,6 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 configuration file is TESTSUITE/test-config
 admin user
-DSN: l1 propagating DSN
-DSN: l2 propagating DSN
-DSN: l3 propagating DSN
-DSN: c1 propagating DSN
-DSN: c2 propagating DSN
-DSN: c3 propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID

diff --git a/test/stderr/0149 b/test/stderr/0149
index cd4fdd8fc440f5864dc03155d924685978fa3cf8..87a71b52ad46bddd6e68fb70226ca7e440fdf96d 100644 (file)
--- a/test/stderr/0149
+++ b/test/stderr/0149
@@ -1,9 +1,6 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: domainlist1 propagating DSN
-DSN: domainlist2 propagating DSN
-DSN: local propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing x@ten
 --------> domainlist1 router <--------

diff --git a/test/stderr/0161 b/test/stderr/0161
index 0147fcb6ff93c119240721d34b35ab358581a97b..6b1f5796b00c8f671acc73df77d76d7765d0be8a 100644 (file)
--- a/test/stderr/0161
+++ b/test/stderr/0161
@@ -1,11 +1,6 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: failuphost propagating DSN
-DSN: lookuphost propagating DSN
-DSN: fail propagating DSN
-DSN: self propagating DSN
-DSN: self2 propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xx@mxt6.test.ex
 --------> failuphost router <--------
@@ -32,11 +27,6 @@ routed by lookuphost router
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: failuphost propagating DSN
-DSN: lookuphost propagating DSN
-DSN: fail propagating DSN
-DSN: self propagating DSN
-DSN: self2 propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing myhost.test.ex@mxt1.test.ex
 --------> failuphost router <--------
@@ -82,11 +72,6 @@ routed by self router
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: failuphost propagating DSN
-DSN: lookuphost propagating DSN
-DSN: fail propagating DSN
-DSN: self propagating DSN
-DSN: self2 propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xx@mxt1.test.ex
 --------> failuphost router <--------
@@ -146,11 +131,6 @@ routed by self2 router
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: failuphost propagating DSN
-DSN: lookuphost propagating DSN
-DSN: fail propagating DSN
-DSN: self propagating DSN
-DSN: self2 propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xx@not.exist
 --------> failuphost router <--------
@@ -171,11 +151,6 @@ no more routers
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: failuphost propagating DSN
-DSN: lookuphost propagating DSN
-DSN: fail propagating DSN
-DSN: self propagating DSN
-DSN: self2 propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing ff@mxt1.test.ex
 --------> failuphost router <--------
@@ -191,11 +166,6 @@ failuphost router forced address failure
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: failuphost propagating DSN
-DSN: lookuphost propagating DSN
-DSN: fail propagating DSN
-DSN: self propagating DSN
-DSN: self2 propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing fff@mxt1.test.ex
 --------> failuphost router <--------

diff --git a/test/stderr/0183 b/test/stderr/0183
index 35fc1967dbe2acf46f31f1846d570aff1218d906..a12a7f462e08e05e27ee9123a05d65fe556996e1 100644 (file)
--- a/test/stderr/0183
+++ b/test/stderr/0183
@@ -3,9 +3,6 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 configuration file is TESTSUITE/test-config
 admin user
-DSN: srv propagating DSN
-DSN: useryz propagating DSN
-DSN: lookuphost propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
@@ -196,9 +193,6 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 configuration file is TESTSUITE/test-config
 admin user
-DSN: srv propagating DSN
-DSN: useryz propagating DSN
-DSN: lookuphost propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
@@ -387,9 +381,6 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 configuration file is TESTSUITE/test-config
 admin user
-DSN: srv propagating DSN
-DSN: useryz propagating DSN
-DSN: lookuphost propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
@@ -580,9 +571,6 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 configuration file is TESTSUITE/test-config
 admin user
-DSN: srv propagating DSN
-DSN: useryz propagating DSN
-DSN: lookuphost propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID

diff --git a/test/stderr/0217 b/test/stderr/0217
index 9e31fb1d0866234ff2af5cdc58663435a2e99b99..16eaa05042988b153ad56bcdf4829982b7eb6a99 100644 (file)
--- a/test/stderr/0217
+++ b/test/stderr/0217
@@ -412,6 +412,8 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 550 NO
   SMTP<< 550 NO
   SMTP<< 403 Sorry temp data error
+LOG: MAIN
+  H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined DATA: 403 Sorry temp data error
   SMTP>> QUIT
   SMTP(close)>>
 LOG: MAIN

diff --git a/test/stderr/0275 b/test/stderr/0275
index f34132b55bac12241c49a9bb1e7c8e68ebf946f1..4605d64a6a29dd7a1b1c0f66de2c078ed5e4aef4 100644 (file)
--- a/test/stderr/0275
+++ b/test/stderr/0275
@@ -5,15 +5,6 @@ configuration file is TESTSUITE/test-config
 admin user
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: r00 propagating DSN
-DSN: r01 propagating DSN
-DSN: r02 propagating DSN
-DSN: r03 propagating DSN
-DSN: r04 propagating DSN
-DSN: r05 propagating DSN
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
@@ -115,15 +106,6 @@ changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: r00 propagating DSN
-DSN: r01 propagating DSN
-DSN: r02 propagating DSN
-DSN: r03 propagating DSN
-DSN: r04 propagating DSN
-DSN: r05 propagating DSN
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex>
@@ -172,15 +154,6 @@ trusted user
 admin user
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: r00 propagating DSN
-DSN: r01 propagating DSN
-DSN: r02 propagating DSN
-DSN: r03 propagating DSN
-DSN: r04 propagating DSN
-DSN: r05 propagating DSN
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
 set_process_info: pppp delivering specified messages
 set_process_info: pppp delivering 10HmaX-0005vi-00
 Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D
@@ -366,16 +339,6 @@ changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: r0f propagating DSN
-DSN: r00 propagating DSN
-DSN: r01 propagating DSN
-DSN: r02 propagating DSN
-DSN: r03 propagating DSN
-DSN: r04 propagating DSN
-DSN: r05 propagating DSN
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 sender_fullhost = [127.0.0.1]

diff --git a/test/stderr/0278 b/test/stderr/0278
index c3a22c0e061e8dfb44a070096cccf249b057cc83..45885d0e3f5ff846ebe943d274ca5486d3fd6e44 100644 (file)
--- a/test/stderr/0278
+++ b/test/stderr/0278
@@ -5,11 +5,6 @@ configuration file is TESTSUITE/test-config
 admin user
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
-DSN: r4 propagating DSN
-DSN: r5 propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
@@ -70,11 +65,6 @@ changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
-DSN: r4 propagating DSN
-DSN: r5 propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex>
@@ -123,11 +113,6 @@ trusted user
 admin user
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
-DSN: r4 propagating DSN
-DSN: r5 propagating DSN
 set_process_info: pppp delivering specified messages
 set_process_info: pppp delivering 10HmaX-0005vi-00
 Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D
@@ -266,11 +251,6 @@ configuration file is TESTSUITE/test-config
 admin user
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
-DSN: r4 propagating DSN
-DSN: r5 propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID

diff --git a/test/stderr/0279 b/test/stderr/0279
index 7762859fad3ea7d2ec61bf213a9f869a6364aadc..7868f13dca397d28a73b3e9e4933b91e4ebc117d 100644 (file)
--- a/test/stderr/0279
+++ b/test/stderr/0279
@@ -8,10 +8,6 @@ trusted user
 admin user
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: rr1 propagating DSN
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=
 sender address = CALLER@test.ex
 Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
@@ -84,10 +80,6 @@ trusted user
 admin user
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: rr1 propagating DSN
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=
 sender address = user1@fun.1
 Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID

diff --git a/test/stderr/0297 b/test/stderr/0297
index f5db068eb9a4b97126a82c604cdc9f94a9db0c0b..c2e5c8d358a2dbbecfc8ac1ea81459f5faf8fd69 100644 (file)
--- a/test/stderr/0297
+++ b/test/stderr/0297
@@ -2,7 +2,6 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: r1 propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing /a/b/c@myhost.test.ex
 --------> r1 router <--------
@@ -26,7 +25,6 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: r1 propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing /x/y/z@myhost.test.ex
 --------> r1 router <--------

diff --git a/test/stderr/0315 b/test/stderr/0315
index 13db682d309e94ff7f2e09d40b266919f814616f..3501cb502dc942369c69de8315f661e265a8e5a4 100644 (file)
--- a/test/stderr/0315
+++ b/test/stderr/0315
@@ -1,8 +1,6 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
 LOG: MAIN
   <= CALLER@the.local.host.name U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
@@ -10,8 +8,6 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
 delivering 10HmaX-0005vi-00
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
@@ -63,16 +59,12 @@ LOG: MAIN
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
 LOG: MAIN
   <= CALLER@the.local.host.name U=CALLER P=local S=sss
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
 delivering 10HmaY-0005vi-00
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available

diff --git a/test/stderr/0332 b/test/stderr/0332
index a0072373c23253ee9309c10269a2a30007e95f08..748d0170d8e96905d3a294fc946685da34b05b90 100644 (file)
--- a/test/stderr/0332
+++ b/test/stderr/0332
@@ -1,8 +1,6 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
 LOG: queue_run MAIN
   Start queue run: pid=pppp
 locking TESTSUITE/spool/db/retry.lockfile
@@ -43,8 +41,6 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: delay@test.again.dns

diff --git a/test/stderr/0333 b/test/stderr/0333
index 8aa3598c0e9aa93c27a53d74c8f55bc6e07f7845..1951d93fe6b22e5858044f9929eac04ce1e46adc 100644 (file)
--- a/test/stderr/0333
+++ b/test/stderr/0333
@@ -1,8 +1,6 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: ok@no.delay
@@ -42,8 +40,6 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: delay@test.again.dns

diff --git a/test/stderr/0360 b/test/stderr/0360
index 0e1710160689ffa1169a5696b3f4ce5ca807a403..2c1aab50bfcd9dca5b4b968a7bf2005b412f09e4 100644 (file)
--- a/test/stderr/0360
+++ b/test/stderr/0360
@@ -1,9 +1,6 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: v0 propagating DSN
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
@@ -11,9 +8,6 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: v0 propagating DSN
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
 delivering 10HmaX-0005vi-00
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
@@ -155,9 +149,6 @@ LOG: MAIN
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: v0 propagating DSN
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
 LOG: queue_run MAIN
   Start queue run: pid=pppp -qf
 locking TESTSUITE/spool/db/retry.lockfile

diff --git a/test/stderr/0361 b/test/stderr/0361
index 8d2f9de6e8fea9a04b3651c2ada87e26cccc0a31..7cbc34cf35ff69c12260fa0eeb6c2bdda53b3c3d 100644 (file)
--- a/test/stderr/0361
+++ b/test/stderr/0361
@@ -12,10 +12,6 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
-DSN: r4 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -63,10 +59,6 @@ changed uid/gid: forcing real = effective
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
-DSN: r4 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 set_process_info: pppp delivering specified messages

diff --git a/test/stderr/0362 b/test/stderr/0362
index b638ecd07272395b6caa0f65d6ae14b01d4d1ccb..b1cfb9a43adf3a3abeb713c54ada2cad5ee18e9c 100644 (file)
--- a/test/stderr/0362
+++ b/test/stderr/0362
@@ -5,8 +5,6 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME

diff --git a/test/stderr/0364 b/test/stderr/0364
index 3fd65e473151683de3c07ac5b1bc94a2059e9816..3d11e8a9226879e026a43780e81f1d76c8b06260 100644 (file)
--- a/test/stderr/0364
+++ b/test/stderr/0364
@@ -1,11 +1,6 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
-DSN: r4 propagating DSN
-DSN: r5 propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing kilos@thishost
 --------> r1 router <--------

diff --git a/test/stderr/0374 b/test/stderr/0374
index ea6803720b63a241119a1b12778d7a9cbb150da4..25a12e9f39beef86a4b35553b43ad81ff2f7aa1f 100644 (file)
--- a/test/stderr/0374
+++ b/test/stderr/0374
@@ -1,11 +1,6 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: u1 propagating DSN
-DSN: ut2 propagating DSN
-DSN: ut3 propagating DSN
-DSN: ut4 propagating DSN
-DSN: real propagating DSN
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
@@ -13,11 +8,6 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: u1 propagating DSN
-DSN: ut2 propagating DSN
-DSN: ut3 propagating DSN
-DSN: ut4 propagating DSN
-DSN: real propagating DSN
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -390,22 +380,12 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: u1 propagating DSN
-DSN: ut2 propagating DSN
-DSN: ut3 propagating DSN
-DSN: ut4 propagating DSN
-DSN: real propagating DSN
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: u1 propagating DSN
-DSN: ut2 propagating DSN
-DSN: ut3 propagating DSN
-DSN: ut4 propagating DSN
-DSN: real propagating DSN
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: CALLER@myhost.test.ex

diff --git a/test/stderr/0375 b/test/stderr/0375
index e0f31435342530502bd4555cb94e97d0d998906f..5bb4081907f0b2206801cbbe9402ea11871089e9 100644 (file)
--- a/test/stderr/0375
+++ b/test/stderr/0375
@@ -1,15 +1,6 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: u1 propagating DSN
-DSN: ut2 propagating DSN
-DSN: ut3 propagating DSN
-DSN: ut4 propagating DSN
-DSN: ut5 propagating DSN
-DSN: ut6 propagating DSN
-DSN: ut7 propagating DSN
-DSN: ut8 propagating DSN
-DSN: real propagating DSN
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
@@ -17,15 +8,6 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: u1 propagating DSN
-DSN: ut2 propagating DSN
-DSN: ut3 propagating DSN
-DSN: ut4 propagating DSN
-DSN: ut5 propagating DSN
-DSN: ut6 propagating DSN
-DSN: ut7 propagating DSN
-DSN: ut8 propagating DSN
-DSN: real propagating DSN
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -858,30 +840,12 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: u1 propagating DSN
-DSN: ut2 propagating DSN
-DSN: ut3 propagating DSN
-DSN: ut4 propagating DSN
-DSN: ut5 propagating DSN
-DSN: ut6 propagating DSN
-DSN: ut7 propagating DSN
-DSN: ut8 propagating DSN
-DSN: real propagating DSN
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: u1 propagating DSN
-DSN: ut2 propagating DSN
-DSN: ut3 propagating DSN
-DSN: ut4 propagating DSN
-DSN: ut5 propagating DSN
-DSN: ut6 propagating DSN
-DSN: ut7 propagating DSN
-DSN: ut8 propagating DSN
-DSN: real propagating DSN
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: CALLER@myhost.test.ex
@@ -960,30 +924,12 @@ log writing disabled
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: u1 propagating DSN
-DSN: ut2 propagating DSN
-DSN: ut3 propagating DSN
-DSN: ut4 propagating DSN
-DSN: ut5 propagating DSN
-DSN: ut6 propagating DSN
-DSN: ut7 propagating DSN
-DSN: ut8 propagating DSN
-DSN: real propagating DSN
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: u1 propagating DSN
-DSN: ut2 propagating DSN
-DSN: ut3 propagating DSN
-DSN: ut4 propagating DSN
-DSN: ut5 propagating DSN
-DSN: ut6 propagating DSN
-DSN: ut7 propagating DSN
-DSN: ut8 propagating DSN
-DSN: real propagating DSN
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: h1@myhost.test.ex

diff --git a/test/stderr/0377 b/test/stderr/0377
index 5ca0ade9d7ec005ebcd28120327b6ad93240c82b..82e492365573dd2ba8621b29fb519aa771108bd9 100644 (file)
--- a/test/stderr/0377
+++ b/test/stderr/0377
@@ -1,14 +1,6 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: defer propagating DSN
-DSN: unseen_aaaa propagating DSN
-DSN: seen_aaaa propagating DSN
-DSN: bbbb propagating DSN
-DSN: bbbb_0 propagating DSN
-DSN: cccc_2nd_time propagating DSN
-DSN: cccc_redirect propagating DSN
-DSN: cccc_accept propagating DSN
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
@@ -16,14 +8,6 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: defer propagating DSN
-DSN: unseen_aaaa propagating DSN
-DSN: seen_aaaa propagating DSN
-DSN: bbbb propagating DSN
-DSN: bbbb_0 propagating DSN
-DSN: cccc_2nd_time propagating DSN
-DSN: cccc_redirect propagating DSN
-DSN: cccc_accept propagating DSN
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -328,14 +312,6 @@ locking TESTSUITE/spool/db/retry.lockfile
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: defer propagating DSN
-DSN: unseen_aaaa propagating DSN
-DSN: seen_aaaa propagating DSN
-DSN: bbbb propagating DSN
-DSN: bbbb_0 propagating DSN
-DSN: cccc_2nd_time propagating DSN
-DSN: cccc_redirect propagating DSN
-DSN: cccc_accept propagating DSN
 LOG: queue_run MAIN
   Start queue run: pid=pppp -qf
 locking TESTSUITE/spool/db/retry.lockfile
@@ -579,14 +555,6 @@ LOG: queue_run MAIN
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: defer propagating DSN
-DSN: unseen_aaaa propagating DSN
-DSN: seen_aaaa propagating DSN
-DSN: bbbb propagating DSN
-DSN: bbbb_0 propagating DSN
-DSN: cccc_2nd_time propagating DSN
-DSN: cccc_redirect propagating DSN
-DSN: cccc_accept propagating DSN
 LOG: queue_run MAIN
   Start queue run: pid=pppp -qf
 locking TESTSUITE/spool/db/retry.lockfile

diff --git a/test/stderr/0378 b/test/stderr/0378
index e4823226774c58ee90bd3af76e2f55cd8e4ed891..fad082573cc8186cd9c3538551004e251f6c3f1a 100644 (file)
--- a/test/stderr/0378
+++ b/test/stderr/0378
@@ -1,10 +1,6 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: bounce propagating DSN
-DSN: defer propagating DSN
-DSN: aaaa_2nd_time propagating DSN
-DSN: aaaa propagating DSN
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
@@ -12,10 +8,6 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: bounce propagating DSN
-DSN: defer propagating DSN
-DSN: aaaa_2nd_time propagating DSN
-DSN: aaaa propagating DSN
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -129,20 +121,12 @@ locking TESTSUITE/spool/db/retry.lockfile
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: bounce propagating DSN
-DSN: defer propagating DSN
-DSN: aaaa_2nd_time propagating DSN
-DSN: aaaa propagating DSN
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=CALLER P=local S=sss
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: bounce propagating DSN
-DSN: defer propagating DSN
-DSN: aaaa_2nd_time propagating DSN
-DSN: aaaa propagating DSN
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -188,10 +172,6 @@ locking TESTSUITE/spool/db/retry.lockfile
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: bounce propagating DSN
-DSN: defer propagating DSN
-DSN: aaaa_2nd_time propagating DSN
-DSN: aaaa propagating DSN
 LOG: queue_run MAIN
   Start queue run: pid=pppp -qf
 locking TESTSUITE/spool/db/retry.lockfile

diff --git a/test/stderr/0379 b/test/stderr/0379
index ab435062652a8587d729bb492e9c58a438860e34..f94b23c95bcaeec8896565799f7e5744239c96b9 100644 (file)
--- a/test/stderr/0379
+++ b/test/stderr/0379
@@ -1,9 +1,6 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: defer propagating DSN
-DSN: aaaa_redirect propagating DSN
-DSN: bc propagating DSN
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
@@ -11,9 +8,6 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: defer propagating DSN
-DSN: aaaa_redirect propagating DSN
-DSN: bc propagating DSN
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -142,9 +136,6 @@ locking TESTSUITE/spool/db/retry.lockfile
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: defer propagating DSN
-DSN: aaaa_redirect propagating DSN
-DSN: bc propagating DSN
 LOG: queue_run MAIN
   Start queue run: pid=pppp -qf
 locking TESTSUITE/spool/db/retry.lockfile

diff --git a/test/stderr/0380 b/test/stderr/0380
index 5e81f1c67357d8a8fc0bf110efe302bf0ece039c..f483be253b7255dd4d6edb3a82d756b0fa8c9e92 100644 (file)
--- a/test/stderr/0380
+++ b/test/stderr/0380
@@ -1,10 +1,6 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: r0 propagating DSN
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
@@ -12,10 +8,6 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: r0 propagating DSN
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

diff --git a/test/stderr/0386 b/test/stderr/0386
index c24b8725cd71808da941df8ebc647563bd6bbd59..bec2521e00f4800800b39038c12268699984fa8c 100644 (file)
--- a/test/stderr/0386
+++ b/test/stderr/0386
@@ -8,7 +8,6 @@ trusted user
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -139,7 +138,6 @@ trusted user
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -230,7 +228,6 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: r1 propagating DSN
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 set_process_info: pppp delivering specified messages
@@ -414,7 +411,6 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: r1 propagating DSN
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 set_process_info: pppp delivering specified messages

diff --git a/test/stderr/0388 b/test/stderr/0388
index 96a2efede1132fb562659f25de7742f77fd1f38a..d5e31159a0fb49d8eb4ee9f7a53c8b15ba36f454 100644 (file)
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -3,8 +3,6 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 configuration file is TESTSUITE/test-config
 admin user
-DSN: r0 propagating DSN
-DSN: r1 propagating DSN
 set_process_info: pppp delivering specified messages
 set_process_info: pppp delivering 10HmaX-0005vi-00
 locking TESTSUITE/spool/db/retry.lockfile
@@ -179,8 +177,6 @@ trusted user
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r0 propagating DSN
-DSN: r1 propagating DSN
 originator: uid=EXIM_UID gid=EXIM_GID login=EXIMUSER name=
 sender address = 
 set_process_info: pppp accepting a local non-SMTP message from <>
@@ -234,8 +230,6 @@ changed uid/gid: forcing real = effective
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: r0 propagating DSN
-DSN: r1 propagating DSN
 set_process_info: pppp delivering specified messages
 set_process_info: pppp delivering 10HmaY-0005vi-00
 locking TESTSUITE/spool/db/retry.lockfile

diff --git a/test/stderr/0391 b/test/stderr/0391
index 1878f2f27632fdb2f8197dbd6fcca32ab0aa9a5c..47f5b5609c51c053c654e18c24a5afcab073a5b1 100644 (file)
--- a/test/stderr/0391
+++ b/test/stderr/0391
@@ -5,7 +5,6 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 sender_fullhost = [1.2.3.4]

diff --git a/test/stderr/0398 b/test/stderr/0398
index ff0aa766fab222892ffeaa0bb52ce2a4363eba7b..96cf8999d59e0012570be9a0c2ef552df94067c0 100644 (file)
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -5,8 +5,6 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME

diff --git a/test/stderr/0399 b/test/stderr/0399
index dcfe3e608139a1fa8dea7e86056b648c90fe3110..3bc5b8d238aa3a1c7cca47dd85151b47d88c4bea 100644 (file)
--- a/test/stderr/0399
+++ b/test/stderr/0399
@@ -3,9 +3,6 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 configuration file is TESTSUITE/test-config
 admin user
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID

diff --git a/test/stderr/0402 b/test/stderr/0402
index b5b2ed099bfb1fcadab81c316424d4df1c9dfafc..1eb25f51a2fbceccdbe514a0f14a15a4691901c5 100644 (file)
--- a/test/stderr/0402
+++ b/test/stderr/0402
@@ -5,11 +5,6 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
-DSN: r4 propagating DSN
-DSN: r5 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 seeking password data for user "CALLER": using cached result
@@ -169,11 +164,6 @@ changed uid/gid: forcing real = effective
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
-DSN: r4 propagating DSN
-DSN: r5 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 seeking password data for user "CALLER": using cached result

diff --git a/test/stderr/0403 b/test/stderr/0403
index e27f05a6bbd1f8e5a2b7afd0419399d20fd8b5f8..adb63f156bbfe15bae59e67266c3b626c9f3c187 100644 (file)
--- a/test/stderr/0403
+++ b/test/stderr/0403
@@ -5,7 +5,6 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -54,7 +53,6 @@ changed uid/gid: forcing real = effective
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: r1 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 set_process_info: pppp delivering specified messages

diff --git a/test/stderr/0404 b/test/stderr/0404
index 5bdfcb6afbf57b45f3f8c4242da0aff0fe405c23..fe68386fdcaff42e6cee0788759ba050a4b7f418 100644 (file)
--- a/test/stderr/0404
+++ b/test/stderr/0404
@@ -7,8 +7,6 @@ changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -156,8 +154,6 @@ trusted user
 admin user
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 set_process_info: pppp delivering specified messages
@@ -262,8 +258,6 @@ changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -1536,8 +1530,6 @@ trusted user
 admin user
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 set_process_info: pppp delivering specified messages

diff --git a/test/stderr/0408 b/test/stderr/0408
index f222df518f74ca67bd7d51532d623f1ceba304d5..fb9df8e3e8c73fa8ce01ee265ad4aedb9691a065 100644 (file)
--- a/test/stderr/0408
+++ b/test/stderr/0408
@@ -5,7 +5,6 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -54,7 +53,6 @@ changed uid/gid: forcing real = effective
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: r1 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 set_process_info: pppp delivering specified messages

diff --git a/test/stderr/0414 b/test/stderr/0414
index 6ac19025ad2f6228f93b249d1358014703772484..759e0f3bf681071dd8d8dee4e77919f91de7073a 100644 (file)
--- a/test/stderr/0414
+++ b/test/stderr/0414
@@ -3,9 +3,6 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 configuration file is TESTSUITE/test-config
 admin user
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME

diff --git a/test/stderr/0419 b/test/stderr/0419
index 3b5c51a17dcb4d90924a8e22d367206304587093..8aba8f1e48ba6695f219da3c17c98efeb55fe316 100644 (file)
--- a/test/stderr/0419
+++ b/test/stderr/0419
@@ -5,7 +5,6 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: dnslookup propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 Verifying: uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID

diff --git a/test/stderr/0426 b/test/stderr/0426
index 52914f0a575aadc20c2c031e869968927e5604d3..cbcf7687f683f18980db5e56eda104b2c1c17d98 100644 (file)
--- a/test/stderr/0426
+++ b/test/stderr/0426
@@ -1,8 +1,6 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: r0 propagating DSN
-DSN: r1 propagating DSN
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
@@ -10,8 +8,6 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: r0 propagating DSN
-DSN: r1 propagating DSN
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -57,16 +53,12 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: r0 propagating DSN
-DSN: r1 propagating DSN
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: r0 propagating DSN
-DSN: r1 propagating DSN
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

diff --git a/test/stderr/0432 b/test/stderr/0432
index ade8e0015d83b4d399da47e16f7f675a491e2aaf..f74df091c0adc5853b56de17585935ccdcaccc7b 100644 (file)
--- a/test/stderr/0432
+++ b/test/stderr/0432
@@ -30,7 +30,6 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 sender_fullhost = [1.2.3.4]
@@ -140,7 +139,6 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 sender_fullhost = [1.2.3.4]

diff --git a/test/stderr/0463 b/test/stderr/0463
index c8c956ddea6f84cf931404aee68903e78587a4d7..28e9d39517b0ad2006bb9813a80fd82798435386 100644 (file)
--- a/test/stderr/0463
+++ b/test/stderr/0463
@@ -3,7 +3,6 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 configuration file is TESTSUITE/test-config
 admin user
-DSN: all propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID

diff --git a/test/stderr/0464 b/test/stderr/0464
index b4c6636911fb7d5d3885e441c0a63b7dcbd62622..49315076cc67150ef80325450a1be8139981890b 100644 (file)
--- a/test/stderr/0464
+++ b/test/stderr/0464
@@ -5,8 +5,6 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 set_process_info: pppp accepting a local SMTP message from <CALLER@myhost.test.ex>

diff --git a/test/stderr/0469 b/test/stderr/0469
index ef16753d1457bf3eb57ee098f78d4e8122496261..24bee06d0820197560efa8be374b90e1f8a6a986 100644 (file)
--- a/test/stderr/0469
+++ b/test/stderr/0469
@@ -3,7 +3,6 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 configuration file is TESTSUITE/test-config
 admin user
-DSN: r1 propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID

diff --git a/test/stderr/0479 b/test/stderr/0479
index da8a56aad95eeb1271e5aa0ae25aa68d876627b2..070ed9074f24ce1a8ead668a907c6503ba910313 100644 (file)
--- a/test/stderr/0479
+++ b/test/stderr/0479
@@ -5,7 +5,6 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@the.local.host.name
 sender_fullhost = [1.2.3.4]

diff --git a/test/stderr/0483 b/test/stderr/0483
index a6e836e34c831c743a238e8629733f442478e8ac..b6b284e64879c84e141818cc331348268c5f0385 100644 (file)
--- a/test/stderr/0483
+++ b/test/stderr/0483
@@ -1,7 +1,6 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: r1 propagating DSN
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
 LOG: MAIN

diff --git a/test/stderr/0487 b/test/stderr/0487
index 1dd562218f55c1c10924ed97ba4eba1d31f23bb9..88ebfd66c025834464b56c68f646c409493c6165 100644 (file)
--- a/test/stderr/0487
+++ b/test/stderr/0487
@@ -8,7 +8,6 @@ trusted user
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -83,7 +82,6 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: r1 propagating DSN
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 set_process_info: pppp delivering specified messages

diff --git a/test/stderr/0499 b/test/stderr/0499
index ba278cdac20bfef8cc5194e830d14016274f0963..62b5a8afb261c8242b13246ff205f6f3e8cb4f06 100644 (file)
--- a/test/stderr/0499
+++ b/test/stderr/0499
@@ -3,7 +3,6 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 configuration file is TESTSUITE/test-config
 admin user
-DSN: r1 propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID

diff --git a/test/stderr/0543 b/test/stderr/0543
index b886b8464d9d4632c6695ca69d5eaffe4f6a2816..df359d6a1380e7f4ddb6b462e9e011f4d84d1d88 100644 (file)
--- a/test/stderr/0543
+++ b/test/stderr/0543
@@ -1,7 +1,6 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: smarthost propagating DSN
 LOG: queue_run MAIN
   Start queue run: pid=pppp
 locking TESTSUITE/spool/db/retry.lockfile

diff --git a/test/stderr/0545 b/test/stderr/0545
index 99cf67821d287bc588084bc0a482bfb2cc8bc008..b28f671ea56e7052e2c62a3fccff9767c5aaaa90 100644 (file)
--- a/test/stderr/0545
+++ b/test/stderr/0545
@@ -3,7 +3,6 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 configuration file is TESTSUITE/test-config
 admin user
-DSN: dns propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@the.local.host.name
 Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
@@ -73,7 +72,6 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 configuration file is TESTSUITE/test-config
 admin user
-DSN: dns propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@the.local.host.name
 Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID

diff --git a/test/stderr/0563 b/test/stderr/0563
index 21e7a13e5f9841766edff3cba0f5eb2feeb5ba74..2354943f8685be2e9d5c53929619f8ef4c0c8ab2 100644 (file)
--- a/test/stderr/0563
+++ b/test/stderr/0563
@@ -5,8 +5,6 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: router1 propagating DSN
-DSN: router2 propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_GECOS
 sender address = CALLER@testexim.test.ex
 Verifying: uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID

diff --git a/test/stderr/2201 b/test/stderr/2201
index 037d80d282117a2b6f5833db7bc65cd5a794b540..01283d60f11909f60d0521fc06610a9222ec444c 100644 (file)
--- a/test/stderr/2201
+++ b/test/stderr/2201
@@ -6,9 +6,6 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: r0 propagating DSN
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME

diff --git a/test/stderr/2600 b/test/stderr/2600
index cdb2409b86d599be8eeac93d16d5dccd17754bb1..5976263c14fd8242dbbf65a5fa50ead6110befc8 100644 (file)
--- a/test/stderr/2600
+++ b/test/stderr/2600
@@ -111,7 +111,6 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -207,7 +206,6 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -293,7 +291,6 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -342,7 +339,6 @@ changed uid/gid: forcing real = effective
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: r1 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 set_process_info: pppp delivering specified messages

diff --git a/test/stderr/3210 b/test/stderr/3210
index b80a287385cbc20c98c925ef521704aa335fc6c8..76677d7a08a39d48b1f8d061fa6756e90b26ddb0 100644 (file)
--- a/test/stderr/3210
+++ b/test/stderr/3210
@@ -5,7 +5,6 @@ configuration file is TESTSUITE/test-config
 admin user
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: r1 propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID

diff --git a/test/stderr/3400 b/test/stderr/3400
index aca7f5f6876c501e89898d717c96b119c9cc0a8b..a57621a058d1ab0a8d9a99fade1d6325c5ffb152 100644 (file)
--- a/test/stderr/3400
+++ b/test/stderr/3400
@@ -398,8 +398,6 @@ trusted user
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: fail_remote_domains propagating DSN
-DSN: localuser propagating DSN
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME

diff --git a/test/stderr/5004 b/test/stderr/5004
index 5d1d0d31cb7debb6dcbe02846bfc67a03a36e7e0..1f00fd6f9c3ad9e84f618fc6b2617a5a747af89d 100644 (file)
--- a/test/stderr/5004
+++ b/test/stderr/5004
@@ -7,7 +7,6 @@ changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: r1 propagating DSN
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -58,7 +57,6 @@ trusted user
 admin user
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: r1 propagating DSN
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 set_process_info: pppp delivering specified messages

diff --git a/test/stderr/5005 b/test/stderr/5005
index 36d82919294852dd105b14107622355204703ea5..0b804ae95decd28821c0d7c2c6b870bfd62635d4 100644 (file)
--- a/test/stderr/5005
+++ b/test/stderr/5005
@@ -5,7 +5,6 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -54,7 +53,6 @@ changed uid/gid: forcing real = effective
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: r1 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 set_process_info: pppp delivering specified messages
@@ -197,7 +195,6 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -245,7 +242,6 @@ changed uid/gid: forcing real = effective
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: r1 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 set_process_info: pppp delivering specified messages
@@ -389,7 +385,6 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -437,7 +432,6 @@ changed uid/gid: forcing real = effective
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: r1 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 set_process_info: pppp delivering specified messages
@@ -590,7 +584,6 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -638,7 +631,6 @@ changed uid/gid: forcing real = effective
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: r1 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 set_process_info: pppp delivering specified messages

diff --git a/test/stderr/5006 b/test/stderr/5006
index 2b2b3776135336569c64b944071f9924f5edf0e7..b78067eb218ee69ddbec53ce834bb366cb9ae972 100644 (file)
--- a/test/stderr/5006
+++ b/test/stderr/5006
@@ -5,7 +5,6 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -54,7 +53,6 @@ changed uid/gid: forcing real = effective
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-DSN: r1 propagating DSN
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 set_process_info: pppp delivering specified messages

diff --git a/test/stderr/5204 b/test/stderr/5204
index 4d169591ff408f2f725c72d0c4e060abe84fdd24..38f568d23fb7a014e60eeeb82575b58c7f3629a2 100644 (file)
--- a/test/stderr/5204
+++ b/test/stderr/5204
@@ -3,10 +3,6 @@ LOG: MAIN
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: b propagating DSN
-DSN: q propagating DSN
-DSN: s propagating DSN
-DSN: pm propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing "DECLINE cannot route this one (DECLINE)"@some.host
 --------> b router <--------
@@ -27,10 +23,6 @@ no more routers
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: b propagating DSN
-DSN: q propagating DSN
-DSN: s propagating DSN
-DSN: pm propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing "FAIL cannot route this one (FAIL)"@some.host
 --------> b router <--------
@@ -49,10 +41,6 @@ q router forced address failure
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: b propagating DSN
-DSN: q propagating DSN
-DSN: s propagating DSN
-DSN: pm propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing "ERROR cannot route this one (ERROR)"@some.host
 --------> b router <--------
@@ -74,10 +62,6 @@ q router: defer for "ERROR cannot route this one (ERROR)"@some.host
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: b propagating DSN
-DSN: q propagating DSN
-DSN: s propagating DSN
-DSN: pm propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing "DEFER cannot route this one (DEFER)"@some.host
 --------> b router <--------
@@ -97,10 +81,6 @@ q router: defer for "DEFER cannot route this one (DEFER)"@some.host
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: b propagating DSN
-DSN: q propagating DSN
-DSN: s propagating DSN
-DSN: pm propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing "ACCEPT transport = other_smtp hosts=ten-1.test.ex"@some.host
 --------> b router <--------
@@ -128,10 +108,6 @@ routed by q router
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: b propagating DSN
-DSN: q propagating DSN
-DSN: s propagating DSN
-DSN: pm propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing PASS@some.host
 --------> b router <--------
@@ -171,10 +147,6 @@ routed by s router
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: b propagating DSN
-DSN: q propagating DSN
-DSN: s propagating DSN
-DSN: pm propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing "FREEZE cannot route this one (FREEZE)"@some.host
 --------> b router <--------
@@ -194,10 +166,6 @@ q router: defer for "FREEZE cannot route this one (FREEZE)"@some.host
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: b propagating DSN
-DSN: q propagating DSN
-DSN: s propagating DSN
-DSN: pm propagating DSN
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing "REDIRECT postmaster@test.ex"@some.host
 --------> b router <--------
@@ -252,10 +220,6 @@ routed by pm router
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-DSN: b propagating DSN
-DSN: q propagating DSN
-DSN: s propagating DSN
-DSN: pm propagating DSN
 host in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from [V4NET.2.3.4]

diff --git a/test/stdout/0002 b/test/stdout/0002
index c7f8cce80a7f69aeeec7fe81cd4afdd283e6d84f..20f418360a956f087f8d4d229a4d452afc264834 100644 (file)
--- a/test/stdout/0002
+++ b/test/stdout/0002
@@ -736,9 +736,9 @@ xyz
 > 
 > # Syntax errors
 > 
-> Failed: prvs second argument must be a single digit
-> Failed: prvs second argument must be a single digit
-> Failed: prvs second argument must be a single digit
+> Failed: prvs third argument must be a single digit
+> Failed: prvs third argument must be a single digit
+> Failed: prvs third argument must be a single digit
 > 
 > # Correct checks; can't put explicit addresses in the tests, because they
 > # will change over time.