[exim-cvs] Debug: indentation

Commit:     78e481bba25df9e8e0cc4308783d1dbc5d58dc71
Parent:     6723707404c72285565457b58c62afc6f1a9d36a
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Fri Nov 1 12:25:31 2024 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Fri Nov 1 12:25:31 2024 +0000

    Debug: indentation
---
 src/src/functions.h |  8 ++++---
 src/src/host.c      | 51 +++++++++++++++++++++++++--------------------
 src/src/verify.c    |  5 ++++-
 test/stderr/0002    | 43 +++++++++++++++++++-------------------
 test/stderr/0020    |  4 ++--
 test/stderr/0023    | 12 +++++------
 test/stderr/0062    | 60 ++++++++++++++++++++++++++---------------------------
 test/stderr/0063    | 32 ++++++++++++++--------------
 test/stderr/0064    | 32 ++++++++++++++--------------
 test/stderr/0066    | 20 +++++++++---------
 test/stderr/0069    | 58 +++++++++++++++++++++++++--------------------------
 test/stderr/0070    | 16 +++++++-------
 test/stderr/0089    | 22 ++++++++++----------
 test/stderr/0094    | 19 +++++++++--------
 test/stderr/0124    |  4 ++--
 test/stderr/0234    |  8 +++----
 test/stderr/0281    | 38 ++++++++++++++++-----------------
 test/stderr/0303    |  8 +++----
 test/stderr/0308    | 20 +++++++++---------
 test/stderr/0381    | 55 ++++++++++++++++++++++++------------------------
 test/stderr/0394    |  8 +++----
 test/stderr/0401    |  6 +++---
 test/stderr/0419    |  6 +++---
 test/stderr/0426    |  2 +-
 test/stderr/0499    |  4 ++--
 test/stderr/0537    |  2 +-
 test/stderr/0545    |  6 +++---
 test/stderr/0587    |  2 +-
 test/stderr/0588    |  4 ++--
 test/stderr/1000    |  4 ++--
 test/stderr/2202    | 41 ++++++++++++++++++------------------
 test/stderr/5820    |  2 +-
 test/stderr/5840    |  2 +-
 33 files changed, 309 insertions(+), 295 deletions(-)

diff --git a/src/src/functions.h b/src/src/functions.h
index b581af78b..f04fe1f1b 100644
--- a/src/src/functions.h
+++ b/src/src/functions.h
@@ -1347,17 +1347,19 @@ static inline pid_t
 exim_fork(const unsigned char * purpose)
 {
 pid_t pid;
-DEBUG(D_any) debug_printf("%s forking for %s\n", process_purpose, purpose);
+DEBUG(D_any)
+  debug_printf_indent("%s forking for %s\n", process_purpose, purpose);
 if ((pid = fork()) == 0)
   {
   f.daemon_listen = FALSE;
   process_purpose = purpose;
-  DEBUG(D_any) debug_printf("postfork: %s\n", purpose);
+  DEBUG(D_any) debug_printf_indent("postfork: %s\n", purpose);
   }
 else
   {
   testharness_pause_ms(100); /* let child work */
-  DEBUG(D_any) debug_printf("%s forked for %s: %d\n", process_purpose, purpose, (int)pid);
+  DEBUG(D_any) debug_printf_indent("%s forked for %s: %d\n",
+                  process_purpose, purpose, (int)pid);
   }
 return pid;
 }
diff --git a/src/src/host.c b/src/src/host.c
index 742cfec48..1fa3a2ea8 100644
--- a/src/src/host.c
+++ b/src/src/host.c
@@ -183,7 +183,7 @@ dns_answer * dnsa = store_get_dns_answer();
 dns_scan dnss;
 
 DEBUG(D_host_lookup)
-  debug_printf("using host_fake_gethostbyname for %s (%s)\n", name,
+  debug_printf_indent("using host_fake_gethostbyname for %s (%s)\n", name,
     af == AF_INET ? "IPv4" : "IPv6");
 
 /* Handle unqualified "localhost" */
@@ -582,8 +582,11 @@ sender_rcvhost = string_copy_perm(rcvhost, TRUE);
 
 store_reset(reset_point);
 
-DEBUG(D_host_lookup) debug_printf("sender_fullhost = %s\n", sender_fullhost);
-DEBUG(D_host_lookup) debug_printf("sender_rcvhost = %s\n", sender_rcvhost);
+DEBUG(D_host_lookup)
+  {
+  debug_printf_indent("sender_fullhost = %s\n", sender_fullhost);
+  debug_printf_indent("sender_rcvhost = %s\n", sender_rcvhost);
+  }
 }
 
 
@@ -1345,17 +1348,17 @@ FOUND_LOCAL:
 
 if (!prev)
   {
-  HDEBUG(D_host_lookup) debug_printf((h->mx >= 0)?
-    "local host has lowest MX\n" :
-    "local host found for non-MX address\n");
+  HDEBUG(D_host_lookup) debug_printf_indent(h->mx >= 0
+    ? "local host has lowest MX\n"
+    : "local host found for non-MX address\n");
   return HOST_FOUND_LOCAL;
   }
 
 HDEBUG(D_host_lookup)
   {
-  debug_printf("local host in host list - removed hosts:\n");
+  debug_printf_indent("local host in host list - removed hosts:\n");
   for (h = prev->next; h != last->next; h = h->next)
-    debug_printf("  %s %s %d\n", h->name, h->address, h->mx);
+    debug_printf_indent("  %s %s %d\n", h->name, h->address, h->mx);
   }
 
 if (removed) *removed = TRUE;
@@ -1490,8 +1493,9 @@ empty string; in others as a single dot. */
 
 if (!hosts->h_name || !hosts->h_name[0] || hosts->h_name[0] == '.')
   {
-  HDEBUG(D_host_lookup) debug_printf("IP address lookup yielded an empty name: "
-    "treated as non-existent host name\n");
+  HDEBUG(D_host_lookup)
+    debug_printf_indent("IP address lookup yielded an empty name: "
+      "treated as non-existent host name\n");
   return FAIL;
   }
 
@@ -1580,7 +1584,7 @@ dns_scan dnss;
 sender_host_dnssec = host_lookup_deferred = host_lookup_failed = FALSE;
 
 HDEBUG(D_host_lookup)
-  debug_printf("looking up host name for %s\n", sender_host_address);
+  debug_printf_indent("looking up host name for %s\n", sender_host_address);
 expand_level++;
 
 /* For testing the case when a lookup does not complete, we have a special
@@ -1623,7 +1627,7 @@ while ((ordername = string_nextinlist(&list, &sep, NULL, 0)))
 
       sender_host_dnssec = dns_is_secure(dnsa);
       DEBUG(D_dns)
-        debug_printf("Reverse DNS security status: %s\n",
+        debug_printf_indent("Reverse DNS security status: %s\n",
             sender_host_dnssec ? "DNSSEC verified (AD)" : "unverified");
 
       store_pool = POOL_PERM;        /* Save names in permanent storage */
@@ -1661,14 +1665,14 @@ while ((ordername = string_nextinlist(&list, &sep, NULL, 0)))
         store_release_above(s + (slen = Ustrlen(s)) + 1);
         if (!*s)
           {
-          HDEBUG(D_host_lookup) debug_printf("IP address lookup yielded an "
-            "empty name: treated as non-existent host name\n");
+          HDEBUG(D_host_lookup) debug_printf_indent("IP address lookup yielded "
+        "an empty name: treated as non-existent host name\n");
           continue;
           }
     if (Ustrspn(s, letter_digit_hyphen_dot) != slen)
           {
-          HDEBUG(D_host_lookup) debug_printf("IP address lookup yielded an "
-            "illegal name (bad char): treated as non-existent host name\n");
+          HDEBUG(D_host_lookup) debug_printf_indent("IP address lookup yielded "
+        "an illegal name (bad char): treated as non-existent host name\n");
           continue;
           }
         if (!sender_host_name) sender_host_name = s;
@@ -1729,9 +1733,9 @@ if (!sender_host_name)
 
 HDEBUG(D_host_lookup)
   {
-  uschar **aliases = sender_host_aliases;
-  debug_printf("IP address lookup yielded \"%s\"\n", sender_host_name);
-  while (*aliases) debug_printf("  alias \"%s\"\n", *aliases++);
+  uschar ** aliases = sender_host_aliases;
+  debug_printf_indent("IP address lookup yielded \"%s\"\n", sender_host_name);
+  while (*aliases) debug_printf_indent("  alias \"%s\"\n", *aliases++);
   }
 
 /* We need to verify that a forward lookup on the name we found does indeed
@@ -1762,11 +1766,12 @@ for (uschar * hname = sender_host_name; hname; hname = *aliases++)
      || rc == HOST_FOUND_LOCAL
      )
     {
-    HDEBUG(D_host_lookup) debug_printf("checking addresses for %s\n", hname);
+    HDEBUG(D_host_lookup)
+      debug_printf_indent("checking addresses for %s\n", hname);
 
     /* If the forward lookup was not secure we cancel the is-secure variable */
 
-    DEBUG(D_dns) debug_printf("Forward DNS security status: %s\n",
+    DEBUG(D_dns) debug_printf_indent("Forward DNS security status: %s\n",
       h.dnssec == DS_YES ? "DNSSEC verified (AD)" : "unverified");
     if (h.dnssec != DS_YES) sender_host_dnssec = FALSE;
 
@@ -1997,7 +2002,7 @@ for (int i = 1; i <= times;
       default: error = US"?"; break;
       }
 
-    DEBUG(D_host_lookup) debug_printf("%s(af=%s) returned %d (%s)\n",
+    DEBUG(D_host_lookup) debug_printf_indent("%s(af=%s) returned %d (%s)\n",
       f.running_in_test_harness ? "host_fake_gethostbyname" :
 #if HAVE_IPV6
 # if HAVE_GETIPNODEBYNAME
@@ -2094,7 +2099,7 @@ if (!host->address)
 #endif
     string_sprintf("no IP address found for host %s", host->name);
 
-  HDEBUG(D_host_lookup) debug_printf("%s\n", msg);
+  HDEBUG(D_host_lookup) debug_printf_indent("%s\n", msg);
   if (temp_error) goto RETURN_AGAIN;
   if (host_checking || !f.log_testing_mode)
     log_write(L_host_lookup_failed, LOG_MAIN, "%s", msg);
diff --git a/src/src/verify.c b/src/src/verify.c
index 05b15858a..2bfafacf3 100644
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -3213,13 +3213,16 @@ do a check on the name and all its aliases. */
 if (!sender_host_name)
   {
   HDEBUG(D_host_lookup)
-    debug_printf("sender host name required, to match against %s\n", ss);
+    debug_printf_indent("sender host name required, to match against %s\n", ss);
+  expand_level++;
   if (host_lookup_failed || host_name_lookup() != OK)
     {
+    expand_level--;
     *error = string_sprintf("failed to find host name for %s",
       sender_host_address);;
     return ERROR;
     }
+  expand_level--;
   host_build_sender_fullhost();
   }
 
diff --git a/test/stderr/0002 b/test/stderr/0002
index 559ec2716..8b6a1a446 100644
--- a/test/stderr/0002
+++ b/test/stderr/0002
@@ -505,15 +505,15 @@ try option unknown_login
  ╭considering: -oMs░░sender_host_name░=░$sender_host_name
  ├───────text: -oMs░░sender_host_name░=░
  ├considering: $sender_host_name
-looking up host name for V4NET.0.0.1
-IP address lookup yielded "ten-1.test.ex"
+ looking up host name for V4NET.0.0.1
+  IP address lookup yielded "ten-1.test.ex"
   check dnssec require list
   check dnssec request list
   ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx 
-checking addresses for ten-1.test.ex
+  checking addresses for ten-1.test.ex
   V4NET.0.0.1 OK
-sender_fullhost = ten-1.test.ex [V4NET.0.0.1]
-sender_rcvhost = ten-1.test.ex ([V4NET.0.0.1] ident=me)
+ sender_fullhost = ten-1.test.ex [V4NET.0.0.1]
+ sender_rcvhost = ten-1.test.ex ([V4NET.0.0.1] ident=me)
  ├──────value: ten-1.test.ex
             ╰──(tainted)
  ├───expanded: -oMs░░sender_host_name░=░$sender_host_name
@@ -558,23 +558,24 @@ host in "<
  partial-lsearch;TESTSUITE/aux-fixed/0002.lsearch 
  1.2.3.4"?
  list element: partial-lsearch;TESTSUITE/aux-fixed/0002.lsearch
-sender host name required, to match against partial-lsearch;TESTSUITE/aux-fixed/0002.lsearch
-looking up host name for V4NET.0.0.1
-  DNS lookup of 1.0.0.V4NET.in-addr.arpa (PTR) using fakens
-  DNS lookup of 1.0.0.V4NET.in-addr.arpa (PTR) succeeded
-IP address lookup yielded "ten-1.test.ex"
-  check dnssec require list
-   ten-1.test.ex not in empty list (option unset? cannot trace name)
-  check dnssec request list
-   ten-1.test.ex not in empty list (option unset? cannot trace name)
-  DNS lookup of ten-1.test.ex (A) using fakens
-  DNS lookup of ten-1.test.ex (A) succeeded
-  ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx 
-checking addresses for ten-1.test.ex
-Forward DNS security status: unverified
+ sender host name required, to match against partial-lsearch;TESTSUITE/aux-fixed/0002.lsearch
+  looking up host name for V4NET.0.0.1
+   DNS lookup of 1.0.0.V4NET.in-addr.arpa (PTR) using fakens
+   DNS lookup of 1.0.0.V4NET.in-addr.arpa (PTR) succeeded
+   Reverse DNS security status: unverified
+   IP address lookup yielded "ten-1.test.ex"
+   check dnssec require list
+   ╎ten-1.test.ex not in empty list (option unset? cannot trace name)
+   check dnssec request list
+   ╎ten-1.test.ex not in empty list (option unset? cannot trace name)
+   DNS lookup of ten-1.test.ex (A) using fakens
+   DNS lookup of ten-1.test.ex (A) succeeded
+   ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx 
+   checking addresses for ten-1.test.ex
+   Forward DNS security status: unverified
   V4NET.0.0.1 OK
-sender_fullhost = ten-1.test.ex [V4NET.0.0.1]
-sender_rcvhost = ten-1.test.ex ([V4NET.0.0.1])
+ sender_fullhost = ten-1.test.ex [V4NET.0.0.1]
+ sender_rcvhost = ten-1.test.ex ([V4NET.0.0.1])
  search_open: lsearch "TESTSUITE/aux-fixed/0002.lsearch"
  search_find: file="TESTSUITE/aux-fixed/0002.lsearch"
    key="ten-1.test.ex" partial=2 affix=*. starflags=0 opts=NULL
diff --git a/test/stderr/0020 b/test/stderr/0020
index e69f9b523..7d38f3778 100644
--- a/test/stderr/0020
+++ b/test/stderr/0020
@@ -3,12 +3,12 @@

->>> IP address lookup yielded "ten-3.test.ex"
->>>   alias "ten-3-alias.test.ex"
+>>>  IP address lookup yielded "ten-3.test.ex"
+>>>    alias "ten-3-alias.test.ex"

 >>>   start sublist relay_hosts
 >>>    host in "*-2.test.ex : *-3-alias.test.ex"?
 >>>    ╎list element: *-2.test.ex

->>> sender host name required, to match against *-2.test.ex
->>> looking up host name for V4NET.0.0.1
->>> IP address lookup yielded "ten-1.test.ex"
->>>    ╎ check dnssec require list
->>>    ╎  ten-1.test.ex not in empty list (option unset? cannot trace name)
->>>    ╎ check dnssec request list
->>>    ╎  ten-1.test.ex not in empty list (option unset? cannot trace name)
->>> checking addresses for ten-1.test.ex
+>>>    ╎sender host name required, to match against *-2.test.ex
+>>>    ╎ looking up host name for V4NET.0.0.1
+>>>    ╎  IP address lookup yielded "ten-1.test.ex"
+>>>    ╎  check dnssec require list
+>>>    ╎   ten-1.test.ex not in empty list (option unset? cannot trace name)
+>>>    ╎  check dnssec request list
+>>>    ╎   ten-1.test.ex not in empty list (option unset? cannot trace name)
+>>>    ╎  checking addresses for ten-1.test.ex

 >>>   V4NET.0.0.1 OK
 >>>    ╎list element: *-3-alias.test.ex
 >>>    host in "*-2.test.ex : *-3-alias.test.ex"? no (end of list)

 >>>   start sublist relay_hosts
 >>>    host in "*-2.test.ex : *-3-alias.test.ex"?
 >>>    ╎list element: *-2.test.ex

->>> sender host name required, to match against *-2.test.ex
->>> looking up host name for V4NET.0.0.2
->>> IP address lookup yielded "ten-2.test.ex"
->>>    ╎ check dnssec require list
->>>    ╎  ten-2.test.ex not in empty list (option unset? cannot trace name)
->>>    ╎ check dnssec request list
->>>    ╎  ten-2.test.ex not in empty list (option unset? cannot trace name)
->>> checking addresses for ten-2.test.ex
+>>>    ╎sender host name required, to match against *-2.test.ex
+>>>    ╎ looking up host name for V4NET.0.0.2
+>>>    ╎  IP address lookup yielded "ten-2.test.ex"
+>>>    ╎  check dnssec require list
+>>>    ╎   ten-2.test.ex not in empty list (option unset? cannot trace name)
+>>>    ╎  check dnssec request list
+>>>    ╎   ten-2.test.ex not in empty list (option unset? cannot trace name)
+>>>    ╎  checking addresses for ten-2.test.ex

 >>>   V4NET.0.0.2 OK
 >>>    ╎host in "*-2.test.ex : *-3-alias.test.ex"? yes (matched "*-2.test.ex")
 >>>   end sublist relay_hosts

 >>>   start sublist relay_hosts
 >>>    host in "*-2.test.ex : *-3-alias.test.ex"?
 >>>    ╎list element: *-2.test.ex

->>> sender host name required, to match against *-2.test.ex
->>> looking up host name for V4NET.0.0.3
->>> IP address lookup yielded "ten-3.test.ex"
->>>   alias "ten-3-alias.test.ex"
->>>    ╎ check dnssec require list
->>>    ╎  ten-3.test.ex not in empty list (option unset? cannot trace name)
->>>    ╎ check dnssec request list
->>>    ╎  ten-3.test.ex not in empty list (option unset? cannot trace name)
->>> checking addresses for ten-3.test.ex
+>>>    ╎sender host name required, to match against *-2.test.ex
+>>>    ╎ looking up host name for V4NET.0.0.3
+>>>    ╎  IP address lookup yielded "ten-3.test.ex"
+>>>    ╎    alias "ten-3-alias.test.ex"
+>>>    ╎  check dnssec require list
+>>>    ╎   ten-3.test.ex not in empty list (option unset? cannot trace name)
+>>>    ╎  check dnssec request list
+>>>    ╎   ten-3.test.ex not in empty list (option unset? cannot trace name)
+>>>    ╎  checking addresses for ten-3.test.ex

->>>    ╎ check dnssec require list
->>>    ╎  ten-3-alias.test.ex not in empty list (option unset? cannot trace name)
->>>    ╎ check dnssec request list
->>>    ╎  ten-3-alias.test.ex not in empty list (option unset? cannot trace name)
->>> checking addresses for ten-3-alias.test.ex
+>>>    ╎  check dnssec require list
+>>>    ╎   ten-3-alias.test.ex not in empty list (option unset? cannot trace name)
+>>>    ╎  check dnssec request list
+>>>    ╎   ten-3-alias.test.ex not in empty list (option unset? cannot trace name)
+>>>    ╎  checking addresses for ten-3-alias.test.ex

 >>>   V4NET.0.0.3 OK
 >>>    ╎list element: *-3-alias.test.ex
 >>>    ╎host in "*-2.test.ex : *-3-alias.test.ex"? yes (matched "*-3-alias.test.ex")

 >>>   start sublist relay_hosts
 >>>    host in "^[^\d]+2"?
 >>>    ╎list element: ^[^\d]+2

->>> sender host name required, to match against ^[^\d]+2
->>> looking up host name for V4NET.0.0.1
->>> IP address lookup yielded "ten-1.test.ex"
->>>    ╎ check dnssec require list
->>>    ╎  ten-1.test.ex not in empty list (option unset? cannot trace name)
->>>    ╎ check dnssec request list
->>>    ╎  ten-1.test.ex not in empty list (option unset? cannot trace name)
->>> checking addresses for ten-1.test.ex
+>>>    ╎sender host name required, to match against ^[^\d]+2
+>>>    ╎ looking up host name for V4NET.0.0.1
+>>>    ╎  IP address lookup yielded "ten-1.test.ex"
+>>>    ╎  check dnssec require list
+>>>    ╎   ten-1.test.ex not in empty list (option unset? cannot trace name)
+>>>    ╎  check dnssec request list
+>>>    ╎   ten-1.test.ex not in empty list (option unset? cannot trace name)
+>>>    ╎  checking addresses for ten-1.test.ex

 >>>   V4NET.0.0.1 OK
 >>>    host in "^[^\d]+2"? no (end of list)
 >>>   end sublist relay_hosts

 >>>   start sublist relay_hosts
 >>>    host in "^[^\d]+2"?
 >>>    ╎list element: ^[^\d]+2

->>> sender host name required, to match against ^[^\d]+2
->>> looking up host name for V4NET.0.0.2
->>> IP address lookup yielded "ten-2.test.ex"
->>>    ╎ check dnssec require list
->>>    ╎  ten-2.test.ex not in empty list (option unset? cannot trace name)
->>>    ╎ check dnssec request list
->>>    ╎  ten-2.test.ex not in empty list (option unset? cannot trace name)
->>> checking addresses for ten-2.test.ex
+>>>    ╎sender host name required, to match against ^[^\d]+2
+>>>    ╎ looking up host name for V4NET.0.0.2
+>>>    ╎  IP address lookup yielded "ten-2.test.ex"
+>>>    ╎  check dnssec require list
+>>>    ╎   ten-2.test.ex not in empty list (option unset? cannot trace name)
+>>>    ╎  check dnssec request list
+>>>    ╎   ten-2.test.ex not in empty list (option unset? cannot trace name)
+>>>    ╎  checking addresses for ten-2.test.ex

 >>>   V4NET.0.0.2 OK
 >>>    ╎host in "^[^\d]+2"? yes (matched "^[^\d]+2")
 >>>   end sublist relay_hosts

 >>>   start sublist relay_hosts
 >>>    host in "lsearch;TESTSUITE/aux-fixed/0064.hosts"?
 >>>    ╎list element: lsearch;TESTSUITE/aux-fixed/0064.hosts

->>> sender host name required, to match against lsearch;TESTSUITE/aux-fixed/0064.hosts
->>> looking up host name for V4NET.0.0.1
->>> IP address lookup yielded "ten-1.test.ex"
->>>    ╎ check dnssec require list
->>>    ╎  ten-1.test.ex not in empty list (option unset? cannot trace name)
->>>    ╎ check dnssec request list
->>>    ╎  ten-1.test.ex not in empty list (option unset? cannot trace name)
->>> checking addresses for ten-1.test.ex
+>>>    ╎sender host name required, to match against lsearch;TESTSUITE/aux-fixed/0064.hosts
+>>>    ╎ looking up host name for V4NET.0.0.1
+>>>    ╎  IP address lookup yielded "ten-1.test.ex"
+>>>    ╎  check dnssec require list
+>>>    ╎   ten-1.test.ex not in empty list (option unset? cannot trace name)
+>>>    ╎  check dnssec request list
+>>>    ╎   ten-1.test.ex not in empty list (option unset? cannot trace name)
+>>>    ╎  checking addresses for ten-1.test.ex

 >>>   V4NET.0.0.1 OK
 >>>    host in "lsearch;TESTSUITE/aux-fixed/0064.hosts"? no (end of list)
 >>>   end sublist relay_hosts

 >>>   start sublist relay_hosts
 >>>    host in "lsearch;TESTSUITE/aux-fixed/0064.hosts"?
 >>>    ╎list element: lsearch;TESTSUITE/aux-fixed/0064.hosts

->>> sender host name required, to match against lsearch;TESTSUITE/aux-fixed/0064.hosts
->>> looking up host name for V4NET.0.0.2
->>> IP address lookup yielded "ten-2.test.ex"
->>>    ╎ check dnssec require list
->>>    ╎  ten-2.test.ex not in empty list (option unset? cannot trace name)
->>>    ╎ check dnssec request list
->>>    ╎  ten-2.test.ex not in empty list (option unset? cannot trace name)
->>> checking addresses for ten-2.test.ex
+>>>    ╎sender host name required, to match against lsearch;TESTSUITE/aux-fixed/0064.hosts
+>>>    ╎ looking up host name for V4NET.0.0.2
+>>>    ╎  IP address lookup yielded "ten-2.test.ex"
+>>>    ╎  check dnssec require list
+>>>    ╎   ten-2.test.ex not in empty list (option unset? cannot trace name)
+>>>    ╎  check dnssec request list
+>>>    ╎   ten-2.test.ex not in empty list (option unset? cannot trace name)
+>>>    ╎  checking addresses for ten-2.test.ex

 >>>   V4NET.0.0.2 OK
 >>>    ╎host in "lsearch;TESTSUITE/aux-fixed/0064.hosts"? yes (matched "lsearch;TESTSUITE/aux-fixed/0064.hosts")
 >>>   end sublist relay_hosts

 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-3.test.ex address=V4NET.0.0.3
 >>>    ╎list element: TESTSUITE/aux-var/0066.hostnets

->>> sender host name required, to match against *-1.test.ex
->>> looking up host name for 1.3.2.4
+>>>    ╎sender host name required, to match against *-1.test.ex
+>>>    ╎ looking up host name for 1.3.2.4
 LOG: no host name found for IP address 1.3.2.4

 >>>    ╎host in "!TESTSUITE/aux-fixed/0066.nothosts : TESTSUITE/aux-var/0066.hostnets"? no (failed to find host name for 1.3.2.4)
 >>>   end sublist relay_hosts

 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-3.test.ex address=V4NET.0.0.3
 >>>    ╎list element: TESTSUITE/aux-var/0066.hostnets

->>> sender host name required, to match against *-1.test.ex
->>> looking up host name for V4NET.0.0.1
->>> IP address lookup yielded "ten-1.test.ex"
->>>    ╎ check dnssec require list
->>>    ╎  ten-1.test.ex not in empty list (option unset? cannot trace name)
->>>    ╎ check dnssec request list
->>>    ╎  ten-1.test.ex not in empty list (option unset? cannot trace name)
->>> checking addresses for ten-1.test.ex
+>>>    ╎sender host name required, to match against *-1.test.ex
+>>>    ╎ looking up host name for V4NET.0.0.1
+>>>    ╎  IP address lookup yielded "ten-1.test.ex"
+>>>    ╎  check dnssec require list
+>>>    ╎   ten-1.test.ex not in empty list (option unset? cannot trace name)
+>>>    ╎  check dnssec request list
+>>>    ╎   ten-1.test.ex not in empty list (option unset? cannot trace name)
+>>>    ╎  checking addresses for ten-1.test.ex

 >>>   V4NET.0.0.1 OK
 >>>    ╎host in "!TESTSUITE/aux-fixed/0066.nothosts : TESTSUITE/aux-var/0066.hostnets"? yes (matched "*-1.test.ex" in TESTSUITE/aux-var/0066.hostnets)
 >>>   end sublist relay_hosts

->>> sender host name required, to match against ^ten-1\.test\.ex
->>> looking up host name for V4NET.0.0.1
->>> IP address lookup yielded "ten-1.test.ex"
->>>   check dnssec require list
->>>    ten-1.test.ex not in empty list (option unset? cannot trace name)
->>>   check dnssec request list
->>>    ten-1.test.ex not in empty list (option unset? cannot trace name)
->>> checking addresses for ten-1.test.ex
+>>>  sender host name required, to match against ^ten-1\.test\.ex
+>>>   looking up host name for V4NET.0.0.1
+>>>    IP address lookup yielded "ten-1.test.ex"
+>>>    check dnssec require list
+>>>    ╎ten-1.test.ex not in empty list (option unset? cannot trace name)
+>>>    check dnssec request list
+>>>    ╎ten-1.test.ex not in empty list (option unset? cannot trace name)
+>>>    checking addresses for ten-1.test.ex

->>> IP address lookup yielded "ten-3.test.ex"
->>>   alias "ten-3-alias.test.ex"
+>>>  IP address lookup yielded "ten-3.test.ex"
+>>>    alias "ten-3-alias.test.ex"

->>> sender host name required, to match against *N-99.test.EX
->>> looking up host name for V4NET.0.0.99
->>> IP address lookup yielded "ten-99.test.ex"
->>>   check dnssec require list
->>>    ten-99.test.ex not in empty list (option unset? cannot trace name)
->>>   check dnssec request list
->>>    ten-99.test.ex not in empty list (option unset? cannot trace name)
->>> checking addresses for ten-99.test.ex
+>>>  sender host name required, to match against *N-99.test.EX
+>>>   looking up host name for V4NET.0.0.99
+>>>    IP address lookup yielded "ten-99.test.ex"
+>>>    check dnssec require list
+>>>    ╎ten-99.test.ex not in empty list (option unset? cannot trace name)
+>>>    check dnssec request list
+>>>    ╎ten-99.test.ex not in empty list (option unset? cannot trace name)
+>>>    checking addresses for ten-99.test.ex

 >>>   start sublist relay_hosts
 >>>    host in "*.masq.test.ex"?
 >>>    ╎list element: *.masq.test.ex

->>> sender host name required, to match against *.masq.test.ex
+>>>    ╎sender host name required, to match against *.masq.test.ex

 >>>    ╎host in "*.masq.test.ex"? no (failed to find host name for V4NET.11.12.13)
 >>>    end sublist relay_hosts
 >>>  host in "+relay_hosts"? no (end of list)

 >>>   start sublist relay_hosts
 >>>    host in "*.friendly.test.ex"?
 >>>    ╎list element: *.friendly.test.ex

->>> sender host name required, to match against *.friendly.test.ex
->>> looking up host name for V4NET.0.0.97
+>>>    ╎sender host name required, to match against *.friendly.test.ex
+>>>    ╎ looking up host name for V4NET.0.0.97
 LOG: no host name found for IP address V4NET.0.0.97

 >>>    ╎host in "*.friendly.test.ex"? no (failed to find host name for V4NET.0.0.97)
 >>>    end sublist relay_hosts

 >>>    ╎list element: @mx_any
 >>>    ╎check dnssec require list
 >>>    ╎check dnssec request list

->>> local host has lowest MX
+>>>    ╎local host has lowest MX

 >>>    ╎mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
 >>>   end sublist relay_domains
 >>>  data from lookup saved for cache for +relay_domains: key 'mxt1.test.ex' value '@mx_any'

 >>>    ╎list element: @mx_any
 >>>    ╎check dnssec require list
 >>>    ╎check dnssec request list

->>> local host in host list - removed hosts:
->>>   ten-2.test.ex V4NET.0.0.2 6
->>>   eximtesthost.test.ex ip4.ip4.ip4.ip4 6
+>>>    ╎local host in host list - removed hosts:
+>>>    ╎  ten-2.test.ex V4NET.0.0.2 6
+>>>    ╎  eximtesthost.test.ex ip4.ip4.ip4.ip4 6

 >>>    ╎mxt6.test.ex in "@mx_any"? yes (matched "@mx_any")
 >>>   end sublist relay_domains
 >>>  data from lookup saved for cache for +relay_domains: key 'mxt6.test.ex' value '@mx_any'

->>> local host in host list - removed hosts:
->>>   eximtesthost.test.ex ip4.ip4.ip4.ip4 6
->>>   ten-2.test.ex V4NET.0.0.2 6
+>>>  local host in host list - removed hosts:
+>>>    eximtesthost.test.ex ip4.ip4.ip4.ip4 6
+>>>    ten-2.test.ex V4NET.0.0.2 6

->>> local host in host list - removed hosts:
->>>   ten-2.test.ex V4NET.0.0.2 6
->>>   eximtesthost.test.ex ip4.ip4.ip4.ip4 6
+>>>  local host in host list - removed hosts:
+>>>    ten-2.test.ex V4NET.0.0.2 6
+>>>    eximtesthost.test.ex ip4.ip4.ip4.ip4 6

->>> local host in host list - removed hosts:
->>>   ten-2.test.ex V4NET.0.0.2 6
->>>   eximtesthost.test.ex ip4.ip4.ip4.ip4 6
+>>>  local host in host list - removed hosts:
+>>>    ten-2.test.ex V4NET.0.0.2 6
+>>>    eximtesthost.test.ex ip4.ip4.ip4.ip4 6

->>> local host in host list - removed hosts:
->>>   eximtesthost.test.ex ip4.ip4.ip4.ip4 6
+>>>  local host in host list - removed hosts:
+>>>    eximtesthost.test.ex ip4.ip4.ip4.ip4 6

->>> local host in host list - removed hosts:
->>>   eximtesthost.test.ex ip4.ip4.ip4.ip4 6
+>>>  local host in host list - removed hosts:
+>>>    eximtesthost.test.ex ip4.ip4.ip4.ip4 6

->>> local host in host list - removed hosts:
->>>   eximtesthost.test.ex ip4.ip4.ip4.ip4 6
+>>>  local host in host list - removed hosts:
+>>>    eximtesthost.test.ex ip4.ip4.ip4.ip4 6

->>> sender host name required, to match against *.test.ex
->>> looking up host name for V4NET.0.0.1
->>> IP address lookup yielded "ten-1.test.ex"
->>>   check dnssec require list
->>>    ten-1.test.ex not in empty list (option unset? cannot trace name)
->>>   check dnssec request list
->>>    ten-1.test.ex not in empty list (option unset? cannot trace name)
->>> checking addresses for ten-1.test.ex
+>>>  sender host name required, to match against *.test.ex
+>>>   looking up host name for V4NET.0.0.1
+>>>    IP address lookup yielded "ten-1.test.ex"
+>>>    check dnssec require list
+>>>    ╎ten-1.test.ex not in empty list (option unset? cannot trace name)
+>>>    check dnssec request list
+>>>    ╎ten-1.test.ex not in empty list (option unset? cannot trace name)
+>>>    checking addresses for ten-1.test.ex

diff --git a/test/stderr/0381 b/test/stderr/0381
index f73b447ba..267faef68 100644
--- a/test/stderr/0381
+++ b/test/stderr/0381
@@ -47,35 +47,36 @@ processing ACL check_rcpt "warn" (TESTSUITE/test-config 17)
 check hosts = *.gov.uk.test.ex
 host in "*.gov.uk.test.ex"?
  list element: *.gov.uk.test.ex
-sender host name required, to match against *.gov.uk.test.ex
-looking up host name for V4NET.99.99.97
-  DNS lookup of 97.99.99.V4NET.in-addr.arpa (PTR) using fakens
-  DNS lookup of 97.99.99.V4NET.in-addr.arpa (PTR) succeeded
-IP address lookup yielded "x.gov.uk.test.ex"
-  alias "x.co.uk.test.ex"
-  check dnssec require list
-   x.gov.uk.test.ex not in empty list (option unset? cannot trace name)
-  check dnssec request list
-   x.gov.uk.test.ex not in empty list (option unset? cannot trace name)
-  DNS lookup of x.gov.uk.test.ex (A) using fakens
-  DNS lookup of x.gov.uk.test.ex (A) succeeded
-  x.gov.uk.test.ex V4NET.99.99.97 mx=-1 sort=xx 
-checking addresses for x.gov.uk.test.ex
-Forward DNS security status: unverified
+ sender host name required, to match against *.gov.uk.test.ex
+  looking up host name for V4NET.99.99.97
+   DNS lookup of 97.99.99.V4NET.in-addr.arpa (PTR) using fakens
+   DNS lookup of 97.99.99.V4NET.in-addr.arpa (PTR) succeeded
+   Reverse DNS security status: unverified
+   IP address lookup yielded "x.gov.uk.test.ex"
+     alias "x.co.uk.test.ex"
+   check dnssec require list
+   ╎x.gov.uk.test.ex not in empty list (option unset? cannot trace name)
+   check dnssec request list
+   ╎x.gov.uk.test.ex not in empty list (option unset? cannot trace name)
+   DNS lookup of x.gov.uk.test.ex (A) using fakens
+   DNS lookup of x.gov.uk.test.ex (A) succeeded
+   x.gov.uk.test.ex V4NET.99.99.97 mx=-1 sort=xx 
+   checking addresses for x.gov.uk.test.ex
+   Forward DNS security status: unverified
   V4NET.99.99.97 OK
-  check dnssec require list
-   x.co.uk.test.ex not in empty list (option unset? cannot trace name)
-  check dnssec request list
-   x.co.uk.test.ex not in empty list (option unset? cannot trace name)
-  DNS lookup of x.co.uk.test.ex (A) using fakens
-  DNS lookup of x.co.uk.test.ex (A) succeeded
-  x.co.uk.test.ex V4NET.99.99.97 mx=-1 sort=xx 
-checking addresses for x.co.uk.test.ex
-Forward DNS security status: unverified
+   check dnssec require list
+   ╎x.co.uk.test.ex not in empty list (option unset? cannot trace name)
+   check dnssec request list
+   ╎x.co.uk.test.ex not in empty list (option unset? cannot trace name)
+   DNS lookup of x.co.uk.test.ex (A) using fakens
+   DNS lookup of x.co.uk.test.ex (A) succeeded
+   x.co.uk.test.ex V4NET.99.99.97 mx=-1 sort=xx 
+   checking addresses for x.co.uk.test.ex
+   Forward DNS security status: unverified
   V4NET.99.99.97 OK
-sender_fullhost = x.gov.uk.test.ex (test) [V4NET.99.99.97]
-sender_rcvhost = x.gov.uk.test.ex
-    ([V4NET.99.99.97] helo=test ident=CALLER)
+ sender_fullhost = x.gov.uk.test.ex (test) [V4NET.99.99.97]
+ sender_rcvhost = x.gov.uk.test.ex
+     ([V4NET.99.99.97] helo=test ident=CALLER)
   host in "*.gov.uk.test.ex"? yes (matched "*.gov.uk.test.ex")
 warn: condition test succeeded in ACL check_rcpt
 processing ACL check_rcpt "warn" (TESTSUITE/test-config 18)
diff --git a/test/stderr/0394 b/test/stderr/0394
index 47a0e1558..9d5b215f5 100644
--- a/test/stderr/0394
+++ b/test/stderr/0394
@@ -3,7 +3,7 @@

diff --git a/test/stderr/0419 b/test/stderr/0419
index 28f6784a2..fa097e1ce 100644
--- a/test/stderr/0419
+++ b/test/stderr/0419
@@ -62,9 +62,9 @@ main lookup for domain
    ╎ other2.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"? yes (matched "*.test.ex")
    end sublist local_domains
   other2.test.ex in hosts_treat_as_local? yes (matched "+local_domains")
-local host in host list - removed hosts:
-  other2.test.ex V4NET.12.3.2 5
-  other2.test.ex V4NET.12.3.1 5
+ local host in host list - removed hosts:
+   other2.test.ex V4NET.12.3.2 5
+   other2.test.ex V4NET.12.3.1 5
  fully qualified name = mxt13.test.ex
  host_find_bydns yield = HOST_FOUND (3); returned hosts:
    other1.test.ex V4NET.12.4.5 MX=4 
diff --git a/test/stderr/0426 b/test/stderr/0426
index b9ab6329f..4503efa2d 100644
--- a/test/stderr/0426
+++ b/test/stderr/0426
@@ -33,7 +33,7 @@ main lookup for domain
  check dnssec require list
  check dnssec request list
  uppercase.test.ex (MX resp) DNSSEC
-local host found for non-MX address
+ local host found for non-MX address
  fully qualified name = UpperCase.test.ex
  uppercase.test.ex 127.0.0.1 mx=-1 sort=xx 
 remote host address is the local host: uppercase.test.ex: configured to try delivery anyway
diff --git a/test/stderr/0499 b/test/stderr/0499
index 4d882260a..0eafb00eb 100644
--- a/test/stderr/0499
+++ b/test/stderr/0499
@@ -28,7 +28,7 @@ mxt1.test.ex in domains?
    ╎DNS lookup of mxt1.test.ex (MX) succeeded
    ╎DNS lookup of eximtesthost.test.ex (A) using fakens
    ╎DNS lookup of eximtesthost.test.ex (A) succeeded
-local host has lowest MX
+   ╎local host has lowest MX
    ╎host_find_bydns yield = HOST_FOUND_LOCAL (4); returned hosts:
    ╎  eximtesthost.test.ex ip4.ip4.ip4.ip4 MX=5 
    ╎mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
@@ -47,7 +47,7 @@ checking "condition" "${if match_domain{$domain}{+anymx}{yes}}"...
    ╎  DNS lookup of mxt1.test.ex (MX) succeeded
    ╎  DNS lookup of eximtesthost.test.ex (A) using fakens
    ╎  DNS lookup of eximtesthost.test.ex (A) succeeded
-local host has lowest MX
+   ╎  local host has lowest MX
    ╎  host_find_bydns yield = HOST_FOUND_LOCAL (4); returned hosts:
    ╎    eximtesthost.test.ex ip4.ip4.ip4.ip4 MX=5 
    ╎  mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
diff --git a/test/stderr/0537 b/test/stderr/0537
index 3c6a74c6f..1f45b368d 100644
--- a/test/stderr/0537
+++ b/test/stderr/0537
@@ -31,7 +31,7 @@ LOG: interface_address=[]

 >>>  check logwrite = received_protocol=$received_protocol
 >>>                = received_protocol=smtp

 >>>  check logwrite = sender_host_name=$sender_host_name
 >>>                = sender_host_name=

 >>>    list element: *
 >>>    delay1500.test.ex in dnssec_request_domains? yes (matched "*")

 >>>   delay500.test.ex in dnssec_request_domains?
 >>>    list element: *
 >>>    delay500.test.ex in dnssec_request_domains? yes (matched "*")

 >>>   dane256ee.test.ex in dnssec_request_domains?
 >>>    list element: *
 >>>    dane256ee.test.ex in dnssec_request_domains? yes (matched "*")

 >>>   dane256ee.test.ex in dnssec_request_domains?
 >>>    list element: *
 >>>    dane256ee.test.ex in dnssec_request_domains? yes (matched "*")