Debug: indentation

diff --git a/src/src/functions.h b/src/src/functions.h
index b581af78b123b2068d1c7048f9dfb1dc1783c321..f04fe1f1bf776458ae06084d895da6b914be7e4b 100644 (file)
--- 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;
 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;
 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 */
   }
 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;
 }
   }
 return pid;
 }

diff --git a/src/src/host.c b/src/src/host.c
index 742cfec4803ca26d17d7866c60fb3806b25a78e1..1fa3a2ea82a0c1f9a776d120430de72d8472c115 100644 (file)
--- 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)
 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" */
     af == AF_INET ? "IPv4" : "IPv6");
 
 /* Handle unqualified "localhost" */


@@ -582,8 +582,11 @@ sender_rcvhost = string_copy_perm(rcvhost, TRUE);
 
 store_reset(reset_point);
 
 
 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)
   {
 
 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)
   {
   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)
   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;
   }
 
 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] == '.')
   {
 
 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;
   }
 
   return FAIL;
   }
 


@@ -1580,7 +1584,7 @@ dns_scan dnss;
 sender_host_dnssec = host_lookup_deferred = host_lookup_failed = FALSE;
 
 HDEBUG(D_host_lookup)
 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
 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)
 
       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 */
             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)
           {
         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)
           {
           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;
           continue;
           }
         if (!sender_host_name) sender_host_name = s;


@@ -1729,9 +1733,9 @@ if (!sender_host_name)
 
 HDEBUG(D_host_lookup)
   {
 
 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
   }
 
 /* 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
      )
     {
      || 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 */
 
 
     /* 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;
 
          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;
       }
 
       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
       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);
 
 #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);
   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 05b15858a34aeddcf245ef9dcbd942c63426e661..2bfafacf3bb5770d4a8d7bbc04c54dda8a7f387c 100644 (file)
--- 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)
 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)
     {
   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;
     }
     *error = string_sprintf("failed to find host name for %s",
       sender_host_address);;
     return ERROR;
     }

+  expand_level--;

   host_build_sender_fullhost();
   }
 
   host_build_sender_fullhost();
   }
 

diff --git a/test/stderr/0002 b/test/stderr/0002
index 559ec27163561c51962c1090813f9e90bf640dae..8b6a1a44674a809f335a5e2d8162b467e185c6e7 100644 (file)
--- 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
  ╭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 
   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
   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
  ├──────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
  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
   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
  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 e69f9b5234d3cd63d987a0242955269959fcf64c..7d38f3778f2ffa65339bc4321b111a72d2b6fca3 100644 (file)
--- a/test/stderr/0020
+++ b/test/stderr/0020
@@ -3,12 +3,12 @@
 >>>  list element: 10.250.104.0/21
 >>>  host in host_lookup? yes (matched "10.250.104.0/21")
 >>> looking up host name for 10.250.104.42
 >>>  list element: 10.250.104.0/21
 >>>  host in host_lookup? yes (matched "10.250.104.0/21")
 >>> looking up host name for 10.250.104.42

->>> IP address lookup yielded "manyhome.test.ex"
+>>>  IP address lookup yielded "manyhome.test.ex"

 >>>  check dnssec require list
 >>>   manyhome.test.ex not in empty list (option unset? cannot trace name)
 >>>  check dnssec request list
 >>>   manyhome.test.ex not in empty list (option unset? cannot trace name)
 >>>  check dnssec require list
 >>>   manyhome.test.ex not in empty list (option unset? cannot trace name)
 >>>  check dnssec request list
 >>>   manyhome.test.ex not in empty list (option unset? cannot trace name)

->>> checking addresses for manyhome.test.ex
+>>>  checking addresses for manyhome.test.ex

 >>>   10.250.107.163
 >>>   10.250.109.49
 >>>   10.250.105.65
 >>>   10.250.107.163
 >>>   10.250.109.49
 >>>   10.250.105.65

diff --git a/test/stderr/0023 b/test/stderr/0023
index fc1709c3e528f514cdb0df66d8f39032460b9797..d825511b94988d3d61db21bb3bad3b10ec640224 100644 (file)
--- a/test/stderr/0023
+++ b/test/stderr/0023
@@ -1552,19 +1552,19 @@ LOG: H=(test) [28.28.28.28] F=<a@baddomain> rejected RCPT <x@y>
 >>> check verify = reverse_host_lookup
 >>> looking up host name to force name/address consistency check
 >>> looking up host name for V4NET.0.0.3
 >>> check verify = reverse_host_lookup
 >>> looking up host name to force name/address consistency check
 >>> looking up host name for V4NET.0.0.3

->>> 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"

 >>>  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)
 >>>  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
+>>>  checking addresses for ten-3.test.ex

 >>>   V4NET.0.0.3 OK
 >>>  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)
 >>>   V4NET.0.0.3 OK
 >>>  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
+>>>  checking addresses for ten-3-alias.test.ex

 >>>   V4NET.0.0.3 OK
 >>> require: condition test succeeded in ACL acl_V4NET_0_0
 >>> processing ACL acl_V4NET_0_0 "accept" (TESTSUITE/test-config 98)
 >>>   V4NET.0.0.3 OK
 >>> require: condition test succeeded in ACL acl_V4NET_0_0
 >>> processing ACL acl_V4NET_0_0 "accept" (TESTSUITE/test-config 98)


@@ -1614,7 +1614,7 @@ LOG: H=(test) [V4NET.0.0.97] F=<> rejected RCPT <x@y>: host lookup failed for re
 >>> check verify = reverse_host_lookup
 >>> looking up host name to force name/address consistency check
 >>> looking up host name for V4NET.99.99.96
 >>> check verify = reverse_host_lookup
 >>> looking up host name to force name/address consistency check
 >>> looking up host name for V4NET.99.99.96

->>> IP address lookup yielded "x.test.again.dns"
+>>>  IP address lookup yielded "x.test.again.dns"

 >>>  check dnssec require list
 >>>   x.test.again.dns not in empty list (option unset? cannot trace name)
 >>>  check dnssec request list
 >>>  check dnssec require list
 >>>   x.test.again.dns not in empty list (option unset? cannot trace name)
 >>>  check dnssec request list


@@ -1644,7 +1644,7 @@ LOG: H=(test) [V4NET.99.99.96] F=<> temporarily rejected RCPT <x@y>: host lookup
 >>> check verify = reverse_host_lookup/defer_ok
 >>> looking up host name to force name/address consistency check
 >>> looking up host name for V4NET.99.99.96
 >>> check verify = reverse_host_lookup/defer_ok
 >>> looking up host name to force name/address consistency check
 >>> looking up host name for V4NET.99.99.96

->>> IP address lookup yielded "x.test.again.dns"
+>>>  IP address lookup yielded "x.test.again.dns"

 >>>  check dnssec require list
 >>>   x.test.again.dns not in empty list (option unset? cannot trace name)
 >>>  check dnssec request list
 >>>  check dnssec require list
 >>>   x.test.again.dns not in empty list (option unset? cannot trace name)
 >>>  check dnssec request list

diff --git a/test/stderr/0062 b/test/stderr/0062
index 4c8d4f47cb7588113a88ef180dd3ae8d17ec4382..045586404d0ed5bf8ef836220eb9fddfdbd665ea 100644 (file)
--- a/test/stderr/0062
+++ b/test/stderr/0062
@@ -55,14 +55,14 @@
 >>>   start sublist relay_hosts
 >>>    host in "*-2.test.ex : *-3-alias.test.ex"?
 >>>    ╎list element: *-2.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)
 >>>   V4NET.0.0.1 OK
 >>>    ╎list element: *-3-alias.test.ex
 >>>    host in "*-2.test.ex : *-3-alias.test.ex"? no (end of list)


@@ -136,14 +136,14 @@ LOG: 10HmaX-000000005vi-0000 <= userx@somehost.example.com H=ten-1.test.ex (test
 >>>   start sublist relay_hosts
 >>>    host in "*-2.test.ex : *-3-alias.test.ex"?
 >>>    ╎list element: *-2.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.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
 >>>   V4NET.0.0.2 OK
 >>>    ╎host in "*-2.test.ex : *-3-alias.test.ex"? yes (matched "*-2.test.ex")
 >>>   end sublist relay_hosts


@@ -213,21 +213,21 @@ LOG: 10HmaY-000000005vi-0000 <= userx@somehost.example.com H=ten-2.test.ex (test
 >>>   start sublist relay_hosts
 >>>    host in "*-2.test.ex : *-3-alias.test.ex"?
 >>>    ╎list element: *-2.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.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

 >>>   V4NET.0.0.3 OK
 >>>   V4NET.0.0.3 OK

->>>    ╎ 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")
 >>>   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")

diff --git a/test/stderr/0063 b/test/stderr/0063
index bc34c6df8f21597fca7f4def49fe789186677c0d..cc9c1ccee318c9e54bf9eac52fe448f306ba8ce3 100644 (file)
--- a/test/stderr/0063
+++ b/test/stderr/0063
@@ -55,14 +55,14 @@
 >>>   start sublist relay_hosts
 >>>    host in "^[^\d]+2"?
 >>>    ╎list element: ^[^\d]+2
 >>>   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
 >>>   V4NET.0.0.1 OK
 >>>    host in "^[^\d]+2"? no (end of list)
 >>>   end sublist relay_hosts


@@ -131,14 +131,14 @@ LOG: 10HmaX-000000005vi-0000 <= userx@somehost.example.com H=ten-1.test.ex (test
 >>>   start sublist relay_hosts
 >>>    host in "^[^\d]+2"?
 >>>    ╎list element: ^[^\d]+2
 >>>   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
 >>>   V4NET.0.0.2 OK
 >>>    ╎host in "^[^\d]+2"? yes (matched "^[^\d]+2")
 >>>   end sublist relay_hosts

diff --git a/test/stderr/0064 b/test/stderr/0064
index ab08580a43136175d0bba86c98a5016656e34f2f..8a1003d7d05fae2f8825c400a3bcd2e79885cb44 100644 (file)
--- a/test/stderr/0064
+++ b/test/stderr/0064
@@ -55,14 +55,14 @@
 >>>   start sublist relay_hosts
 >>>    host in "lsearch;TESTSUITE/aux-fixed/0064.hosts"?
 >>>    ╎list element: lsearch;TESTSUITE/aux-fixed/0064.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
 >>>   V4NET.0.0.1 OK
 >>>    host in "lsearch;TESTSUITE/aux-fixed/0064.hosts"? no (end of list)
 >>>   end sublist relay_hosts


@@ -131,14 +131,14 @@ LOG: 10HmaX-000000005vi-0000 <= userx@somehost.example.com H=ten-1.test.ex (test
 >>>   start sublist relay_hosts
 >>>    host in "lsearch;TESTSUITE/aux-fixed/0064.hosts"?
 >>>    ╎list element: lsearch;TESTSUITE/aux-fixed/0064.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
 >>>   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

diff --git a/test/stderr/0066 b/test/stderr/0066
index 5b3fd5458898721d9e0c24c0a4efc6ec28fbd5e3..16a6dddbb08dc7ea613e8f4226f323e7c4bc3f83 100644 (file)
--- a/test/stderr/0066
+++ b/test/stderr/0066
@@ -279,8 +279,8 @@ MUNGED: ::1 will be omitted in what follows
 >>> 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
 >>> 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
 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


@@ -498,14 +498,14 @@ MUNGED: ::1 will be omitted in what follows
 >>> 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
 >>> 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
 >>>   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

diff --git a/test/stderr/0069 b/test/stderr/0069
index 5e878ad6cdf4258223ccacbf9a3d6eafed5a1b3e..fd5a9ac6c345a37b2659d35e43ce9758476aedd3 100644 (file)
--- a/test/stderr/0069
+++ b/test/stderr/0069
@@ -4,14 +4,14 @@
 >>> host in sender_unqualified_hosts?
 >>>  list element: +include_unknown
 >>>  list element: ^ten-1\.test\.ex
 >>> host in sender_unqualified_hosts?
 >>>  list element: +include_unknown
 >>>  list element: ^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
+>>>  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

 >>>   V4NET.0.0.1 OK
 >>>  host in sender_unqualified_hosts? yes (matched "^ten-1\.test\.ex")
 >>> host in recipient_unqualified_hosts? no (option unset)
 >>>   V4NET.0.0.1 OK
 >>>  host in sender_unqualified_hosts? yes (matched "^ten-1\.test\.ex")
 >>> host in recipient_unqualified_hosts? no (option unset)


@@ -40,8 +40,8 @@ LOG: H=ten-1.test.ex (test) [V4NET.0.0.1] F=<x@y> rejected RCPT <x@test.ex>
 >>> host in sender_unqualified_hosts?
 >>>  list element: +include_unknown
 >>>  list element: ^ten-1\.test\.ex
 >>> host in sender_unqualified_hosts?
 >>>  list element: +include_unknown
 >>>  list element: ^ten-1\.test\.ex

->>> sender host name required, to match against ^ten-1\.test\.ex
->>> looking up host name for V4NET.0.0.13
+>>>  sender host name required, to match against ^ten-1\.test\.ex
+>>>   looking up host name for V4NET.0.0.13

 LOG: no host name found for IP address V4NET.0.0.13
 >>>  host in sender_unqualified_hosts? yes (failed to find host name for V4NET.0.0.13)
 LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 LOG: no host name found for IP address V4NET.0.0.13
 >>>  host in sender_unqualified_hosts? yes (failed to find host name for V4NET.0.0.13)
 LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown


@@ -65,7 +65,7 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>>  host in "+include_unknown : ^ten-1\.test\.ex"?
 >>>   list element: +include_unknown
 >>>   list element: ^ten-1\.test\.ex
 >>>  host in "+include_unknown : ^ten-1\.test\.ex"?
 >>>   list element: +include_unknown
 >>>   list element: ^ten-1\.test\.ex

->>> sender host name required, to match against ^ten-1\.test\.ex
+>>>   sender host name required, to match against ^ten-1\.test\.ex

 >>>   host in "+include_unknown : ^ten-1\.test\.ex"? yes (failed to find host name for V4NET.0.0.13)
 LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>>   deny: condition test succeeded in ACL check_recipientx
 >>>   host in "+include_unknown : ^ten-1\.test\.ex"? yes (failed to find host name for V4NET.0.0.13)
 LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>>   deny: condition test succeeded in ACL check_recipientx


@@ -77,8 +77,8 @@ LOG: H=(test) [V4NET.0.0.13] F=<userx@myhost.test.ex> rejected RCPT <x@test.ex>
 >>> host in sender_unqualified_hosts?
 >>>  list element: +include_unknown
 >>>  list element: ^ten-1\.test\.ex
 >>> host in sender_unqualified_hosts?
 >>>  list element: +include_unknown
 >>>  list element: ^ten-1\.test\.ex

->>> sender host name required, to match against ^ten-1\.test\.ex
->>> looking up host name for V4NET.0.0.13
+>>>  sender host name required, to match against ^ten-1\.test\.ex
+>>>   looking up host name for V4NET.0.0.13

 LOG: no host name found for IP address V4NET.0.0.13
 >>>  host in sender_unqualified_hosts? yes (failed to find host name for V4NET.0.0.13)
 LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 LOG: no host name found for IP address V4NET.0.0.13
 >>>  host in sender_unqualified_hosts? yes (failed to find host name for V4NET.0.0.13)
 LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown


@@ -95,7 +95,7 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>>  check hosts = not-exist.test.ex : V4NET.0.0.13
 >>>  host in "not-exist.test.ex : V4NET.0.0.13"?
 >>>   list element: not-exist.test.ex
 >>>  check hosts = not-exist.test.ex : V4NET.0.0.13
 >>>  host in "not-exist.test.ex : V4NET.0.0.13"?
 >>>   list element: not-exist.test.ex

->>> no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])
+>>>   no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])

 LOG: no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])
 >>>   host in "not-exist.test.ex : V4NET.0.0.13"? no (failed to find IP address for not-exist.test.ex)
 >>>   accept: condition test failed in ACL check_recipienty
 LOG: no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])
 >>>   host in "not-exist.test.ex : V4NET.0.0.13"? no (failed to find IP address for not-exist.test.ex)
 >>>   accept: condition test failed in ACL check_recipienty


@@ -110,8 +110,8 @@ LOG: H=(test) [V4NET.0.0.13] F=<userx@test.ex> rejected RCPT <y@test.ex>: "Denie
 >>> host in sender_unqualified_hosts?
 >>>  list element: +include_unknown
 >>>  list element: ^ten-1\.test\.ex
 >>> host in sender_unqualified_hosts?
 >>>  list element: +include_unknown
 >>>  list element: ^ten-1\.test\.ex

->>> sender host name required, to match against ^ten-1\.test\.ex
->>> looking up host name for V4NET.0.0.13
+>>>  sender host name required, to match against ^ten-1\.test\.ex
+>>>   looking up host name for V4NET.0.0.13

 LOG: no host name found for IP address V4NET.0.0.13
 >>>  host in sender_unqualified_hosts? yes (failed to find host name for V4NET.0.0.13)
 LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 LOG: no host name found for IP address V4NET.0.0.13
 >>>  host in sender_unqualified_hosts? yes (failed to find host name for V4NET.0.0.13)
 LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown


@@ -129,7 +129,7 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>>  host in "+ignore_unknown : not-exist.test.ex : V4NET.0.0.13"?
 >>>   list element: +ignore_unknown
 >>>   list element: not-exist.test.ex
 >>>  host in "+ignore_unknown : not-exist.test.ex : V4NET.0.0.13"?
 >>>   list element: +ignore_unknown
 >>>   list element: not-exist.test.ex

->>> no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])
+>>>   no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])

 LOG: no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])
 >>>   failed to find IP address for not-exist.test.ex: item ignored by +ignore_unknown
 >>>   list element: V4NET.0.0.13
 LOG: no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])
 >>>   failed to find IP address for not-exist.test.ex: item ignored by +ignore_unknown
 >>>   list element: V4NET.0.0.13


@@ -142,8 +142,8 @@ LOG: no IP address found for host not-exist.test.ex (during SMTP connection from
 >>> host in sender_unqualified_hosts?
 >>>  list element: +include_unknown
 >>>  list element: ^ten-1\.test\.ex
 >>> host in sender_unqualified_hosts?
 >>>  list element: +include_unknown
 >>>  list element: ^ten-1\.test\.ex

->>> sender host name required, to match against ^ten-1\.test\.ex
->>> looking up host name for V4NET.0.0.13
+>>>  sender host name required, to match against ^ten-1\.test\.ex
+>>>   looking up host name for V4NET.0.0.13

 LOG: no host name found for IP address V4NET.0.0.13
 >>>  host in sender_unqualified_hosts? yes (failed to find host name for V4NET.0.0.13)
 LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 LOG: no host name found for IP address V4NET.0.0.13
 >>>  host in sender_unqualified_hosts? yes (failed to find host name for V4NET.0.0.13)
 LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown


@@ -160,7 +160,7 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>>  check hosts = not-exist.test.ex : V4NET.0.0.13
 >>>  host in "not-exist.test.ex : V4NET.0.0.13"?
 >>>   list element: not-exist.test.ex
 >>>  check hosts = not-exist.test.ex : V4NET.0.0.13
 >>>  host in "not-exist.test.ex : V4NET.0.0.13"?
 >>>   list element: not-exist.test.ex

->>> no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])
+>>>   no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])

 LOG: no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])
 >>>   host in "not-exist.test.ex : V4NET.0.0.13"? no (failed to find IP address for not-exist.test.ex)
 LOG: list matching forced to fail: failed to find IP address for not-exist.test.ex
 LOG: no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])
 >>>   host in "not-exist.test.ex : V4NET.0.0.13"? no (failed to find IP address for not-exist.test.ex)
 LOG: list matching forced to fail: failed to find IP address for not-exist.test.ex


@@ -176,8 +176,8 @@ LOG: H=(test) [V4NET.0.0.13] F=<userx@test.ex> rejected RCPT <y@test.ex>: "Denie
 >>> host in sender_unqualified_hosts?
 >>>  list element: +include_unknown
 >>>  list element: ^ten-1\.test\.ex
 >>> host in sender_unqualified_hosts?
 >>>  list element: +include_unknown
 >>>  list element: ^ten-1\.test\.ex

->>> sender host name required, to match against ^ten-1\.test\.ex
->>> looking up host name for V4NET.0.0.13
+>>>  sender host name required, to match against ^ten-1\.test\.ex
+>>>   looking up host name for V4NET.0.0.13

 LOG: no host name found for IP address V4NET.0.0.13
 >>>  host in sender_unqualified_hosts? yes (failed to find host name for V4NET.0.0.13)
 LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 LOG: no host name found for IP address V4NET.0.0.13
 >>>  host in sender_unqualified_hosts? yes (failed to find host name for V4NET.0.0.13)
 LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown


@@ -202,7 +202,7 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>>   list element: +include_defer
 >>>   list element: test.again.dns
 >>>   test.again.dns in dns_again_means_nonexist? no (option unset)
 >>>   list element: +include_defer
 >>>   list element: test.again.dns
 >>>   test.again.dns in dns_again_means_nonexist? no (option unset)

->>> no IP address found for host test.again.dns (during SMTP connection from (test) [V4NET.0.0.13])
+>>>   no IP address found for host test.again.dns (during SMTP connection from (test) [V4NET.0.0.13])

 >>>   test.again.dns in dns_again_means_nonexist? no (option unset)
 LOG: DNS lookup of "test.again.dns" deferred: accepted by +include_defer
 >>>   deny: condition test succeeded in ACL check_recipienta
 >>>   test.again.dns in dns_again_means_nonexist? no (option unset)
 LOG: DNS lookup of "test.again.dns" deferred: accepted by +include_defer
 >>>   deny: condition test succeeded in ACL check_recipienta


@@ -214,8 +214,8 @@ LOG: H=(test) [V4NET.0.0.13] F=<userx@myhost.test.ex> rejected RCPT <a@test.ex>
 >>> host in sender_unqualified_hosts?
 >>>  list element: +include_unknown
 >>>  list element: ^ten-1\.test\.ex
 >>> host in sender_unqualified_hosts?
 >>>  list element: +include_unknown
 >>>  list element: ^ten-1\.test\.ex

->>> sender host name required, to match against ^ten-1\.test\.ex
->>> looking up host name for V4NET.0.0.13
+>>>  sender host name required, to match against ^ten-1\.test\.ex
+>>>   looking up host name for V4NET.0.0.13

 LOG: no host name found for IP address V4NET.0.0.13
 >>>  host in sender_unqualified_hosts? yes (failed to find host name for V4NET.0.0.13)
 LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 LOG: no host name found for IP address V4NET.0.0.13
 >>>  host in sender_unqualified_hosts? yes (failed to find host name for V4NET.0.0.13)
 LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown


@@ -233,7 +233,7 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>>  host in "test.again.dns : V4NET.0.0.13"?
 >>>   list element: test.again.dns
 >>>   test.again.dns in dns_again_means_nonexist? no (option unset)
 >>>  host in "test.again.dns : V4NET.0.0.13"?
 >>>   list element: test.again.dns
 >>>   test.again.dns in dns_again_means_nonexist? no (option unset)

->>> no IP address found for host test.again.dns (during SMTP connection from (test) [V4NET.0.0.13])
+>>>   no IP address found for host test.again.dns (during SMTP connection from (test) [V4NET.0.0.13])

 >>>   test.again.dns in dns_again_means_nonexist? no (option unset)
 >>>  host in "test.again.dns : V4NET.0.0.13"? list match deferred for test.again.dns
 >>>  accept: condition test deferred in ACL check_recipientb
 >>>   test.again.dns in dns_again_means_nonexist? no (option unset)
 >>>  host in "test.again.dns : V4NET.0.0.13"? list match deferred for test.again.dns
 >>>  accept: condition test deferred in ACL check_recipientb


@@ -244,8 +244,8 @@ LOG: H=(test) [V4NET.0.0.13] F=<userx@test.ex> temporarily rejected RCPT <b@test
 >>> host in sender_unqualified_hosts?
 >>>  list element: +include_unknown
 >>>  list element: ^ten-1\.test\.ex
 >>> host in sender_unqualified_hosts?
 >>>  list element: +include_unknown
 >>>  list element: ^ten-1\.test\.ex

->>> sender host name required, to match against ^ten-1\.test\.ex
->>> looking up host name for V4NET.0.0.13
+>>>  sender host name required, to match against ^ten-1\.test\.ex
+>>>   looking up host name for V4NET.0.0.13

 LOG: no host name found for IP address V4NET.0.0.13
 >>>  host in sender_unqualified_hosts? yes (failed to find host name for V4NET.0.0.13)
 LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 LOG: no host name found for IP address V4NET.0.0.13
 >>>  host in sender_unqualified_hosts? yes (failed to find host name for V4NET.0.0.13)
 LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown


@@ -264,7 +264,7 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>>   list element: +ignore_defer
 >>>   list element: test.again.dns
 >>>   test.again.dns in dns_again_means_nonexist? no (option unset)
 >>>   list element: +ignore_defer
 >>>   list element: test.again.dns
 >>>   test.again.dns in dns_again_means_nonexist? no (option unset)

->>> no IP address found for host test.again.dns (during SMTP connection from (test) [V4NET.0.0.13])
+>>>   no IP address found for host test.again.dns (during SMTP connection from (test) [V4NET.0.0.13])

 >>>   test.again.dns in dns_again_means_nonexist? no (option unset)
 >>>   DNS lookup of "test.again.dns" deferred: item ignored by +ignore_defer
 >>>   list element: V4NET.0.0.13
 >>>   test.again.dns in dns_again_means_nonexist? no (option unset)
 >>>   DNS lookup of "test.again.dns" deferred: item ignored by +ignore_defer
 >>>   list element: V4NET.0.0.13

diff --git a/test/stderr/0070 b/test/stderr/0070
index 56915a88c23c32bdfe177ec930de1d8317478628..fd3f95440f81151a1be6d2ddbf874e16971039b0 100644 (file)
--- a/test/stderr/0070
+++ b/test/stderr/0070
@@ -135,12 +135,12 @@ MUNGED: ::1 will be omitted in what follows
 >>> ten-1.test.ex in helo_lookup_domains? no (end of list)
 >>> verifying EHLO/HELO argument "ten-1.test.ex"
 >>> looking up host name for V4NET.0.0.1
 >>> ten-1.test.ex in helo_lookup_domains? no (end of list)
 >>> verifying EHLO/HELO argument "ten-1.test.ex"
 >>> looking up host name for V4NET.0.0.1

->>> IP address lookup yielded "ten-1.test.ex"
+>>>  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)
 >>>  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
+>>>  checking addresses for ten-1.test.ex

 >>>   V4NET.0.0.1 OK
 >>> matched host name
 >>> host in hosts_connection_nolog? no (option unset)
 >>>   V4NET.0.0.1 OK
 >>> matched host name
 >>> host in hosts_connection_nolog? no (option unset)


@@ -165,19 +165,19 @@ MUNGED: ::1 will be omitted in what follows
 >>> ten-3.test.ex in helo_lookup_domains? no (end of list)
 >>> verifying EHLO/HELO argument "ten-3.test.ex"
 >>> looking up host name for V4NET.0.0.3
 >>> ten-3.test.ex in helo_lookup_domains? no (end of list)
 >>> verifying EHLO/HELO argument "ten-3.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"
+>>>  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)
 >>>  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
+>>>  checking addresses for ten-3.test.ex

 >>>   V4NET.0.0.3 OK
 >>>  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)
 >>>   V4NET.0.0.3 OK
 >>>  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
+>>>  checking addresses for ten-3-alias.test.ex

 >>>   V4NET.0.0.3 OK
 >>> matched host name
 >>> host in smtp_accept_max_nonmail_hosts?
 >>>   V4NET.0.0.3 OK
 >>> matched host name
 >>> host in smtp_accept_max_nonmail_hosts?


@@ -214,12 +214,12 @@ MUNGED: ::1 will be omitted in what follows
 >>> rhubarb in helo_lookup_domains? no (end of list)
 >>> verifying EHLO/HELO argument "rhubarb"
 >>> looking up host name for V4NET.0.0.1
 >>> rhubarb in helo_lookup_domains? no (end of list)
 >>> verifying EHLO/HELO argument "rhubarb"
 >>> looking up host name for V4NET.0.0.1

->>> IP address lookup yielded "ten-1.test.ex"
+>>>  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)
 >>>  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
+>>>  checking addresses for ten-1.test.ex

 >>>   V4NET.0.0.1 OK
 >>> getting IP address for rhubarb
 >>> check dnssec require list
 >>>   V4NET.0.0.1 OK
 >>> getting IP address for rhubarb
 >>> check dnssec require list

diff --git a/test/stderr/0089 b/test/stderr/0089
index d03650f122a1b78f09878f75910b7ed6be0f484a..e64248528be565556ef71f0ae2e2a4bd33f4ec9f 100644 (file)
--- a/test/stderr/0089
+++ b/test/stderr/0089
@@ -3,8 +3,8 @@
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts?
 >>>  list element: *N-99.test.EX
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts?
 >>>  list element: *N-99.test.EX

->>> sender host name required, to match against *N-99.test.EX
->>> looking up host name for V4NET.0.0.0
+>>>  sender host name required, to match against *N-99.test.EX
+>>>   looking up host name for V4NET.0.0.0

 LOG: no host name found for IP address V4NET.0.0.0
 >>>  host in sender_unqualified_hosts? no (failed to find host name for V4NET.0.0.0)
 >>>  host in recipient_unqualified_hosts? no (option unset)
 LOG: no host name found for IP address V4NET.0.0.0
 >>>  host in sender_unqualified_hosts? no (failed to find host name for V4NET.0.0.0)
 >>>  host in recipient_unqualified_hosts? no (option unset)


@@ -12,7 +12,7 @@ LOG: no host name found for IP address V4NET.0.0.0
 >>>  host in helo_try_verify_hosts? no (option unset)
 >>>  host in helo_accept_junk_hosts?
 >>>   list element: *N-99.test.ex
 >>>  host in helo_try_verify_hosts? no (option unset)
 >>>  host in helo_accept_junk_hosts?
 >>>   list element: *N-99.test.ex

->>> sender host name required, to match against *N-99.test.ex
+>>>   sender host name required, to match against *N-99.test.ex

 >>>   host in helo_accept_junk_hosts? no (failed to find host name for V4NET.0.0.0)
 LOG: rejected HELO from [V4NET.0.0.0]: syntactically invalid argument(s): @#$%^&*()
 >>>   host in smtp_accept_max_nonmail_hosts?
 >>>   host in helo_accept_junk_hosts? no (failed to find host name for V4NET.0.0.0)
 LOG: rejected HELO from [V4NET.0.0.0]: syntactically invalid argument(s): @#$%^&*()
 >>>   host in smtp_accept_max_nonmail_hosts?


@@ -83,14 +83,14 @@ LOG: H=(abc_xyz) [V4NET.0.0.0] F=<userx@cus.cam.ac.uk> rejected RCPT <userx@else
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts?
 >>>  list element: *N-99.test.EX
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts?
 >>>  list element: *N-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
+>>>  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

 >>>   V4NET.0.0.99 OK
 >>>  host in sender_unqualified_hosts? yes (matched "*N-99.test.EX")
 >>> host in recipient_unqualified_hosts? no (option unset)
 >>>   V4NET.0.0.99 OK
 >>>  host in sender_unqualified_hosts? yes (matched "*N-99.test.EX")
 >>> host in recipient_unqualified_hosts? no (option unset)

diff --git a/test/stderr/0094 b/test/stderr/0094
index 261e70878fc4dd47195c92a6fb9a6076474342bb..061c49b4e204879f39dddce307fdcc9af5ff68a6 100644 (file)
--- a/test/stderr/0094
+++ b/test/stderr/0094
@@ -39,7 +39,7 @@ LOG: no host name found for IP address V4NET.11.12.13
 >>>   start sublist relay_hosts
 >>>    host in "*.masq.test.ex"?
 >>>    ╎list element: *.masq.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)
 >>>    ╎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)


@@ -54,12 +54,12 @@ LOG: H=(test) [V4NET.11.12.13] F=<userx@cam.ac.uk> rejected RCPT <userx@cam.ac.u
 >>>  list element: 0.0.0.0/0
 >>>  host in host_lookup? yes (matched "0.0.0.0/0")
 >>> looking up host name for V4NET.0.0.1
 >>>  list element: 0.0.0.0/0
 >>>  host in host_lookup? yes (matched "0.0.0.0/0")
 >>> looking up host name for V4NET.0.0.1

->>> IP address lookup yielded "ten-1.test.ex"
+>>>  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)
 >>>  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
+>>>  checking addresses for ten-1.test.ex

 >>>   V4NET.0.0.1 OK
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
 >>>   V4NET.0.0.1 OK
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)


@@ -124,8 +124,9 @@ host in host_lookup?
 looking up host name for V4NET.99.99.90
  DNS lookup of 90.99.99.V4NET.in-addr.arpa (PTR) using fakens
  DNS lookup of 90.99.99.V4NET.in-addr.arpa (PTR) succeeded
 looking up host name for V4NET.99.99.90
  DNS lookup of 90.99.99.V4NET.in-addr.arpa (PTR) using fakens
  DNS lookup of 90.99.99.V4NET.in-addr.arpa (PTR) succeeded

-IP address lookup yielded "oneback.test.ex"
-  alias "host1.masq.test.ex"
+ Reverse DNS security status: unverified
+ IP address lookup yielded "oneback.test.ex"
+   alias "host1.masq.test.ex"

  check dnssec require list
   oneback.test.ex not in empty list (option unset? cannot trace name)
  check dnssec request list
  check dnssec require list
   oneback.test.ex not in empty list (option unset? cannot trace name)
  check dnssec request list


@@ -133,8 +134,8 @@ IP address lookup yielded "oneback.test.ex"
  DNS lookup of oneback.test.ex (A) using fakens
  DNS lookup of oneback.test.ex (A) succeeded
  oneback.test.ex V4NET.99.99.90 mx=-1 sort=xx 
  DNS lookup of oneback.test.ex (A) using fakens
  DNS lookup of oneback.test.ex (A) succeeded
  oneback.test.ex V4NET.99.99.90 mx=-1 sort=xx 

-checking addresses for oneback.test.ex
-Forward DNS security status: unverified
+ checking addresses for oneback.test.ex
+ Forward DNS security status: unverified

   V4NET.99.99.90 OK
  check dnssec require list
   host1.masq.test.ex not in empty list (option unset? cannot trace name)
   V4NET.99.99.90 OK
  check dnssec require list
   host1.masq.test.ex not in empty list (option unset? cannot trace name)


@@ -143,8 +144,8 @@ Forward DNS security status: unverified
  DNS lookup of host1.masq.test.ex (A) using fakens
  DNS lookup of host1.masq.test.ex (A) succeeded
  host1.masq.test.ex V4NET.90.90.90 mx=-1 sort=xx 
  DNS lookup of host1.masq.test.ex (A) using fakens
  DNS lookup of host1.masq.test.ex (A) succeeded
  host1.masq.test.ex V4NET.90.90.90 mx=-1 sort=xx 

-checking addresses for host1.masq.test.ex
-Forward DNS security status: unverified
+ checking addresses for host1.masq.test.ex
+ Forward DNS security status: unverified

   V4NET.90.90.90
 no IP address for host1.masq.test.ex matched V4NET.99.99.90
 sender_fullhost = oneback.test.ex [V4NET.99.99.90]
   V4NET.90.90.90
 no IP address for host1.masq.test.ex matched V4NET.99.99.90
 sender_fullhost = oneback.test.ex [V4NET.99.99.90]

diff --git a/test/stderr/0124 b/test/stderr/0124
index 1f19f58ff73e3024ce85a19a501b3b45841f0819..7e5c6e80a00ef49b62b364adf56dcb288e26306e 100644 (file)
--- a/test/stderr/0124
+++ b/test/stderr/0124
@@ -35,8 +35,8 @@
 >>>   start sublist relay_hosts
 >>>    host in "*.friendly.test.ex"?
 >>>    ╎list element: *.friendly.test.ex
 >>>   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
 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

diff --git a/test/stderr/0234 b/test/stderr/0234
index f2727c80e7385b0ca095ea4d3052620f415a31a9..7f40ae110de1f244cf32ddaad9698b9601b8256e 100644 (file)
--- a/test/stderr/0234
+++ b/test/stderr/0234
@@ -39,7 +39,7 @@ LOG: H=(test) [V4NET.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
 >>>    ╎list element: @mx_any
 >>>    ╎check dnssec require list
 >>>    ╎check dnssec request list
 >>>    ╎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'
 >>>    ╎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'


@@ -56,9 +56,9 @@ LOG: H=(test) [V4NET.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
 >>>    ╎list element: @mx_any
 >>>    ╎check dnssec require list
 >>>    ╎check dnssec request list
 >>>    ╎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'
 >>>    ╎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'

diff --git a/test/stderr/0281 b/test/stderr/0281
index 9fd87a8e947ebba44be2a91cd59e4dddd48caecc..e99cfd51eaf8ee94414513fd3a38b4e100c8945c 100644 (file)
--- a/test/stderr/0281
+++ b/test/stderr/0281
@@ -55,7 +55,7 @@ LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <1@else.where>: domain doesn't
 >>>  other1.test.ex in hosts_treat_as_local?
 >>>   list element: other1.test.ex
 >>>   other1.test.ex in hosts_treat_as_local? yes (matched "other1.test.ex")
 >>>  other1.test.ex in hosts_treat_as_local?
 >>>   list element: other1.test.ex
 >>>   other1.test.ex in hosts_treat_as_local? yes (matched "other1.test.ex")

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

 >>>  mxt13.test.ex in "@mx_any"? yes (matched "@mx_any")
 >>> require: condition test succeeded in ACL acl_rcpt_2
 >>> processing ACL acl_rcpt_2 "accept" (TESTSUITE/test-config 26)
 >>>  mxt13.test.ex in "@mx_any"? yes (matched "@mx_any")
 >>> require: condition test succeeded in ACL acl_rcpt_2
 >>> processing ACL acl_rcpt_2 "accept" (TESTSUITE/test-config 26)


@@ -72,7 +72,7 @@ LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <1@else.where>: domain doesn't
 >>>  eximtesthost.test.ex in hosts_treat_as_local?
 >>>   list element: other1.test.ex
 >>>  eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>>  eximtesthost.test.ex in hosts_treat_as_local?
 >>>   list element: other1.test.ex
 >>>  eximtesthost.test.ex in hosts_treat_as_local? no (end of list)

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

 >>>  mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
 >>> require: condition test succeeded in ACL acl_rcpt_2
 >>> processing ACL acl_rcpt_2 "accept" (TESTSUITE/test-config 26)
 >>>  mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
 >>> require: condition test succeeded in ACL acl_rcpt_2
 >>> processing ACL acl_rcpt_2 "accept" (TESTSUITE/test-config 26)


@@ -92,9 +92,9 @@ LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <1@else.where>: domain doesn't
 >>>  eximtesthost.test.ex in hosts_treat_as_local?
 >>>   list element: other1.test.ex
 >>>  eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>>  eximtesthost.test.ex in hosts_treat_as_local?
 >>>   list element: other1.test.ex
 >>>  eximtesthost.test.ex in hosts_treat_as_local? no (end of list)

->>> 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

 >>>  mxt6.test.ex in "@mx_any"? yes (matched "@mx_any")
 >>> require: condition test succeeded in ACL acl_rcpt_2
 >>> processing ACL acl_rcpt_2 "accept" (TESTSUITE/test-config 26)
 >>>  mxt6.test.ex in "@mx_any"? yes (matched "@mx_any")
 >>> require: condition test succeeded in ACL acl_rcpt_2
 >>> processing ACL acl_rcpt_2 "accept" (TESTSUITE/test-config 26)


@@ -147,7 +147,7 @@ LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <2@mxnone.test.ex>: domain doe
 >>>  eximtesthost.test.ex in hosts_treat_as_local?
 >>>   list element: other1.test.ex
 >>>  eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>>  eximtesthost.test.ex in hosts_treat_as_local?
 >>>   list element: other1.test.ex
 >>>  eximtesthost.test.ex in hosts_treat_as_local? no (end of list)

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

 >>>  mxt5.test.ex in "@mx_primary"? yes (matched "@mx_primary")
 >>> require: condition test succeeded in ACL acl_rcpt_3
 >>> processing ACL acl_rcpt_3 "accept" (TESTSUITE/test-config 31)
 >>>  mxt5.test.ex in "@mx_primary"? yes (matched "@mx_primary")
 >>> require: condition test succeeded in ACL acl_rcpt_3
 >>> processing ACL acl_rcpt_3 "accept" (TESTSUITE/test-config 31)


@@ -170,9 +170,9 @@ LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <2@mxnone.test.ex>: domain doe
 >>>  eximtesthost.test.ex in hosts_treat_as_local?
 >>>   list element: other1.test.ex
 >>>  eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>>  eximtesthost.test.ex in hosts_treat_as_local?
 >>>   list element: other1.test.ex
 >>>  eximtesthost.test.ex in hosts_treat_as_local? no (end of 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_primary"? no (end of list)
 >>> require: condition test failed in ACL acl_rcpt_3
 >>> end of ACL acl_rcpt_3: not OK
 >>> mxt6.test.ex in "@mx_primary"? no (end of list)
 >>> require: condition test failed in ACL acl_rcpt_3
 >>> end of ACL acl_rcpt_3: not OK


@@ -221,7 +221,7 @@ LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxnone.test.ex>: domain doe
 >>>  eximtesthost.test.ex in hosts_treat_as_local?
 >>>   list element: other1.test.ex
 >>>  eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>>  eximtesthost.test.ex in hosts_treat_as_local?
 >>>   list element: other1.test.ex
 >>>  eximtesthost.test.ex in hosts_treat_as_local? no (end of list)

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

 >>> mxt5.test.ex in "@mx_secondary"? no (end of list)
 >>> require: condition test failed in ACL acl_rcpt_4
 >>> end of ACL acl_rcpt_4: not OK
 >>> mxt5.test.ex in "@mx_secondary"? no (end of list)
 >>> require: condition test failed in ACL acl_rcpt_4
 >>> end of ACL acl_rcpt_4: not OK


@@ -243,9 +243,9 @@ LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <4@mxt5.test.ex>: domain doesn
 >>>  eximtesthost.test.ex in hosts_treat_as_local?
 >>>   list element: other1.test.ex
 >>>  eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>>  eximtesthost.test.ex in hosts_treat_as_local?
 >>>   list element: other1.test.ex
 >>>  eximtesthost.test.ex in hosts_treat_as_local? no (end of 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_secondary"? yes (matched "@mx_secondary")
 >>> require: condition test succeeded in ACL acl_rcpt_4
 >>> processing ACL acl_rcpt_4 "accept" (TESTSUITE/test-config 36)
 >>>  mxt6.test.ex in "@mx_secondary"? yes (matched "@mx_secondary")
 >>> require: condition test succeeded in ACL acl_rcpt_4
 >>> processing ACL acl_rcpt_4 "accept" (TESTSUITE/test-config 36)


@@ -377,8 +377,8 @@ MUNGED: ::1 will be omitted in what follows
 >>>  eximtesthost.test.ex in hosts_treat_as_local?
 >>>   list element: other1.test.ex
 >>>  eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>>  eximtesthost.test.ex in hosts_treat_as_local?
 >>>   list element: other1.test.ex
 >>>  eximtesthost.test.ex in hosts_treat_as_local? no (end of list)

->>> 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

 >>>  mxt3.test.ex in "@mx_any"? yes (matched "@mx_any")
 >>> require: condition test succeeded in ACL acl_rcpt_2
 >>> processing ACL acl_rcpt_2 "accept" (TESTSUITE/test-config 26)
 >>>  mxt3.test.ex in "@mx_any"? yes (matched "@mx_any")
 >>> require: condition test succeeded in ACL acl_rcpt_2
 >>> processing ACL acl_rcpt_2 "accept" (TESTSUITE/test-config 26)


@@ -398,8 +398,8 @@ MUNGED: ::1 will be omitted in what follows
 >>>  eximtesthost.test.ex in hosts_treat_as_local?
 >>>   list element: other1.test.ex
 >>>  eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>>  eximtesthost.test.ex in hosts_treat_as_local?
 >>>   list element: other1.test.ex
 >>>  eximtesthost.test.ex in hosts_treat_as_local? no (end of list)

->>> 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

 >>> mxt3.test.ex in "@mx_primary"? no (end of list)
 >>> require: condition test failed in ACL acl_rcpt_3
 >>> end of ACL acl_rcpt_3: not OK
 >>> mxt3.test.ex in "@mx_primary"? no (end of list)
 >>> require: condition test failed in ACL acl_rcpt_3
 >>> end of ACL acl_rcpt_3: not OK


@@ -418,8 +418,8 @@ LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxt3.test.ex>: domain doesn
 >>>  eximtesthost.test.ex in hosts_treat_as_local?
 >>>   list element: other1.test.ex
 >>>  eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>>  eximtesthost.test.ex in hosts_treat_as_local?
 >>>   list element: other1.test.ex
 >>>  eximtesthost.test.ex in hosts_treat_as_local? no (end of list)

->>> 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

 >>>  mxt3.test.ex in "@mx_secondary"? yes (matched "@mx_secondary")
 >>> require: condition test succeeded in ACL acl_rcpt_4
 >>> processing ACL acl_rcpt_4 "accept" (TESTSUITE/test-config 36)
 >>>  mxt3.test.ex in "@mx_secondary"? yes (matched "@mx_secondary")
 >>> require: condition test succeeded in ACL acl_rcpt_4
 >>> processing ACL acl_rcpt_4 "accept" (TESTSUITE/test-config 36)

diff --git a/test/stderr/0303 b/test/stderr/0303
index 67ca5b494f0a51ccc442be3d42606f7165d0cd39..ea3f63024d4185e8a7979f39dd5149fce45a3394 100644 (file)
--- a/test/stderr/0303
+++ b/test/stderr/0303
@@ -10,12 +10,12 @@
 >>>  list element: @
 >>>  myhost.test.ex in helo_lookup_domains? yes (matched "@")
 >>> looking up host name for V4NET.0.0.1
 >>>  list element: @
 >>>  myhost.test.ex in helo_lookup_domains? yes (matched "@")
 >>> looking up host name for V4NET.0.0.1

->>> IP address lookup yielded "ten-1.test.ex"
+>>>  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)
 >>>  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
+>>>  checking addresses for ten-1.test.ex

 >>>   V4NET.0.0.1 OK
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>>   V4NET.0.0.1 OK
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)


@@ -30,12 +30,12 @@
 >>>  list element: @[]
 >>>  [127.0.0.1] in helo_lookup_domains? yes (matched "@[]")
 >>> looking up host name for V4NET.0.0.1
 >>>  list element: @[]
 >>>  [127.0.0.1] in helo_lookup_domains? yes (matched "@[]")
 >>> looking up host name for V4NET.0.0.1

->>> IP address lookup yielded "ten-1.test.ex"
+>>>  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)
 >>>  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
+>>>  checking addresses for ten-1.test.ex

 >>>   V4NET.0.0.1 OK
 >>>  list element: *
 >>>  host in limits_advertise_hosts? yes (matched "*")
 >>>   V4NET.0.0.1 OK
 >>>  list element: *
 >>>  host in limits_advertise_hosts? yes (matched "*")

diff --git a/test/stderr/0308 b/test/stderr/0308
index 469ddeb43163ba9b129350b56ba9cc0f1b8479ba..c738c612c916a10d6ebb9d2b57a23134b0049890 100644 (file)
--- a/test/stderr/0308
+++ b/test/stderr/0308
@@ -15,8 +15,8 @@
 >>> check hosts = *.test.ex
 >>> host in "*.test.ex"?
 >>>  list element: *.test.ex
 >>> check hosts = *.test.ex
 >>> host in "*.test.ex"?
 >>>  list element: *.test.ex

->>> sender host name required, to match against *.test.ex
->>> looking up host name for V4NET.0.0.97
+>>>  sender host name required, to match against *.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 "*.test.ex"? no (failed to find host name for V4NET.0.0.97)
 >>>  accept: condition test failed in ACL acl_V4NET_0_0
 LOG: no host name found for IP address V4NET.0.0.97
 >>>  host in "*.test.ex"? no (failed to find host name for V4NET.0.0.97)
 >>>  accept: condition test failed in ACL acl_V4NET_0_0


@@ -44,14 +44,14 @@ LOG: no host name found for IP address V4NET.0.0.97
 >>> check hosts = *.test.ex
 >>> host in "*.test.ex"?
 >>>  list element: *.test.ex
 >>> check hosts = *.test.ex
 >>> host in "*.test.ex"?
 >>>  list element: *.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
+>>>  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

 >>>   V4NET.0.0.1 OK
 >>>  host in "*.test.ex"? yes (matched "*.test.ex")
 >>> accept: condition test succeeded in ACL acl_V4NET_0_0
 >>>   V4NET.0.0.1 OK
 >>>  host in "*.test.ex"? yes (matched "*.test.ex")
 >>> accept: condition test succeeded in ACL acl_V4NET_0_0

diff --git a/test/stderr/0381 b/test/stderr/0381
index f73b447ba92d445b0c80ac42f9343a49fc32e106..267faef68e5f4fb247405bf3c2f3759c9f9fa847 100644 (file)
--- 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
 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
   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
   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)
   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 47a0e155882b7a3e2cf7bf0142e23dab674d4cd5..9d5b215f580701121f48b7c6eabf169869450041 100644 (file)
--- a/test/stderr/0394
+++ b/test/stderr/0394
@@ -3,7 +3,7 @@
 >>>  list element: *
 >>>  host in host_lookup? yes (matched "*")
 >>> looking up host name for V4NET.255.255.255
 >>>  list element: *
 >>>  host in host_lookup? yes (matched "*")
 >>> looking up host name for V4NET.255.255.255

->>> IP address lookup yielded an empty name: treated as non-existent host name
+>>>  IP address lookup yielded an empty name: treated as non-existent host name

 LOG: no host name found for IP address V4NET.255.255.255
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
 LOG: no host name found for IP address V4NET.255.255.255
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)


@@ -22,7 +22,7 @@ LOG: H=[V4NET.255.255.255] rejected connection in "connect" ACL: host lookup fai
 >>>  list element: *
 >>>  host in host_lookup? yes (matched "*")
 >>> looking up host name for V4NET.255.255.255
 >>>  list element: *
 >>>  host in host_lookup? yes (matched "*")
 >>> looking up host name for V4NET.255.255.255

->>> IP address lookup yielded an empty name: treated as non-existent host name
+>>>  IP address lookup yielded an empty name: treated as non-existent host name

 LOG: no host name found for IP address V4NET.255.255.255
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
 LOG: no host name found for IP address V4NET.255.255.255
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)


@@ -40,7 +40,7 @@ LOG: H=[V4NET.255.255.255] temporarily rejected connection in "connect" ACL: une
 >>>  list element: *
 >>>  host in host_lookup? yes (matched "*")
 >>> looking up host name for V4NET.255.255.255
 >>>  list element: *
 >>>  host in host_lookup? yes (matched "*")
 >>> looking up host name for V4NET.255.255.255

->>> IP address lookup yielded an empty name: treated as non-existent host name
+>>>  IP address lookup yielded an empty name: treated as non-existent host name

 LOG: no host name found for IP address V4NET.255.255.255
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
 LOG: no host name found for IP address V4NET.255.255.255
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)


@@ -58,7 +58,7 @@ LOG: H=[V4NET.255.255.255] temporarily rejected connection in "connect" ACL: une
 >>>  list element: *
 >>>  host in host_lookup? yes (matched "*")
 >>> looking up host name for V4NET.255.255.255
 >>>  list element: *
 >>>  host in host_lookup? yes (matched "*")
 >>> looking up host name for V4NET.255.255.255

->>> IP address lookup yielded an empty name: treated as non-existent host name
+>>>  IP address lookup yielded an empty name: treated as non-existent host name

 LOG: no host name found for IP address V4NET.255.255.255
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
 LOG: no host name found for IP address V4NET.255.255.255
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)

diff --git a/test/stderr/0401 b/test/stderr/0401
index c517ff5ada07b6190d8a91b2d503a6b2a97d7ac0..ee46973332f7470d7d697e5105e4efbae451c444 100644 (file)
--- a/test/stderr/0401
+++ b/test/stderr/0401
@@ -23,7 +23,7 @@
 >>> check hosts = TESTSUITE/aux-var/0401.hosts2
 >>> host in "TESTSUITE/aux-var/0401.hosts2"?
 >>>  list element: TESTSUITE/aux-var/0401.hosts2
 >>> check hosts = TESTSUITE/aux-var/0401.hosts2
 >>> host in "TESTSUITE/aux-var/0401.hosts2"?
 >>>  list element: TESTSUITE/aux-var/0401.hosts2

->>> no IP address found for host not-exist.test.ex (during SMTP connection from (xxx) [V4NET.9.8.7])
+>>>  no IP address found for host not-exist.test.ex (during SMTP connection from (xxx) [V4NET.9.8.7])

 LOG: no IP address found for host not-exist.test.ex (during SMTP connection from (xxx) [V4NET.9.8.7])
 >>>  host in "TESTSUITE/aux-var/0401.hosts2"? no (failed to find IP address for not-exist.test.ex)
 >>> accept: condition test failed in ACL mail
 LOG: no IP address found for host not-exist.test.ex (during SMTP connection from (xxx) [V4NET.9.8.7])
 >>>  host in "TESTSUITE/aux-var/0401.hosts2"? no (failed to find IP address for not-exist.test.ex)
 >>> accept: condition test failed in ACL mail


@@ -42,8 +42,8 @@ LOG: H=(xxx) [V4NET.9.8.7] rejected MAIL <x@y>
 >>> check hosts = TESTSUITE/aux-var/0401.hosts1
 >>> host in "TESTSUITE/aux-var/0401.hosts1"?
 >>>  list element: TESTSUITE/aux-var/0401.hosts1
 >>> check hosts = TESTSUITE/aux-var/0401.hosts1
 >>> host in "TESTSUITE/aux-var/0401.hosts1"?
 >>>  list element: TESTSUITE/aux-var/0401.hosts1

->>> sender host name required, to match against *.2.2
->>> looking up host name for V4NET.9.9.9
+>>>  sender host name required, to match against *.2.2
+>>>   looking up host name for V4NET.9.9.9

 LOG: no host name found for IP address V4NET.9.9.9
 >>>  host in "TESTSUITE/aux-var/0401.hosts1"? no (failed to find host name for V4NET.9.9.9)
 >>> accept: condition test failed in ACL connect
 LOG: no host name found for IP address V4NET.9.9.9
 >>>  host in "TESTSUITE/aux-var/0401.hosts1"? no (failed to find host name for V4NET.9.9.9)
 >>> accept: condition test failed in ACL connect

diff --git a/test/stderr/0419 b/test/stderr/0419
index 28f6784a20a87faed78f81b2913fe0073e533997..fa097e1ce3fd42be2b4f7c9fc7382173345e50f3 100644 (file)
--- 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")
    ╎ 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 
  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 b9ab6329f197accd922845ed43dcf74a7974666e..4503efa2dc79ef581a9bc0dc2f9724cc05eab0d7 100644 (file)
--- 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
  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
  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 4d882260a0539228d8448cd84d217c6abf129fcd..0eafb00eb54234c4a72090037572027356b27d9f 100644 (file)
--- 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
    ╎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")
    ╎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
    ╎  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")
    ╎  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 3c6a74c6f54803d9131c6184d20466772309ba8c..1f45b368d5fa7622f5c717f20c091f5994f1bad6 100644 (file)
--- a/test/stderr/0537
+++ b/test/stderr/0537
@@ -31,7 +31,7 @@ LOG: interface_address=[]
 >>>  check logwrite = received_protocol=$received_protocol
 >>>                = received_protocol=smtp
 LOG: received_protocol=smtp
 >>>  check logwrite = received_protocol=$received_protocol
 >>>                = received_protocol=smtp
 LOG: received_protocol=smtp

->>> looking up host name for 1.2.3.4
+>>>   looking up host name for 1.2.3.4

 LOG: no host name found for IP address 1.2.3.4
 >>>  check logwrite = sender_host_name=$sender_host_name
 >>>                = sender_host_name=
 LOG: no host name found for IP address 1.2.3.4
 >>>  check logwrite = sender_host_name=$sender_host_name
 >>>                = sender_host_name=

diff --git a/test/stderr/0545 b/test/stderr/0545
index 0f7a71a32c2480477e2cca4317b80ca1602e2285..1414e6ec3554158d566aab2c367811265b641c8c 100644 (file)
--- a/test/stderr/0545
+++ b/test/stderr/0545
@@ -40,7 +40,7 @@ main lookup for domain
  CNAME found: change to eximtesthost.test.ex
  DNS lookup of eximtesthost.test.ex (A) using fakens
  DNS lookup of eximtesthost.test.ex (A) succeeded
  CNAME found: change to eximtesthost.test.ex
  DNS lookup of eximtesthost.test.ex (A) using fakens
  DNS lookup of eximtesthost.test.ex (A) succeeded

-local host found for non-MX address
+ local host found for non-MX address

  fully qualified name = alias-eximtesthost.test.ex
  eximtesthost.test.ex ip4.ip4.ip4.ip4 mx=-1 sort=xx 
 domain changed to alias-eximtesthost.test.ex
  fully qualified name = alias-eximtesthost.test.ex
  eximtesthost.test.ex ip4.ip4.ip4.ip4 mx=-1 sort=xx 
 domain changed to alias-eximtesthost.test.ex


@@ -71,7 +71,7 @@ main lookup for domain
  CNAME found: change to eximtesthost.test.ex
  DNS lookup of eximtesthost.test.ex (A) using fakens
  DNS lookup of eximtesthost.test.ex (A) succeeded
  CNAME found: change to eximtesthost.test.ex
  DNS lookup of eximtesthost.test.ex (A) using fakens
  DNS lookup of eximtesthost.test.ex (A) succeeded

-local host found for non-MX address
+ local host found for non-MX address

  fully qualified name = alias-eximtesthost.test.ex
  eximtesthost.test.ex ip4.ip4.ip4.ip4 mx=-1 sort=xx 
 remote host address is the local host: alias-eximtesthost.test.ex: configured to try delivery anyway
  fully qualified name = alias-eximtesthost.test.ex
  eximtesthost.test.ex ip4.ip4.ip4.ip4 mx=-1 sort=xx 
 remote host address is the local host: alias-eximtesthost.test.ex: configured to try delivery anyway


@@ -128,7 +128,7 @@ main lookup for domain
  CNAME found: change to eximtesthost.test.ex
  DNS lookup of eximtesthost.test.ex (A) using fakens
  DNS lookup of eximtesthost.test.ex (A) succeeded
  CNAME found: change to eximtesthost.test.ex
  DNS lookup of eximtesthost.test.ex (A) using fakens
  DNS lookup of eximtesthost.test.ex (A) succeeded

-local host found for non-MX address
+ local host found for non-MX address

  fully qualified name = alias-eximtesthost.test.ex
  eximtesthost.test.ex ip4.ip4.ip4.ip4 mx=-1 sort=xx 
 remote host address is the local host: alias-eximtesthost.test.ex: configured to try delivery anyway
  fully qualified name = alias-eximtesthost.test.ex
  eximtesthost.test.ex ip4.ip4.ip4.ip4 mx=-1 sort=xx 
 remote host address is the local host: alias-eximtesthost.test.ex: configured to try delivery anyway

diff --git a/test/stderr/0587 b/test/stderr/0587
index 5be211ca7af1db607aa025c6f5853b5fa94fa127..8fe8c9a4c17229b6e8f6c108832ffa164070b2da 100644 (file)
--- a/test/stderr/0587
+++ b/test/stderr/0587
@@ -15,7 +15,7 @@
 >>> host in "test.again.dns"?
 >>>  list element: test.again.dns
 >>>  test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> host in "test.again.dns"?
 >>>  list element: test.again.dns
 >>>  test.again.dns in dns_again_means_nonexist? no (option unset)

->>> no IP address found for host test.again.dns (during SMTP connection from (test) [ip4.ip4.ip4.ip4])
+>>>  no IP address found for host test.again.dns (during SMTP connection from (test) [ip4.ip4.ip4.ip4])

 >>>  test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> host in "test.again.dns"? list match deferred for test.again.dns
 >>> accept: condition test deferred in inline ACL
 >>>  test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> host in "test.again.dns"? list match deferred for test.again.dns
 >>> accept: condition test deferred in inline ACL

diff --git a/test/stderr/0588 b/test/stderr/0588
index 5477627f57ad886bc7783e82ba5f303401199179..748e1ccb3effe80d11298a5a9078a9d4db473ced 100644 (file)
--- a/test/stderr/0588
+++ b/test/stderr/0588
@@ -22,7 +22,7 @@
 >>>    list element: *
 >>>    delay1500.test.ex in dnssec_request_domains? yes (matched "*")
 LOG: Long A lookup for 'delay1500.test.ex': ssss msec
 >>>    list element: *
 >>>    delay1500.test.ex in dnssec_request_domains? yes (matched "*")
 LOG: Long A lookup for 'delay1500.test.ex': ssss msec

->>> local host found for non-MX address
+>>>  local host found for non-MX address

 >>> routed by all router
 >>> ----------- end verify ------------
 >>> accept: condition test succeeded in inline ACL
 >>> routed by all router
 >>> ----------- end verify ------------
 >>> accept: condition test succeeded in inline ACL


@@ -50,7 +50,7 @@ LOG: Long A lookup for 'delay1500.test.ex': ssss msec
 >>>   delay500.test.ex in dnssec_request_domains?
 >>>    list element: *
 >>>    delay500.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 "*")

->>> local host found for non-MX address
+>>>  local host found for non-MX address

 >>> routed by all router
 >>> ----------- end verify ------------
 >>> accept: condition test succeeded in inline ACL
 >>> routed by all router
 >>> ----------- end verify ------------
 >>> accept: condition test succeeded in inline ACL

diff --git a/test/stderr/1000 b/test/stderr/1000
index b30bdb1edde4a0900c5607be5b46b2d033d7604c..5f289462d7e2060389114d7fa17ce189a3260e00 100644 (file)
--- a/test/stderr/1000
+++ b/test/stderr/1000
@@ -26,12 +26,12 @@ LOG: H=[2001:ab8:37f:20::1] rejected connection in "connect" ACL
 >>>  list element: *
 >>>  host in host_lookup? yes (matched "*")
 >>> looking up host name for V6NET:1234:5:6:7:8:abc:d
 >>>  list element: *
 >>>  host in host_lookup? yes (matched "*")
 >>> looking up host name for V6NET:1234:5:6:7:8:abc:d

->>> IP address lookup yielded "test3.ipv6.test.ex"
+>>>  IP address lookup yielded "test3.ipv6.test.ex"

 >>>  check dnssec require list
 >>>   test3.ipv6.test.ex not in empty list (option unset? cannot trace name)
 >>>  check dnssec request list
 >>>   test3.ipv6.test.ex not in empty list (option unset? cannot trace name)
 >>>  check dnssec require list
 >>>   test3.ipv6.test.ex not in empty list (option unset? cannot trace name)
 >>>  check dnssec request list
 >>>   test3.ipv6.test.ex not in empty list (option unset? cannot trace name)

->>> checking addresses for test3.ipv6.test.ex
+>>>  checking addresses for test3.ipv6.test.ex

 >>>   V6NET:1234:5:6:7:8:abc:d OK
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
 >>>   V6NET:1234:5:6:7:8:abc:d OK
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)

diff --git a/test/stderr/2202 b/test/stderr/2202
index 4eb705f03e1186e54812bcfdb1a98692747ad446..12b9bbf5dd163f15da7e5d1361cf4ade2d3a4a95 100644 (file)
--- a/test/stderr/2202
+++ b/test/stderr/2202
@@ -63,26 +63,27 @@ check hosts = +ignore_unknown : *.$sender_address_domain : $sender_address_domai
 host in "+ignore_unknown : *.cioce.test.again.dns : cioce.test.again.dns : "?
  list element: +ignore_unknown
  list element: *.cioce.test.again.dns
 host in "+ignore_unknown : *.cioce.test.again.dns : cioce.test.again.dns : "?
  list element: +ignore_unknown
  list element: *.cioce.test.again.dns

-sender host name required, to match against *.cioce.test.again.dns
-looking up host name for ip4.ip4.ip4.ip4
-  DNS lookup of ip4-reverse.in-addr.arpa (PTR) using fakens
-  DNS lookup of ip4-reverse.in-addr.arpa (PTR) succeeded
-IP address lookup yielded "the.local.host.name"
-  check dnssec require list
-   the.local.host.name not in empty list (option unset? cannot trace name)
-  check dnssec request list
-   the.local.host.name not in empty list (option unset? cannot trace name)
-  DNS lookup of the.local.host.name (A) using fakens
-  DNS lookup of the.local.host.name (A) succeeded
-local host found for non-MX address
-  the.local.host.name ip4.ip4.ip4.ip4 mx=-1 sort=xx 
-checking addresses for the.local.host.name
-Forward DNS security status: unverified
+ sender host name required, to match against *.cioce.test.again.dns
+  looking up host name for ip4.ip4.ip4.ip4
+   DNS lookup of ip4-reverse.in-addr.arpa (PTR) using fakens
+   DNS lookup of ip4-reverse.in-addr.arpa (PTR) succeeded
+   Reverse DNS security status: unverified
+   IP address lookup yielded "the.local.host.name"
+   check dnssec require list
+   ╎the.local.host.name not in empty list (option unset? cannot trace name)
+   check dnssec request list
+   ╎the.local.host.name not in empty list (option unset? cannot trace name)
+   DNS lookup of the.local.host.name (A) using fakens
+   DNS lookup of the.local.host.name (A) succeeded
+   local host found for non-MX address
+   the.local.host.name ip4.ip4.ip4.ip4 mx=-1 sort=xx 
+   checking addresses for the.local.host.name
+   Forward DNS security status: unverified

   ip4.ip4.ip4.ip4 OK
   ip4.ip4.ip4.ip4 OK

-sender_fullhost = the.local.host.name (test) [ip4.ip4.ip4.ip4]
-sender_rcvhost = the.local.host.name ([ip4.ip4.ip4.ip4] helo=test)
+ sender_fullhost = the.local.host.name (test) [ip4.ip4.ip4.ip4]
+ sender_rcvhost = the.local.host.name ([ip4.ip4.ip4.ip4] helo=test)

  list element: cioce.test.again.dns
  list element: cioce.test.again.dns

-using host_fake_gethostbyname for cioce.test.again.dns (IPv4)
+ using host_fake_gethostbyname for cioce.test.again.dns (IPv4)

  DNS lookup of cioce.test.again.dns (A) using fakens
  DNS lookup of cioce.test.again.dns (A) gave TRY_AGAIN
  cioce.test.again.dns in dns_again_means_nonexist?
  DNS lookup of cioce.test.again.dns (A) using fakens
  DNS lookup of cioce.test.again.dns (A) gave TRY_AGAIN
  cioce.test.again.dns in dns_again_means_nonexist?


@@ -92,8 +93,8 @@ using host_fake_gethostbyname for cioce.test.again.dns (IPv4)
  DNS: couldn't fake dnsa len
  DNS: no SOA record found for neg-TTL
   writing neg-cache entry for cioce.test.again.dns-A-xxxx, ttl -1
  DNS: couldn't fake dnsa len
  DNS: no SOA record found for neg-TTL
   writing neg-cache entry for cioce.test.again.dns-A-xxxx, ttl -1

-host_fake_gethostbyname(af=inet) returned 1 (HOST_NOT_FOUND)
-no IP address found for host cioce.test.again.dns (during SMTP connection from the.local.host.name (test) [ip4.ip4.ip4.ip4])
+ host_fake_gethostbyname(af=inet) returned 1 (HOST_NOT_FOUND)
+ no IP address found for host cioce.test.again.dns (during SMTP connection from the.local.host.name (test) [ip4.ip4.ip4.ip4])

 LOG: host_lookup_failed MAIN
   no IP address found for host cioce.test.again.dns (during SMTP connection from the.local.host.name (test) [ip4.ip4.ip4.ip4])
  failed to find IP address for cioce.test.again.dns: item ignored by +ignore_unknown
 LOG: host_lookup_failed MAIN
   no IP address found for host cioce.test.again.dns (during SMTP connection from the.local.host.name (test) [ip4.ip4.ip4.ip4])
  failed to find IP address for cioce.test.again.dns: item ignored by +ignore_unknown

diff --git a/test/stderr/5820 b/test/stderr/5820
index 583a3cddc1b17e4743dd240dcde6355cb9377a6b..f7fa10abeb3edf344154c56436f0b60b034748d9 100644 (file)
--- a/test/stderr/5820
+++ b/test/stderr/5820
@@ -24,7 +24,7 @@
 >>>   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 "*")

->>> local host found for non-MX address
+>>>  local host found for non-MX address

 >>> routed by client router
 >>> Attempting full verification using callout
 >>> callout cache: no domain record found for dane256ee.test.ex
 >>> routed by client router
 >>> Attempting full verification using callout
 >>> callout cache: no domain record found for dane256ee.test.ex

diff --git a/test/stderr/5840 b/test/stderr/5840
index e2ac7d62e18be5a72162b7e9245856241499b279..1cdc884a1422ef73d119d4d38ecdb131547cb7a9 100644 (file)
--- a/test/stderr/5840
+++ b/test/stderr/5840
@@ -24,7 +24,7 @@
 >>>   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 "*")

->>> local host found for non-MX address
+>>>  local host found for non-MX address

 >>> routed by client router
 >>> Attempting full verification using callout
 >>> callout cache: no domain record found for dane256ee.test.ex
 >>> routed by client router
 >>> Attempting full verification using callout
 >>> callout cache: no domain record found for dane256ee.test.ex