Debug: minor updates

diff --git a/src/src/debug.c b/src/src/debug.c
index 6d6132e39c71eb999d851689846b4a8d524377d7..90c48dde407e2ebf3b8abe5a12585ee11a7fd08d 100644 (file)
--- a/src/src/debug.c
+++ b/src/src/debug.c
@@ -30,7 +30,15 @@ const uschar * rc_names[] = {                /* Mostly for debug output */
   [UNEXPECTED] =       US"UNEXPECTED",
   [CANCELLED] =                US"CANCELLED",
   [FAIL_SEND] =                US"FAIL_SEND",
   [UNEXPECTED] =       US"UNEXPECTED",
   [CANCELLED] =                US"CANCELLED",
   [FAIL_SEND] =                US"FAIL_SEND",

-  [FAIL_DROP] =                US"FAIL_DROP"
+  [FAIL_DROP] =                US"FAIL_DROP",
+};
+
+const uschar * dns_rc_names[] = {
+  [DNS_SUCCEED] =      US"DNS_SUCCEED",
+  [DNS_NOMATCH] =      US"DNS_NOMATCH",
+  [DNS_NODATA] =       US"DNS_NODATA",
+  [DNS_AGAIN] =                US"DNS_AGAIN",
+  [DNS_FAIL] =         US"DNS_FAIL",

 };
 
 
 };
 
 


@@ -43,8 +51,8 @@ hold the line-drawing characters that need to be printed on every line as it
 moves down the page. This function is used only in debugging circumstances. The
 output is done via debug_printf(). */
 
 moves down the page. This function is used only in debugging circumstances. The
 output is done via debug_printf(). */
 

-#define tree_printlinesize 132   /* line size for printing */
-static uschar tree_printline[tree_printlinesize];
+#define TREE_PRINTLINESIZE 132   /* line size for printing */
+static uschar tree_printline[TREE_PRINTLINESIZE];

 
 /* Internal recursive subroutine.
 
 
 /* Internal recursive subroutine.
 


@@ -57,12 +65,12 @@ Returns:     nothing
 */
 
 static void
 */
 
 static void

-tree_printsub(tree_node *p, int pos, int barswitch)
+tree_printsub(tree_node * p, int pos, int barswitch)

 {
 if (p->right) tree_printsub(p->right, pos+2, 1);
 {
 if (p->right) tree_printsub(p->right, pos+2, 1);

-for (int i = 0; i <= pos-1; i++) debug_printf("%c", tree_printline[i]);
-debug_printf("-->%s [%d]\n", p->name, p->balance);
-tree_printline[pos] = barswitch? '|' : ' ';
+for (int i = 0; i <= pos-1; i++) debug_printf_indent(" %c", tree_printline[i]);
+debug_printf_indent(" -->%s [%d]\n", p->name, p->balance);
+tree_printline[pos] = barswitch ? '|' : ' ';

 if (p->left)
   {
   tree_printline[pos+2] = '|';
 if (p->left)
   {
   tree_printline[pos+2] = '|';


@@ -73,11 +81,12 @@ if (p->left)
 /* The external function, with just a tree node argument. */
 
 void
 /* The external function, with just a tree node argument. */
 
 void

-debug_print_tree(tree_node *p)
+debug_print_tree(const char * title, tree_node * p)

 {
 {

-for (int i = 0; i < tree_printlinesize; i++) tree_printline[i] = ' ';
-if (!p) debug_printf("Empty Tree\n"); else tree_printsub(p, 0, 0);
-debug_printf("---- End of tree ----\n");
+debug_printf_indent("%s:\n", title);
+for (int i = 0; i < TREE_PRINTLINESIZE; i++) tree_printline[i] = ' ';
+if (!p) debug_printf_indent(" Empty Tree\n"); else tree_printsub(p, 0, 0);
+debug_printf_indent("---- End of tree ----\n");

 }
 
 
 }
 
 

diff --git a/src/src/dns.c b/src/src/dns.c
index 98c44b9f29225553941db47bcd5d93e33add3f46..a636f076da942af43b8139e3bc947f29e493c2b9 100644 (file)
--- a/src/src/dns.c
+++ b/src/src/dns.c
@@ -671,13 +671,10 @@ e = previous->data.ptr;
 val = e->data.val;
 rc = e->expiry && e->expiry <= time(NULL) ? -1 : val;
 
 val = e->data.val;
 rc = e->expiry && e->expiry <= time(NULL) ? -1 : val;
 

-DEBUG(D_dns) debug_printf("DNS lookup of %.255s-%s: %scached value %s%s\n",
+DEBUG(D_dns) debug_printf("DNS lookup of %.255s (%s): %scached value %s%s\n",

   name, dns_text_type(type),
   rc == -1 ? "" : "using ",
   name, dns_text_type(type),
   rc == -1 ? "" : "using ",

-    val == DNS_NOMATCH ? "DNS_NOMATCH" :
-    val == DNS_NODATA ? "DNS_NODATA" :
-    val == DNS_AGAIN ? "DNS_AGAIN" :
-    val == DNS_FAIL ? "DNS_FAIL" : "??",
+  dns_rc_names[val],

   rc == -1 ? " past valid time" : "");
 
 return rc;
   rc == -1 ? " past valid time" : "");
 
 return rc;

diff --git a/src/src/functions.h b/src/src/functions.h
index e5cf7f1404240dcd2663984643c977d4c0006b1c..e7f643110e50dd89426b6a65bd65286d4ecde7f9 100644 (file)
--- a/src/src/functions.h
+++ b/src/src/functions.h
@@ -182,7 +182,7 @@ extern void    debug_print_argv(const uschar **);
 extern void    debug_print_ids(uschar *);
 extern void    debug_printf_indent(const char *, ...) PRINTF_FUNCTION(1,2);
 extern void    debug_print_string(uschar *);
 extern void    debug_print_ids(uschar *);
 extern void    debug_printf_indent(const char *, ...) PRINTF_FUNCTION(1,2);
 extern void    debug_print_string(uschar *);

-extern void    debug_print_tree(tree_node *);
+extern void    debug_print_tree(const char *, tree_node *);

 extern void    debug_vprintf(int, const char *, va_list);
 extern void    debug_print_socket(int);
 
 extern void    debug_vprintf(int, const char *, va_list);
 extern void    debug_print_socket(int);
 

diff --git a/src/src/globals.h b/src/src/globals.h
index 962da137f811b536a50fd570336159a4e2ad5dfb..47b4b522625e2913a38027d60e9663435b1794b9 100644 (file)
--- a/src/src/globals.h
+++ b/src/src/globals.h
@@ -544,6 +544,7 @@ extern int     dns_dane_ok;            /* Ok to use DANE when checking TLS authe
 extern int     dns_retrans;            /* Retransmission time setting */
 extern int     dns_retry;              /* Number of retries */
 extern int     dns_dnssec_ok;          /* When constructing DNS query, set DO flag */
 extern int     dns_retrans;            /* Retransmission time setting */
 extern int     dns_retry;              /* Number of retries */
 extern int     dns_dnssec_ok;          /* When constructing DNS query, set DO flag */

+extern const uschar * dns_rc_names[];  /* Mostly for debug output */

 extern uschar *dns_trust_aa;           /* DNSSEC trust AA as AD */
 extern int     dns_use_edns0;          /* Coerce EDNS0 support on/off in resolver. */
 extern uschar *dnslist_domain;         /* DNS (black) list domain */
 extern uschar *dns_trust_aa;           /* DNSSEC trust AA as AD */
 extern int     dns_use_edns0;          /* Coerce EDNS0 support on/off in resolver. */
 extern uschar *dnslist_domain;         /* DNS (black) list domain */

diff --git a/src/src/host.c b/src/src/host.c
index 99bbba7a3e0f7ee205ba94251563c0faf68d31ed..7408286ec2b2ce8001e16980bb267ee219484355 100644 (file)
--- a/src/src/host.c
+++ b/src/src/host.c
@@ -3197,7 +3197,7 @@ BOOL sec;
 rc = dns_lookup_timerwrap(dnsa, buffer, T_TLSA, &fullname);
 sec = dns_is_secure(dnsa);
 DEBUG(D_transport)
 rc = dns_lookup_timerwrap(dnsa, buffer, T_TLSA, &fullname);
 sec = dns_is_secure(dnsa);
 DEBUG(D_transport)

-  debug_printf("TLSA lookup ret %d %sDNSSEC\n", rc, sec ? "" : "not ");
+  debug_printf("TLSA lookup ret %s %sDNSSEC\n", dns_rc_names[rc], sec ? "" : "not ");

 
 switch (rc)
   {
 
 switch (rc)
   {

diff --git a/src/src/macros.h b/src/src/macros.h
index baac435ec0d0efe18a7fec2f7572d822889711a6..5c3fa06f6b7fe50721f0405dd05497f7950599f7 100644 (file)
--- a/src/src/macros.h
+++ b/src/src/macros.h
@@ -313,7 +313,7 @@ Use rc_names[] for debug strings. */
 #define DELIVER_MUA_FAILED         2  /* Failure when mua_wrapper is set */
 #define DELIVER_NOT_ATTEMPTED      3  /* Not tried (no msg or is locked */
 
 #define DELIVER_MUA_FAILED         2  /* Failure when mua_wrapper is set */
 #define DELIVER_NOT_ATTEMPTED      3  /* Not tried (no msg or is locked */
 

-/* Returns from DNS lookup functions. */
+/* Returns from DNS lookup functions. Use dns_rc_names[] for debug strings */

 
 enum { DNS_SUCCEED, DNS_NOMATCH, DNS_NODATA, DNS_AGAIN, DNS_FAIL };
 
 
 enum { DNS_SUCCEED, DNS_NOMATCH, DNS_NODATA, DNS_AGAIN, DNS_FAIL };
 

diff --git a/src/src/spool_in.c b/src/src/spool_in.c
index 4b70780bcbddb66c577bcde2a4bcf224fd63c454..a2d3b8914fb7b26cc95d9408a9e384310e9cb89c 100644 (file)
--- a/src/src/spool_in.c
+++ b/src/src/spool_in.c
@@ -727,11 +727,7 @@ if (Ustrncmp(big_buffer, "XX\n", 3) != 0 &&
     goto SPOOL_FORMAT_ERROR;
 
 #ifndef COMPILE_UTILITY
     goto SPOOL_FORMAT_ERROR;
 
 #ifndef COMPILE_UTILITY

-DEBUG(D_deliver)
-  {
-  debug_printf("Non-recipients:\n");
-  debug_print_tree(tree_nonrecipients);
-  }
+DEBUG(D_deliver) debug_print_tree("Non-recipients", tree_nonrecipients);

 #endif  /* COMPILE_UTILITY */
 
 /* After reading the tree, the next line has not yet been read into the
 #endif  /* COMPILE_UTILITY */
 
 /* After reading the tree, the next line has not yet been read into the

diff --git a/test/stderr/0183 b/test/stderr/0183
index de7f5ab450ad8caf374b1475780e03bcc15877bb..3ffdf28eae2242e90bd0c359b20416e1daf45b67 100644 (file)
--- a/test/stderr/0183
+++ b/test/stderr/0183
@@ -62,7 +62,7 @@ calling lookuphost router
 lookuphost router called for abcd@test.again.dns
   domain = test.again.dns
 test.again.dns in "*"? yes (matched "*")
 lookuphost router called for abcd@test.again.dns
   domain = test.again.dns
 test.again.dns in "*"? yes (matched "*")

-DNS lookup of test.again.dns-MX: using cached value DNS_AGAIN
+DNS lookup of test.again.dns (MX): using cached value DNS_AGAIN

 lookuphost router: defer for abcd@test.again.dns
   message: host lookup did not complete
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 lookuphost router: defer for abcd@test.again.dns
   message: host lookup did not complete
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -166,7 +166,7 @@ expanded list of hosts = 'test.again.dns' options = 'bydns'
 finding IP address for test.again.dns
 doing DNS lookup
 test.again.dns in "*"? yes (matched "*")
 finding IP address for test.again.dns
 doing DNS lookup
 test.again.dns in "*"? yes (matched "*")

-DNS lookup of test.again.dns-A: using cached value DNS_AGAIN
+DNS lookup of test.again.dns (A): using cached value DNS_AGAIN

 useryz router: defer for userz@test.again.dns
   message: host lookup for test.again.dns did not complete (DNS timeout?)
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 useryz router: defer for userz@test.again.dns
   message: host lookup for test.again.dns did not complete (DNS timeout?)
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -193,7 +193,7 @@ calling lookuphost router
 lookuphost router called for xyz@ten-1.test.ex
   domain = ten-1.test.ex
 ten-1.test.ex in "*"? yes (matched "*")
 lookuphost router called for xyz@ten-1.test.ex
   domain = ten-1.test.ex
 ten-1.test.ex in "*"? yes (matched "*")

-DNS lookup of ten-1.test.ex-MX: using cached value DNS_NODATA
+DNS lookup of ten-1.test.ex (MX): using cached value DNS_NODATA

 DNS lookup of ten-1.test.ex (A) using fakens
 DNS lookup of ten-1.test.ex (A) succeeded
 fully qualified name = ten-1.test.ex
 DNS lookup of ten-1.test.ex (A) using fakens
 DNS lookup of ten-1.test.ex (A) succeeded
 fully qualified name = ten-1.test.ex


@@ -271,7 +271,7 @@ calling lookuphost router
 lookuphost router called for abcd@test.fail.dns
   domain = test.fail.dns
 test.fail.dns in "*"? yes (matched "*")
 lookuphost router called for abcd@test.fail.dns
   domain = test.fail.dns
 test.fail.dns in "*"? yes (matched "*")

-DNS lookup of test.fail.dns-MX: using cached value DNS_FAIL
+DNS lookup of test.fail.dns (MX): using cached value DNS_FAIL

 lookuphost router: defer for abcd@test.fail.dns
   message: host lookup did not complete
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 lookuphost router: defer for abcd@test.fail.dns
   message: host lookup did not complete
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -374,7 +374,7 @@ expanded list of hosts = 'test.fail.dns' options = 'bydns'
 finding IP address for test.fail.dns
 doing DNS lookup
 test.fail.dns in "*"? yes (matched "*")
 finding IP address for test.fail.dns
 doing DNS lookup
 test.fail.dns in "*"? yes (matched "*")

-DNS lookup of test.fail.dns-A: using cached value DNS_FAIL
+DNS lookup of test.fail.dns (A): using cached value DNS_FAIL

 useryz router: defer for userz@test.fail.dns
   message: host lookup for test.fail.dns did not complete (DNS timeout?)
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 useryz router: defer for userz@test.fail.dns
   message: host lookup for test.fail.dns did not complete (DNS timeout?)
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -401,7 +401,7 @@ calling lookuphost router
 lookuphost router called for xyz@ten-1.test.ex
   domain = ten-1.test.ex
 ten-1.test.ex in "*"? yes (matched "*")
 lookuphost router called for xyz@ten-1.test.ex
   domain = ten-1.test.ex
 ten-1.test.ex in "*"? yes (matched "*")

-DNS lookup of ten-1.test.ex-MX: using cached value DNS_NODATA
+DNS lookup of ten-1.test.ex (MX): using cached value DNS_NODATA

 DNS lookup of ten-1.test.ex (A) using fakens
 DNS lookup of ten-1.test.ex (A) succeeded
 fully qualified name = ten-1.test.ex
 DNS lookup of ten-1.test.ex (A) using fakens
 DNS lookup of ten-1.test.ex (A) succeeded
 fully qualified name = ten-1.test.ex


@@ -481,7 +481,7 @@ calling lookuphost router
 lookuphost router called for abcd@nonexist.test.ex
   domain = nonexist.test.ex
 nonexist.test.ex in "*"? yes (matched "*")
 lookuphost router called for abcd@nonexist.test.ex
   domain = nonexist.test.ex
 nonexist.test.ex in "*"? yes (matched "*")

-DNS lookup of nonexist.test.ex-MX: using cached value DNS_NOMATCH
+DNS lookup of nonexist.test.ex (MX): using cached value DNS_NOMATCH

 lookuphost router declined for abcd@nonexist.test.ex
 "more" is false: skipping remaining routers
 no more routers
 lookuphost router declined for abcd@nonexist.test.ex
 "more" is false: skipping remaining routers
 no more routers


@@ -586,7 +586,7 @@ expanded list of hosts = 'nonexist.test.ex' options = 'bydns'
 finding IP address for nonexist.test.ex
 doing DNS lookup
 nonexist.test.ex in "*"? yes (matched "*")
 finding IP address for nonexist.test.ex
 doing DNS lookup
 nonexist.test.ex in "*"? yes (matched "*")

-DNS lookup of nonexist.test.ex-A: using cached value DNS_NOMATCH
+DNS lookup of nonexist.test.ex (A): using cached value DNS_NOMATCH

 useryz router: defer for userz@nonexist.test.ex
   message: lookup of host "nonexist.test.ex" failed in useryz router
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 useryz router: defer for userz@nonexist.test.ex
   message: lookup of host "nonexist.test.ex" failed in useryz router
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -613,7 +613,7 @@ calling lookuphost router
 lookuphost router called for xyz@ten-1.test.ex
   domain = ten-1.test.ex
 ten-1.test.ex in "*"? yes (matched "*")
 lookuphost router called for xyz@ten-1.test.ex
   domain = ten-1.test.ex
 ten-1.test.ex in "*"? yes (matched "*")

-DNS lookup of ten-1.test.ex-MX: using cached value DNS_NODATA
+DNS lookup of ten-1.test.ex (MX): using cached value DNS_NODATA

 DNS lookup of ten-1.test.ex (A) using fakens
 DNS lookup of ten-1.test.ex (A) succeeded
 fully qualified name = ten-1.test.ex
 DNS lookup of ten-1.test.ex (A) using fakens
 DNS lookup of ten-1.test.ex (A) succeeded
 fully qualified name = ten-1.test.ex


@@ -769,7 +769,7 @@ calling delay router
 delay router called for userd@nonexist.example.com
   domain = nonexist.example.com
 nonexist.example.com in "*"? yes (matched "*")
 delay router called for userd@nonexist.example.com
   domain = nonexist.example.com
 nonexist.example.com in "*"? yes (matched "*")

-DNS lookup of nonexist.example.com-MX: cached value DNS_NOMATCH past valid time
+DNS lookup of nonexist.example.com (MX): cached value DNS_NOMATCH past valid time

 DNS lookup of nonexist.example.com (MX) using fakens
 DNS lookup of nonexist.example.com (MX) gave HOST_NOT_FOUND
 returning DNS_NOMATCH
 DNS lookup of nonexist.example.com (MX) using fakens
 DNS lookup of nonexist.example.com (MX) gave HOST_NOT_FOUND
 returning DNS_NOMATCH

diff --git a/test/stderr/0264 b/test/stderr/0264
index d8e96191c660061aba06c74cb3c83422a2504d7b..f572148f133b8ab25606da36da4a06dfff6f2f0d 100644 (file)
--- a/test/stderr/0264
+++ b/test/stderr/0264
@@ -17,7 +17,7 @@ reading spool file 10HmbJ-0005vi-00-H
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:

-Empty Tree
+ Empty Tree

 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields

diff --git a/test/stderr/0275 b/test/stderr/0275
index 35f1e4442c095b340ccdf4061615250f50b9d7b9..a39ab10b3bd0ca967b38b829d8e54d2a81e27b27 100644 (file)
--- a/test/stderr/0275
+++ b/test/stderr/0275
@@ -159,7 +159,7 @@ reading spool file 10HmaX-0005vi-00-H
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:

-Empty Tree
+ Empty Tree

 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields

diff --git a/test/stderr/0278 b/test/stderr/0278
index 23b0ba9c66efad6e2bc284ed92b4eed882a04cc5..634c3facc8df749716f179f89d7622de576c4913 100644 (file)
--- a/test/stderr/0278
+++ b/test/stderr/0278
@@ -118,7 +118,7 @@ reading spool file 10HmaX-0005vi-00-H
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:

-Empty Tree
+ Empty Tree

 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields

diff --git a/test/stderr/0361 b/test/stderr/0361
index 5a57d33225c79cf44d47096fe8a718b4614bf22c..1eb9485864e22232ccd456f14a4d34ed97aa6b62 100644 (file)
--- a/test/stderr/0361
+++ b/test/stderr/0361
@@ -64,7 +64,7 @@ reading spool file 10HmaY-0005vi-00-H
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:

-Empty Tree
+ Empty Tree

 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields

diff --git a/test/stderr/0386 b/test/stderr/0386
index b136548b7bb41488aef1c859611733960a05436c..fb7382b21c165f7c17758b1d9855dc71ead59daf 100644 (file)
--- a/test/stderr/0386
+++ b/test/stderr/0386
@@ -260,7 +260,7 @@ sender_fullhost = [V4NET.11.12.13]
 sender_rcvhost = [V4NET.11.12.13] (ident=CALLER)
 sender_local=0 ident=CALLER
 Non-recipients:
 sender_rcvhost = [V4NET.11.12.13] (ident=CALLER)
 sender_local=0 ident=CALLER
 Non-recipients:

-Empty Tree
+ Empty Tree

 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields


@@ -449,7 +449,7 @@ sender_fullhost = [V4NET.11.12.13]
 sender_rcvhost = [V4NET.11.12.13] (ident=CALLER)
 sender_local=0 ident=CALLER
 Non-recipients:
 sender_rcvhost = [V4NET.11.12.13] (ident=CALLER)
 sender_local=0 ident=CALLER
 Non-recipients:

-Empty Tree
+ Empty Tree

 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields

diff --git a/test/stderr/0402 b/test/stderr/0402
index 1f6bf19c782701f0a9169680c70c0c75397b3f4a..2fe542bb79fd0375d8d4e540bb414b2a5ac598d3 100644 (file)
--- a/test/stderr/0402
+++ b/test/stderr/0402
@@ -189,7 +189,7 @@ reading spool file 10HmaX-0005vi-00-H
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:

-Empty Tree
+ Empty Tree

 ---- End of tree ----
 recipients_count=5
 **** SPOOL_IN - No additional fields
 ---- End of tree ----
 recipients_count=5
 **** SPOOL_IN - No additional fields

diff --git a/test/stderr/0403 b/test/stderr/0403
index 16bf13b5e36a8a26f0780c603aa0982a03d61b9c..c71e924fe7519520f139b749aedb54991077e95c 100644 (file)
--- a/test/stderr/0403
+++ b/test/stderr/0403
@@ -58,7 +58,7 @@ reading spool file 10HmaX-0005vi-00-H
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:

-Empty Tree
+ Empty Tree

 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields

diff --git a/test/stderr/0404 b/test/stderr/0404
index b1a78c9fa97cc276d750fe8a0438ff3148b93155..4d5aeaf3ea777e82a5dacb638d82f1a2271b355d 100644 (file)
--- a/test/stderr/0404
+++ b/test/stderr/0404
@@ -159,7 +159,7 @@ reading spool file 10HmaX-0005vi-00-H
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:

-Empty Tree
+ Empty Tree

 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields


@@ -925,7 +925,7 @@ reading spool file 10HmaY-0005vi-00-H
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=
 sender_local=1 ident=CALLER
 Non-recipients:
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=
 sender_local=1 ident=CALLER
 Non-recipients:

-Empty Tree
+ Empty Tree

 ---- End of tree ----
 recipients_count=608
 **** SPOOL_IN - No additional fields
 ---- End of tree ----
 recipients_count=608
 **** SPOOL_IN - No additional fields

diff --git a/test/stderr/0408 b/test/stderr/0408
index 3fbd0f2a6991a03004a2aef18a305fed5a5609ad..6320691f31ecee14cbf1743f339d0d874ea910f7 100644 (file)
--- a/test/stderr/0408
+++ b/test/stderr/0408
@@ -58,7 +58,7 @@ reading spool file 10HmaX-0005vi-00-H
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:

-Empty Tree
+ Empty Tree

 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields

diff --git a/test/stderr/0487 b/test/stderr/0487
index 83d243a54f552822fb46b66dfa9279eaadf6ad8f..e8e9dcb75db45c26d51878f1074583c1e7034578 100644 (file)
--- a/test/stderr/0487
+++ b/test/stderr/0487
@@ -86,7 +86,7 @@ reading spool file 10HmaX-0005vi-00-H
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=x@y
 sender_local=0 ident=CALLER
 Non-recipients:
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=x@y
 sender_local=0 ident=CALLER
 Non-recipients:

-Empty Tree
+ Empty Tree

 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields

diff --git a/test/stderr/0514 b/test/stderr/0514
index 0c24042f8f4eb68e8a095a31da52a7d61104b60e..ab55c9a2e9ab52a51dc70c1e443ad0b89700e647 100644 (file)
--- a/test/stderr/0514
+++ b/test/stderr/0514
@@ -11,7 +11,7 @@ reading spool file 10HmaX-0005vi-00-H
 user=spaced user uid=CALLER_UID gid=CALLER_GID sender="spaced user"@myhost.test.ex
 sender_local=1 ident=spaced user
 Non-recipients:
 user=spaced user uid=CALLER_UID gid=CALLER_GID sender="spaced user"@myhost.test.ex
 sender_local=1 ident=spaced user
 Non-recipients:

-Empty Tree
+ Empty Tree

 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields

diff --git a/test/stderr/0545 b/test/stderr/0545
index da669b580b79bbea63232050a7a681d05c783b36..96f235c767e18b5b65cf2a13a02e7dddf9a662b7 100644 (file)
--- a/test/stderr/0545
+++ b/test/stderr/0545
@@ -52,7 +52,7 @@ alias-eximtesthost.test.ex in "*"? yes (matched "*")
 DNS lookup of alias-eximtesthost.test.ex (MX) using fakens
 DNS lookup of alias-eximtesthost.test.ex (MX) succeeded
 CNAME found: change to eximtesthost.test.ex
 DNS lookup of alias-eximtesthost.test.ex (MX) using fakens
 DNS lookup of alias-eximtesthost.test.ex (MX) succeeded
 CNAME found: change to eximtesthost.test.ex

-DNS lookup of eximtesthost.test.ex-MX: using cached value DNS_NODATA
+DNS lookup of eximtesthost.test.ex (MX): using cached value DNS_NODATA

 DNS lookup of alias-eximtesthost.test.ex (A) using fakens
 DNS lookup of alias-eximtesthost.test.ex (A) succeeded
 CNAME found: change to eximtesthost.test.ex
 DNS lookup of alias-eximtesthost.test.ex (A) using fakens
 DNS lookup of alias-eximtesthost.test.ex (A) succeeded
 CNAME found: change to eximtesthost.test.ex

diff --git a/test/stderr/2600 b/test/stderr/2600
index 93bb7fa1bcf8cfb667253c7419de8a6b5ae02ee3..0f29c58fd8bce6da371f5d5a8c80e315e171ccd1 100644 (file)
--- a/test/stderr/2600
+++ b/test/stderr/2600
@@ -469,7 +469,7 @@ reading spool file 10HmaX-0005vi-00-H
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@myhost.test.ex
 sender_local=1 ident=CALLER
 Non-recipients:
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@myhost.test.ex
 sender_local=1 ident=CALLER
 Non-recipients:

-Empty Tree
+ Empty Tree

 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields

diff --git a/test/stderr/2610 b/test/stderr/2610
index 7ed300affc97fc437e431aca799ffa20dc42a552..8bd7810b09add7387b3ea91386e2ed249d88a19c 100644 (file)
--- a/test/stderr/2610
+++ b/test/stderr/2610
@@ -467,7 +467,7 @@ reading spool file 10HmaX-0005vi-00-H
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@myhost.test.ex
 sender_local=1 ident=CALLER
 Non-recipients:
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@myhost.test.ex
 sender_local=1 ident=CALLER
 Non-recipients:

-Empty Tree
+ Empty Tree

 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields

diff --git a/test/stderr/2620 b/test/stderr/2620
index 2595070e3594ddbb9da0dfb7f64038792860ddd0..7875ec24b6cf2fee76f2eb23c4ed7a79d90c60e9 100644 (file)
--- a/test/stderr/2620
+++ b/test/stderr/2620
@@ -524,7 +524,7 @@ reading spool file 10HmaX-0005vi-00-H
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@myhost.test.ex
 sender_local=1 ident=CALLER
 Non-recipients:
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@myhost.test.ex
 sender_local=1 ident=CALLER
 Non-recipients:

-Empty Tree
+ Empty Tree

 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields

diff --git a/test/stderr/5004 b/test/stderr/5004
index 0ec996f90fe34b4782a4665afec88a564df22685..4d0ac7735c3746d9fa373d5d85d86969a18452c5 100644 (file)
--- a/test/stderr/5004
+++ b/test/stderr/5004
@@ -62,7 +62,7 @@ reading spool file 10HmaX-0005vi-00-H
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:

-Empty Tree
+ Empty Tree

 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields

diff --git a/test/stderr/5005 b/test/stderr/5005
index 324d30d9e78966dd1fc80c236f3789ec9379e11f..417ddaec970d21687f0ef9bd7210f97143520227 100644 (file)
--- a/test/stderr/5005
+++ b/test/stderr/5005
@@ -58,7 +58,7 @@ reading spool file 10HmaX-0005vi-00-H
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:

-Empty Tree
+ Empty Tree

 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields


@@ -243,7 +243,7 @@ reading spool file 10HmaY-0005vi-00-H
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:

-Empty Tree
+ Empty Tree

 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields


@@ -429,7 +429,7 @@ reading spool file 10HmaZ-0005vi-00-H
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:

-Empty Tree
+ Empty Tree

 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields


@@ -621,7 +621,7 @@ reading spool file 10HmbA-0005vi-00-H
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:

-Empty Tree
+ Empty Tree

 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields

diff --git a/test/stderr/5006 b/test/stderr/5006
index d7f3b187249e7dc0d6e7011337f417b90f7c7907..18dd1491d924fb302b4f15c2a606a93cdb2a6679 100644 (file)
--- a/test/stderr/5006
+++ b/test/stderr/5006
@@ -58,7 +58,7 @@ reading spool file 10HmaX-0005vi-00-H
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:

-Empty Tree
+ Empty Tree

 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields