Output dnssec status in -bt/-bv mode

Currently this feature is enabled only if running_in_test_harness,
because I don't want to break anything else.

diff --git a/src/src/verify.c b/src/src/verify.c
index b77978bfcaeb57d32e3589d3ac7e2337d571841c..8a408686fbb3d9a791e8109cd760db01703a7fc1 100644 (file)
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -2364,6 +2364,12 @@ for (addr_list = addr_local, i = 0; i < 2; addr_list = addr_remote, i++)
         while (len++ < maxaddlen) fprintf(f," ");
         if (h->mx >= 0) fprintf(f, "MX=%d", h->mx);
         if (h->port != PORT_NONE) fprintf(f, " port=%d", h->port);
+        if (running_in_test_harness)
+#ifndef DISABLE_DNSSEC
+          fprintf(f, " ad=%s", h->dnssec==DS_YES ? "yes" : "no");
+#else
+          fprintf(f, " ad=no");
+#endif
         if (h->status == hstatus_unusable) fprintf(f, " ** unusable **");
         fprintf(f, "\n");
         }

diff --git a/test/stdout/0045 b/test/stdout/0045
index 5c998117d93df69e0d31c44c402a5ef9da80c359..28b0ff1308d91514ad0db2ab4301b98d46d92a9c 100644 (file)
--- a/test/stdout/0045
+++ b/test/stdout/0045
@@ -7,20 +7,20 @@ userx@mxt5.test.ex cannot be resolved at this time: lowest numbered MX record po
 userx@mxt5.test.ex cannot be resolved at this time: lowest numbered MX record points to local host
 userx@mxt6.test.ex
   router = lookuphost, transport = smtp
-  host ten-1.test.ex [V4NET.0.0.1] MX=5
+  host ten-1.test.ex [V4NET.0.0.1] MX=5 ad=no
 userx@mxt7.test.ex
   router = lookuphost, transport = smtp
-  host ten-2.test.ex [V4NET.0.0.2] MX=5
-  host ten-3.test.ex [V4NET.0.0.3] MX=6
+  host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no
+  host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no
 userx@mxt7.test.ex
   router = lookuphost, transport = smtp
-  host ten-2.test.ex [V4NET.0.0.2] MX=5
-  host ten-3.test.ex [V4NET.0.0.3] MX=6
+  host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no
+  host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no
 userx@mxt8.test.ex
   router = lookuphost, transport = smtp
-  host ten-2.test.ex [V4NET.0.0.2] MX=5
-  host ten-3.test.ex [V4NET.0.0.3] MX=6
+  host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no
+  host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no
 userx@mxt8.test.ex
   router = lookuphost, transport = smtp
-  host ten-2.test.ex [V4NET.0.0.2] MX=5
-  host ten-3.test.ex [V4NET.0.0.3] MX=6
+  host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no
+  host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no

diff --git a/test/stdout/0047 b/test/stdout/0047
index 258578d9af235bafa94e78828a8dda3d861bd873..5d5fb5431f02fbcef2b3f1d8aeffbb7df28abae7 100644 (file)
--- a/test/stdout/0047
+++ b/test/stdout/0047
@@ -1,9 +1,9 @@
 xx@domain1
   router = domainlist, transport = smtp
-  host ten-1.test.ex [V4NET.0.0.1] 
+  host ten-1.test.ex [V4NET.0.0.1]  ad=no
 xx@route1.ex
   router = domainlist, transport = smtp
-  host ten-2.test.ex [V4NET.0.0.2] 
+  host ten-2.test.ex [V4NET.0.0.2]  ad=no
 xx@domain3
   router = domainlist, transport = smtp
-  host ten-3.test.ex [V4NET.0.0.3] 
+  host ten-3.test.ex [V4NET.0.0.3]  ad=no

diff --git a/test/stdout/0054 b/test/stdout/0054
index ca26171e78ae1d2fe37897128d4042854d555dd9..e65ab29d48934eedd2ee64aba7eb0978433b3edc 100644 (file)
--- a/test/stdout/0054
+++ b/test/stdout/0054
@@ -1,4 +1,4 @@
 xxx@ten-1.test.ex
   router = lookuphost, transport = smtp
-  host ten-1.test.ex [V4NET.0.0.1] 
+  host ten-1.test.ex [V4NET.0.0.1]  ad=no
 xxx@ten-2.test.ex is undeliverable: Unrouteable address

diff --git a/test/stdout/0078 b/test/stdout/0078
index 272e0f224d3f53c41a89655bd8d8b6783c0da021..45f3678f6c7c0760da0764fc07dc44fc7269144e 100644 (file)
--- a/test/stdout/0078
+++ b/test/stdout/0078
@@ -1,10 +1,10 @@
 xx@mxt6.test.ex
   router = lookuphost, transport = remote_smtp
-  host ten-1.test.ex [V4NET.0.0.1] MX=5
+  host ten-1.test.ex [V4NET.0.0.1] MX=5 ad=no
 myhost.test.ex@mxt1.test.ex
   router = self, transport = remote_smtp
-  host myhost.test.ex [V4NET.10.10.10] 
+  host myhost.test.ex [V4NET.10.10.10]  ad=no
 xx@mxt1.test.ex
   router = self2, transport = remote_smtp
-  host myhost.test.ex [V4NET.10.10.10] 
+  host myhost.test.ex [V4NET.10.10.10]  ad=no
 xx@not.exist is undeliverable: Unrouteable address

diff --git a/test/stdout/0089 b/test/stdout/0089
index 0238dbffbcc7d8a12adff4297dee642b9babe86b..a075e1cd506b3fcd052ba87c98954ac9d0d6af55 100644 (file)
--- a/test/stdout/0089
+++ b/test/stdout/0089
@@ -36,5 +36,5 @@ ABCD@test.ex
   router = select, transport = dummy
 XYZ@ten-1.test.ex
   router = manual, transport = dummy
-  host ten-1.test.ex [V4NET.0.0.1] 
+  host ten-1.test.ex [V4NET.0.0.1]  ad=no
 xyz@ten-1.test.ex is undeliverable: unrouteable mail domain "ten-1.test.ex"

diff --git a/test/stdout/0146 b/test/stdout/0146
index 953a874427c2962434729559198b06611752c2a9..0de260b505b98374be992cb2fd6dd1f95d4229a4 100644 (file)
--- a/test/stdout/0146
+++ b/test/stdout/0146
@@ -1,3 +1,3 @@
 x@mxt10.test.ex
   router = domainlist, transport = smtp
-  host V4NET.0.0.1 [V4NET.0.0.1] MX=5
+  host V4NET.0.0.1 [V4NET.0.0.1] MX=5 ad=no

diff --git a/test/stdout/0161 b/test/stdout/0161
index 0593ee3276140ce71a5cc0c90692df3f672e38a9..a7f7eca3d20893d68bdd5835afc2155850776d30 100644 (file)
--- a/test/stdout/0161
+++ b/test/stdout/0161
@@ -1,12 +1,12 @@
 xx@mxt6.test.ex
   router = lookuphost, transport = remote_smtp
-  host ten-1.test.ex [V4NET.0.0.1] MX=5
+  host ten-1.test.ex [V4NET.0.0.1] MX=5 ad=no
 myhost.test.ex@mxt1.test.ex
   router = self, transport = remote_smtp
-  host myhost.test.ex [V4NET.10.10.10] 
+  host myhost.test.ex [V4NET.10.10.10]  ad=no
 xx@mxt1.test.ex
   router = self2, transport = remote_smtp
-  host myhost.test.ex [V4NET.10.10.10] 
+  host myhost.test.ex [V4NET.10.10.10]  ad=no
 xx@not.exist is undeliverable: Unrouteable address
 ff@mxt1.test.ex is undeliverable: lowest numbered MX record points to local host
 fff@mxt1.test.ex is undeliverable: lookup of host "fff" failed in fail router

diff --git a/test/stdout/0183 b/test/stdout/0183
index 2737f093836f253f06cd4b570a7df516a7490bf9..888e7a3c1946964e16c712351386eb8fa1b2608d 100644 (file)
--- a/test/stdout/0183
+++ b/test/stdout/0183
@@ -2,31 +2,31 @@ userx@test.again.dns cannot be resolved at this time: host lookup did not comple
 abcd@test.again.dns cannot be resolved at this time: host lookup did not complete
 abcd@ten-1.test.ex
   router = lookuphost, transport = smtp
-  host ten-1.test.ex [V4NET.0.0.1] 
+  host ten-1.test.ex [V4NET.0.0.1]  ad=no
 usery@test.again.dns cannot be resolved at this time: host lookup for test.again.dns did not complete (DNS timeout?)
 userz@test.again.dns cannot be resolved at this time: host lookup for test.again.dns did not complete (DNS timeout?)
 xyz@ten-1.test.ex
   router = lookuphost, transport = smtp
-  host ten-1.test.ex [V4NET.0.0.1] 
+  host ten-1.test.ex [V4NET.0.0.1]  ad=no
 userx@test.fail.dns cannot be resolved at this time: host lookup did not complete
 abcd@test.fail.dns cannot be resolved at this time: host lookup did not complete
 abcd@ten-1.test.ex
   router = lookuphost, transport = smtp
-  host ten-1.test.ex [V4NET.0.0.1] 
+  host ten-1.test.ex [V4NET.0.0.1]  ad=no
 usery@test.fail.dns cannot be resolved at this time: host lookup for test.fail.dns did not complete (DNS timeout?)
 userz@test.fail.dns cannot be resolved at this time: host lookup for test.fail.dns did not complete (DNS timeout?)
 xyz@ten-1.test.ex
   router = lookuphost, transport = smtp
-  host ten-1.test.ex [V4NET.0.0.1] 
+  host ten-1.test.ex [V4NET.0.0.1]  ad=no
 userx@nonexist.test.ex is undeliverable: Unrouteable address
 abcd@nonexist.test.ex is undeliverable: Unrouteable address
 abcd@ten-1.test.ex
   router = lookuphost, transport = smtp
-  host ten-1.test.ex [V4NET.0.0.1] 
+  host ten-1.test.ex [V4NET.0.0.1]  ad=no
 usery@nonexist.test.ex cannot be resolved at this time: lookup of host "nonexist.test.ex" failed in useryz router
 userz@nonexist.test.ex cannot be resolved at this time: lookup of host "nonexist.test.ex" failed in useryz router
 xyz@ten-1.test.ex
   router = lookuphost, transport = smtp
-  host ten-1.test.ex [V4NET.0.0.1] 
+  host ten-1.test.ex [V4NET.0.0.1]  ad=no
 srv@test.again.dns cannot be resolved at this time: host lookup did not complete
 srv@test.fail.dns cannot be resolved at this time: host lookup did not complete

diff --git a/test/stdout/0186 b/test/stdout/0186
index 3653da9b7e4513aa70780717970c5d695a85cf3d..bfe0227cca9f1b90b6c8d19638364a37db096298 100644 (file)
--- a/test/stdout/0186
+++ b/test/stdout/0186
@@ -1,6 +1,6 @@
 userx@other2.test.ex
   router = lookuphost, transport = smtp
-  host other2.test.ex [V4NET.12.3.1] 
+  host other2.test.ex [V4NET.12.3.1]  ad=no
 userx@ten-5-6.test.ex
   router = domainlist, transport = smtp
-  host ten-5-6.test.ex [V4NET.0.0.5] 
+  host ten-5-6.test.ex [V4NET.0.0.5]  ad=no

diff --git a/test/stdout/0187 b/test/stdout/0187
index cef8628c964e4828d11b8c97f7892646f8fdd65a..be62b6e4494551b41589bdd0d54c90ca5805209d 100644 (file)
--- a/test/stdout/0187
+++ b/test/stdout/0187
@@ -1,18 +1,18 @@
 userx@other2.test.ex
   router = lookuphost2, transport = smtp
-  host other2.test.ex [V4NET.12.3.1] 
+  host other2.test.ex [V4NET.12.3.1]  ad=no
 userx@ten-5-6.test.ex
   router = domainlist, transport = smtp
-  host ten-5-6.test.ex [V4NET.0.0.5] 
+  host ten-5-6.test.ex [V4NET.0.0.5]  ad=no
 userx@mxt7.test.ex
   router = lookuphost, transport = smtp
-  host ten-3.test.ex [V4NET.0.0.3] MX=6
+  host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no
 userx@mxt9.test.ex
   router = lookuphost, transport = smtp
-  host ten-3.test.ex [V4NET.0.0.3] MX=7
+  host ten-3.test.ex [V4NET.0.0.3] MX=7 ad=no
 userx@eximtesthost.test.ex
   router = lookuphost2, transport = smtp
-  host eximtesthost.test.ex [ip4.ip4.ip4.ip4] 
+  host eximtesthost.test.ex [ip4.ip4.ip4.ip4]  ad=no
 userx@localhost is undeliverable: Unrouteable address
 userx@mxt10.test.ex is undeliverable: all relevant MX records point to non-existent hosts
 userx@mxt11.test.ex is undeliverable: all relevant MX records point to non-existent hosts

diff --git a/test/stdout/0190 b/test/stdout/0190
index 4ca02adc5ec0ce6d6ba4071983f01fe2503d5d2b..351d707228129905c2adf1a00199dd6bbf386002 100644 (file)
--- a/test/stdout/0190
+++ b/test/stdout/0190
@@ -1,114 +1,114 @@
 x@x
   router = others, transport = smtp2
-  host V4NET.0.0.3 [V4NET.0.0.3] 
-  host V4NET.0.0.2 [V4NET.0.0.2] 
-  host V4NET.0.0.1 [V4NET.0.0.1] 
+  host V4NET.0.0.3 [V4NET.0.0.3]  ad=no
+  host V4NET.0.0.2 [V4NET.0.0.2]  ad=no
+  host V4NET.0.0.1 [V4NET.0.0.1]  ad=no
 x@y
   router = others, transport = smtp2
-  host V4NET.0.0.1 [V4NET.0.0.1] 
-  host V4NET.0.0.2 [V4NET.0.0.2] 
-  host V4NET.0.0.3 [V4NET.0.0.3] 
+  host V4NET.0.0.1 [V4NET.0.0.1]  ad=no
+  host V4NET.0.0.2 [V4NET.0.0.2]  ad=no
+  host V4NET.0.0.3 [V4NET.0.0.3]  ad=no
 x@z
   router = others, transport = smtp2
-  host V4NET.0.0.3 [V4NET.0.0.3] 
-  host V4NET.0.0.2 [V4NET.0.0.2] 
-  host V4NET.0.0.1 [V4NET.0.0.1] 
+  host V4NET.0.0.3 [V4NET.0.0.3]  ad=no
+  host V4NET.0.0.2 [V4NET.0.0.2]  ad=no
+  host V4NET.0.0.1 [V4NET.0.0.1]  ad=no
 x@batch
   router = batched, transport = smtp2
-  host V4NET.0.0.3 [V4NET.0.0.3] 
-  host V4NET.0.0.2 [V4NET.0.0.2] 
-  host V4NET.0.0.1 [V4NET.0.0.1] 
-  host V4NET.0.0.4 [V4NET.0.0.4] 
-  host V4NET.0.0.5 [V4NET.0.0.5] 
-  host V4NET.0.0.6 [V4NET.0.0.6] 
-  host V4NET.0.0.7 [V4NET.0.0.7] 
+  host V4NET.0.0.3 [V4NET.0.0.3]  ad=no
+  host V4NET.0.0.2 [V4NET.0.0.2]  ad=no
+  host V4NET.0.0.1 [V4NET.0.0.1]  ad=no
+  host V4NET.0.0.4 [V4NET.0.0.4]  ad=no
+  host V4NET.0.0.5 [V4NET.0.0.5]  ad=no
+  host V4NET.0.0.6 [V4NET.0.0.6]  ad=no
+  host V4NET.0.0.7 [V4NET.0.0.7]  ad=no
 y@batch
   router = batched, transport = smtp2
-  host V4NET.0.0.2 [V4NET.0.0.2] 
-  host V4NET.0.0.1 [V4NET.0.0.1] 
-  host V4NET.0.0.3 [V4NET.0.0.3] 
-  host V4NET.0.0.6 [V4NET.0.0.6] 
-  host V4NET.0.0.4 [V4NET.0.0.4] 
-  host V4NET.0.0.5 [V4NET.0.0.5] 
-  host V4NET.0.0.7 [V4NET.0.0.7] 
+  host V4NET.0.0.2 [V4NET.0.0.2]  ad=no
+  host V4NET.0.0.1 [V4NET.0.0.1]  ad=no
+  host V4NET.0.0.3 [V4NET.0.0.3]  ad=no
+  host V4NET.0.0.6 [V4NET.0.0.6]  ad=no
+  host V4NET.0.0.4 [V4NET.0.0.4]  ad=no
+  host V4NET.0.0.5 [V4NET.0.0.5]  ad=no
+  host V4NET.0.0.7 [V4NET.0.0.7]  ad=no
 z@batch
   router = batched, transport = smtp2
-  host V4NET.0.0.1 [V4NET.0.0.1] 
-  host V4NET.0.0.3 [V4NET.0.0.3] 
-  host V4NET.0.0.2 [V4NET.0.0.2] 
-  host V4NET.0.0.5 [V4NET.0.0.5] 
-  host V4NET.0.0.4 [V4NET.0.0.4] 
-  host V4NET.0.0.6 [V4NET.0.0.6] 
-  host V4NET.0.0.7 [V4NET.0.0.7] 
+  host V4NET.0.0.1 [V4NET.0.0.1]  ad=no
+  host V4NET.0.0.3 [V4NET.0.0.3]  ad=no
+  host V4NET.0.0.2 [V4NET.0.0.2]  ad=no
+  host V4NET.0.0.5 [V4NET.0.0.5]  ad=no
+  host V4NET.0.0.4 [V4NET.0.0.4]  ad=no
+  host V4NET.0.0.6 [V4NET.0.0.6]  ad=no
+  host V4NET.0.0.7 [V4NET.0.0.7]  ad=no
 x@batch2
   router = batched, transport = smtp2
-  host V4NET.0.0.1 [V4NET.0.0.1] 
-  host V4NET.0.0.2 [V4NET.0.0.2] 
-  host V4NET.0.0.3 [V4NET.0.0.3] 
-  host V4NET.0.0.4 [V4NET.0.0.4] 
-  host V4NET.0.0.5 [V4NET.0.0.5] 
-  host V4NET.0.0.6 [V4NET.0.0.6] 
-  host V4NET.0.0.7 [V4NET.0.0.7] 
+  host V4NET.0.0.1 [V4NET.0.0.1]  ad=no
+  host V4NET.0.0.2 [V4NET.0.0.2]  ad=no
+  host V4NET.0.0.3 [V4NET.0.0.3]  ad=no
+  host V4NET.0.0.4 [V4NET.0.0.4]  ad=no
+  host V4NET.0.0.5 [V4NET.0.0.5]  ad=no
+  host V4NET.0.0.6 [V4NET.0.0.6]  ad=no
+  host V4NET.0.0.7 [V4NET.0.0.7]  ad=no
 y@batch2
   router = batched, transport = smtp2
-  host V4NET.0.0.1 [V4NET.0.0.1] 
-  host V4NET.0.0.2 [V4NET.0.0.2] 
-  host V4NET.0.0.3 [V4NET.0.0.3] 
-  host V4NET.0.0.4 [V4NET.0.0.4] 
-  host V4NET.0.0.5 [V4NET.0.0.5] 
-  host V4NET.0.0.6 [V4NET.0.0.6] 
-  host V4NET.0.0.7 [V4NET.0.0.7] 
+  host V4NET.0.0.1 [V4NET.0.0.1]  ad=no
+  host V4NET.0.0.2 [V4NET.0.0.2]  ad=no
+  host V4NET.0.0.3 [V4NET.0.0.3]  ad=no
+  host V4NET.0.0.4 [V4NET.0.0.4]  ad=no
+  host V4NET.0.0.5 [V4NET.0.0.5]  ad=no
+  host V4NET.0.0.6 [V4NET.0.0.6]  ad=no
+  host V4NET.0.0.7 [V4NET.0.0.7]  ad=no
 x@batch3
   router = batched2, transport = smtp2
-  host V4NET.0.0.1 [V4NET.0.0.1] 
-  host V4NET.0.0.2 [V4NET.0.0.2] 
-  host V4NET.0.0.3 [V4NET.0.0.3] 
-  host V4NET.0.0.4 [V4NET.0.0.4] 
-  host V4NET.0.0.5 [V4NET.0.0.5] 
-  host V4NET.0.0.6 [V4NET.0.0.6] 
-  host V4NET.0.0.7 [V4NET.0.0.7] 
+  host V4NET.0.0.1 [V4NET.0.0.1]  ad=no
+  host V4NET.0.0.2 [V4NET.0.0.2]  ad=no
+  host V4NET.0.0.3 [V4NET.0.0.3]  ad=no
+  host V4NET.0.0.4 [V4NET.0.0.4]  ad=no
+  host V4NET.0.0.5 [V4NET.0.0.5]  ad=no
+  host V4NET.0.0.6 [V4NET.0.0.6]  ad=no
+  host V4NET.0.0.7 [V4NET.0.0.7]  ad=no
 y@batch3
   router = batched2, transport = smtp2
-  host V4NET.0.0.1 [V4NET.0.0.1] 
-  host V4NET.0.0.2 [V4NET.0.0.2] 
-  host V4NET.0.0.3 [V4NET.0.0.3] 
-  host V4NET.0.0.4 [V4NET.0.0.4] 
-  host V4NET.0.0.5 [V4NET.0.0.5] 
-  host V4NET.0.0.6 [V4NET.0.0.6] 
-  host V4NET.0.0.7 [V4NET.0.0.7] 
+  host V4NET.0.0.1 [V4NET.0.0.1]  ad=no
+  host V4NET.0.0.2 [V4NET.0.0.2]  ad=no
+  host V4NET.0.0.3 [V4NET.0.0.3]  ad=no
+  host V4NET.0.0.4 [V4NET.0.0.4]  ad=no
+  host V4NET.0.0.5 [V4NET.0.0.5]  ad=no
+  host V4NET.0.0.6 [V4NET.0.0.6]  ad=no
+  host V4NET.0.0.7 [V4NET.0.0.7]  ad=no
 x@batch4
   router = batched2, transport = smtp2
-  host V4NET.0.0.1 [V4NET.0.0.1] 
-  host V4NET.0.0.2 [V4NET.0.0.2] 
-  host V4NET.0.0.3 [V4NET.0.0.3] 
-  host V4NET.0.0.5 [V4NET.0.0.5] 
-  host V4NET.0.0.4 [V4NET.0.0.4] 
-  host V4NET.0.0.6 [V4NET.0.0.6] 
-  host V4NET.0.0.7 [V4NET.0.0.7] 
+  host V4NET.0.0.1 [V4NET.0.0.1]  ad=no
+  host V4NET.0.0.2 [V4NET.0.0.2]  ad=no
+  host V4NET.0.0.3 [V4NET.0.0.3]  ad=no
+  host V4NET.0.0.5 [V4NET.0.0.5]  ad=no
+  host V4NET.0.0.4 [V4NET.0.0.4]  ad=no
+  host V4NET.0.0.6 [V4NET.0.0.6]  ad=no
+  host V4NET.0.0.7 [V4NET.0.0.7]  ad=no
 y@batch4
   router = batched2, transport = smtp2
-  host V4NET.0.0.2 [V4NET.0.0.2] 
-  host V4NET.0.0.1 [V4NET.0.0.1] 
-  host V4NET.0.0.3 [V4NET.0.0.3] 
-  host V4NET.0.0.5 [V4NET.0.0.5] 
-  host V4NET.0.0.6 [V4NET.0.0.6] 
-  host V4NET.0.0.4 [V4NET.0.0.4] 
-  host V4NET.0.0.7 [V4NET.0.0.7] 
+  host V4NET.0.0.2 [V4NET.0.0.2]  ad=no
+  host V4NET.0.0.1 [V4NET.0.0.1]  ad=no
+  host V4NET.0.0.3 [V4NET.0.0.3]  ad=no
+  host V4NET.0.0.5 [V4NET.0.0.5]  ad=no
+  host V4NET.0.0.6 [V4NET.0.0.6]  ad=no
+  host V4NET.0.0.4 [V4NET.0.0.4]  ad=no
+  host V4NET.0.0.7 [V4NET.0.0.7]  ad=no
 userx@bdomain1
   router = r3, transport = smtp2
-  host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] 
-  host 127.0.0.1 [127.0.0.1] 
-  host the.local.host.name [ip4.ip4.ip4.ip4] 
+  host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]  ad=no
+  host 127.0.0.1 [127.0.0.1]     ad=no
+  host the.local.host.name [ip4.ip4.ip4.ip4]  ad=no
 userx@bdomain2
   router = r3, transport = smtp2
-  host the.local.host.name [ip4.ip4.ip4.ip4] 
-  host 127.0.0.1 [127.0.0.1] 
-  host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] 
+  host the.local.host.name [ip4.ip4.ip4.ip4]  ad=no
+  host 127.0.0.1 [127.0.0.1]     ad=no
+  host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]  ad=no
 userx@bdomain3
   router = r3, transport = smtp2
-  host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] 
-  host 127.0.0.1 [127.0.0.1] 
-  host the.local.host.name [ip4.ip4.ip4.ip4] 
+  host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]  ad=no
+  host 127.0.0.1 [127.0.0.1]     ad=no
+  host the.local.host.name [ip4.ip4.ip4.ip4]  ad=no
 
 ******** SERVER ********
 Listening on port 1224 ... 

diff --git a/test/stdout/0239 b/test/stdout/0239
index 29766a24a8f88caac4181d43001567ef07b56e6c..64edde126433dbc28404a824e8cb3d670f131ced 100644 (file)
--- a/test/stdout/0239
+++ b/test/stdout/0239
@@ -1,13 +1,13 @@
 userx@localhost
   router = rrr, transport = local
-  host a.host.name           
+  host a.host.name ad=no
 userx@localhost verified
 userx@localhost
   router = rrr, transport = local
-  host a.host.name           
+  host a.host.name ad=no
 userx@localhost
   router = rrr, transport = local
-  host a.host.name           
+  host a.host.name ad=no
 userx@smtp
   router = sss, transport = smtp
-  host 127.0.0.1 [127.0.0.1] 
+  host 127.0.0.1 [127.0.0.1]  ad=no

diff --git a/test/stdout/0323 b/test/stdout/0323
index 136a4d85e4c4db53a41fed28698faa9d039682fa..7af74b06d2364a8dd16607f028dd8dbd2d60f88e 100644 (file)
--- a/test/stdout/0323
+++ b/test/stdout/0323
@@ -1,3 +1,3 @@
 x@y
   router = r1, transport = t1
-  host quoted.y           
+  host quoted.y ad=no

diff --git a/test/stdout/0344 b/test/stdout/0344
index 2452f76920fe9a7f79a5a530bc5b16460df5b4f6..7d49c555c3039b3390c28af6151f4ac7554779c0 100644 (file)
--- a/test/stdout/0344
+++ b/test/stdout/0344
@@ -1,12 +1,12 @@
 x@d1
   router = r1, transport = t1
-  host 192.168.4.3 [192.168.4.3] 
+  host 192.168.4.3 [192.168.4.3]  ad=no
 x@d2
   router = r2, transport = t2
-  host V4NET.9.8.7 [V4NET.9.8.7] 
+  host V4NET.9.8.7 [V4NET.9.8.7]  ad=no
 x@d30
   router = r3, transport = t4
-  host 1.2.3.4 [1.2.3.4] 
+  host 1.2.3.4 [1.2.3.4]  ad=no
 x@d31
   router = r3, transport = t3
-  host 1.2.3.4 [1.2.3.4] 
+  host 1.2.3.4 [1.2.3.4]  ad=no

diff --git a/test/stdout/0350 b/test/stdout/0350
index 71109bd860a4c9f3030beb9e63440597df7da117..8631b6f2b1f1ed0d3b9d966c28fee09798e1a778 100644 (file)
--- a/test/stdout/0350
+++ b/test/stdout/0350
@@ -1,4 +1,4 @@
 xx@yy
   router = r1, transport = t1
-  host 1.2.3.4 [1.2.3.4] 
-  host other2.test.ex [V4NET.12.3.2] 
+  host 1.2.3.4 [1.2.3.4]     ad=no
+  host other2.test.ex [V4NET.12.3.2]  ad=no

diff --git a/test/stdout/0364 b/test/stdout/0364
index 7990d897c76ff92d89ae7c8ee854f50faabf9753..4b3ad2308ff50a242cd474c0f55946e24830097a 100644 (file)
--- a/test/stdout/0364
+++ b/test/stdout/0364
@@ -7,9 +7,9 @@ solik@otherhost.sub.test.ex is undeliverable: Can't route to otherhost.sub.test.
 xxx@ten-1.test.ex
     <-- xxx@ten-1
   router = r2, transport = t1
-  host ten-1.test.ex [V4NET.0.0.1] 
+  host ten-1.test.ex [V4NET.0.0.1]  ad=no
 xxx@testsub.sub.test.ex
     <-- xxx@testsub.test.ex
     <-- xxx@testsub
   router = r2, transport = t1
-  host testsub.sub.test.ex [V4NET.99.0.3] 
+  host testsub.sub.test.ex [V4NET.99.0.3]  ad=no

diff --git a/test/stdout/0368 b/test/stdout/0368
index cfd96796ecb893613084b1b5281d3ab9f2242350..7302d740bef1dba83ee97e69662af2588eff30a9 100644 (file)
--- a/test/stdout/0368
+++ b/test/stdout/0368
@@ -1,14 +1,14 @@
 x@mxt9.test.ex
   router = r2, transport = t1
-  host ten-1.test.ex [V4NET.0.0.1] MX=5
-  host ten-2.test.ex [V4NET.0.0.2] MX=6
-  host ten-3.test.ex [V4NET.0.0.3] MX=7
+  host ten-1.test.ex [V4NET.0.0.1] MX=5 ad=no
+  host ten-2.test.ex [V4NET.0.0.2] MX=6 ad=no
+  host ten-3.test.ex [V4NET.0.0.3] MX=7 ad=no
 x@mxt14.test.ex
   router = r2, transport = t1
-  host ten-5-6.test.ex [V4NET.0.0.5] MX=4
-  host ten-5-6.test.ex [V4NET.0.0.6] MX=4
+  host ten-5-6.test.ex [V4NET.0.0.5] MX=4 ad=no
+  host ten-5-6.test.ex [V4NET.0.0.6] MX=4 ad=no
 x@manualroute
   router = r1, transport = t1
-  host ten-1.test.ex [V4NET.0.0.1] 
-  host ten-1.test.ex [V4NET.0.0.1] 
-  host ten-2.test.ex [V4NET.0.0.2] 
+  host ten-1.test.ex [V4NET.0.0.1]  ad=no
+  host ten-1.test.ex [V4NET.0.0.1]  ad=no
+  host ten-2.test.ex [V4NET.0.0.2]  ad=no

diff --git a/test/stdout/0405 b/test/stdout/0405
index 8a0641056b5c2d8f88feef84058b70af292b1ed3..620638bbb2db9857f17457b977e5e32b034c1728 100644 (file)
--- a/test/stdout/0405
+++ b/test/stdout/0405
@@ -1,4 +1,4 @@
 syntax error: domain missing or malformed
 bounce@π.test.ex
   router = r1, transport = t1
-  host mx.xn--1xa.test.ex [V4NET.255.255.255] MX=0
+  host mx.xn--1xa.test.ex [V4NET.255.255.255] MX=0 ad=no

diff --git a/test/stdout/0419 b/test/stdout/0419
index 0d7d734d1b9be41024799ce00a70ebdc6008c0b7..e56240329e5b5ca45d14f1089ffa2db7e7f18fcf 100644 (file)
--- a/test/stdout/0419
+++ b/test/stdout/0419
@@ -1,3 +1,3 @@
 k@mxt13.test.ex
   router = dnslookup, transport = smtp
-  host other1.test.ex [V4NET.12.4.5] MX=4
+  host other1.test.ex [V4NET.12.4.5] MX=4 ad=no

diff --git a/test/stdout/0430 b/test/stdout/0430
index de305666474e46f8618cc2d56a5d05db83e979e4..75887bedc0e44adb45cdf89ebf16d37e6b657999 100644 (file)
--- a/test/stdout/0430
+++ b/test/stdout/0430
@@ -1,61 +1,61 @@
 x@manual.route
   router = r1, transport = t1
-  host ten-1.test.ex [V4NET.0.0.1] 
-  host ten-2.test.ex [V4NET.0.0.2] MX=5
-  host ten-3.test.ex [V4NET.0.0.3] MX=6
+  host ten-1.test.ex [V4NET.0.0.1]  ad=no
+  host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no
+  host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no
 x@manual.route
   router = r1, transport = t1
-  host ten-1.test.ex [V4NET.0.0.1] 
-  host ten-2.test.ex [V4NET.0.0.2] MX=5
-  host ten-3.test.ex [V4NET.0.0.3] MX=6
-  host ten-6.test.ex [V4NET.0.0.6] 
+  host ten-1.test.ex [V4NET.0.0.1]  ad=no
+  host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no
+  host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no
+  host ten-6.test.ex [V4NET.0.0.6]  ad=no
 x@manual.route
   router = r1, transport = t1
-  host ten-2.test.ex [V4NET.0.0.2] MX=5
-  host ten-3.test.ex [V4NET.0.0.3] MX=6
-  host ten-6.test.ex [V4NET.0.0.6] 
+  host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no
+  host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no
+  host ten-6.test.ex [V4NET.0.0.6]  ad=no
 x@random.manual.route
   router = r2, transport = t1
-  host ten-2.test.ex [V4NET.0.0.2] MX=5
-  host ten-3.test.ex [V4NET.0.0.3] MX=6
+  host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no
+  host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no
 x@random.manual.route
   router = r2, transport = t1
-  host ten-2.test.ex [V4NET.0.0.2] MX=5
-  host ten-3.test.ex [V4NET.0.0.3] MX=6
-  host ten-1.test.ex [V4NET.0.0.1] 
+  host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no
+  host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no
+  host ten-1.test.ex [V4NET.0.0.1]  ad=no
 x@random.manual.route
   router = r2, transport = t1
-  host ten-6.test.ex [V4NET.0.0.6] 
-  host ten-2.test.ex [V4NET.0.0.2] MX=5
-  host ten-3.test.ex [V4NET.0.0.3] MX=6
-  host ten-1.test.ex [V4NET.0.0.1] 
+  host ten-6.test.ex [V4NET.0.0.6]  ad=no
+  host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no
+  host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no
+  host ten-1.test.ex [V4NET.0.0.1]  ad=no
 y@random.manual.route
   router = r2, transport = t1
-  host ten-2.test.ex [V4NET.0.0.2] MX=5
-  host ten-3.test.ex [V4NET.0.0.3] MX=6
-  host ten-6.test.ex [V4NET.0.0.6] 
-  host ten-1.test.ex [V4NET.0.0.1] 
+  host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no
+  host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no
+  host ten-6.test.ex [V4NET.0.0.6]  ad=no
+  host ten-1.test.ex [V4NET.0.0.1]  ad=no
 x@random.manual.route
   router = r2, transport = t1
-  host ten-6.test.ex [V4NET.0.0.6] 
-  host ten-2.test.ex [V4NET.0.0.2] MX=5
-  host ten-3.test.ex [V4NET.0.0.3] MX=6
+  host ten-6.test.ex [V4NET.0.0.6]  ad=no
+  host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no
+  host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no
 x@manual.route
   router = r1, transport = t1
-  host ten-1.test.ex [V4NET.0.0.1] 
+  host ten-1.test.ex [V4NET.0.0.1]  ad=no
 x@manual.route cannot be resolved at this time: lowest numbered MX record points to local host
 x@manual.route
   router = r1, transport = t1
-  host ten-1.test.ex [V4NET.0.0.1] MX=5
-  host eximtesthost.test.ex [ip4.ip4.ip4.ip4] MX=5
-  host ten-6.test.ex [V4NET.0.0.6] 
+  host ten-1.test.ex [V4NET.0.0.1] MX=5 ad=no
+  host eximtesthost.test.ex [ip4.ip4.ip4.ip4] MX=5 ad=no
+  host ten-6.test.ex [V4NET.0.0.6]     ad=no
 x@manual.route is undeliverable: lowest numbered MX record points to local host
 x@random.manual.route cannot be resolved at this time: lookup of host "localhost.test.ex" failed in r2 router
 x@random.manual.route
   router = r2, transport = t1
-  host ten-6.test.ex [V4NET.0.0.6] 
-  host ten-1.test.ex [V4NET.0.0.1] MX=6
+  host ten-6.test.ex [V4NET.0.0.6]  ad=no
+  host ten-1.test.ex [V4NET.0.0.1] MX=6 ad=no
 x@manual.route
   router = r1, transport = t1
-  host ten-1.test.ex [V4NET.0.0.1] MX=10
-  host ten-2.test.ex [V4NET.0.0.2] MX=20
+  host ten-1.test.ex [V4NET.0.0.1] MX=10 ad=no
+  host ten-2.test.ex [V4NET.0.0.2] MX=20 ad=no

diff --git a/test/stdout/0434 b/test/stdout/0434
index c438f0e2b5b6f47bab3d854ee8bdcc12fd67c695..ed4e976ecfabdad506f03fb26025137f827b7ce8 100644 (file)
--- a/test/stdout/0434
+++ b/test/stdout/0434
@@ -1,4 +1,4 @@
 a@b
   router = r1, transport = t1
-  host 1.2.3.4 [1.2.3.4] 
+  host 1.2.3.4 [1.2.3.4]  ad=no
 a@b cannot be resolved at this time: remote host address is the local host

diff --git a/test/stdout/0463 b/test/stdout/0463
index 1bd1f1fa3ba4e0387f5ea7e420d029e9008ae683..27d6cfe3120b7639438a5c4008455c329977a3b1 100644 (file)
--- a/test/stdout/0463
+++ b/test/stdout/0463
@@ -1,4 +1,4 @@
 x@ten-1.test.ex
     <-- x@ten-1
   router = all, transport = smtp
-  host ten-1.test.ex [V4NET.0.0.1] 
+  host ten-1.test.ex [V4NET.0.0.1]  ad=no

diff --git a/test/stdout/0466 b/test/stdout/0466
index 517f664e45059beef0961afc28fe6603be49647a..71fd0dada3be7577e1dff2705b0666332755e860 100644 (file)
--- a/test/stdout/0466
+++ b/test/stdout/0466
@@ -1,3 +1,3 @@
 x@y
   router = r1, transport = t1
-  host 127.0.0.1 [127.0.0.1] 
+  host 127.0.0.1 [127.0.0.1]  ad=no

diff --git a/test/stdout/0467 b/test/stdout/0467
index 553dda850a64d286c90bbe4f3900c7bafe5e085e..140020f3c39e7aaa2e7393704a3b2313780dbeee 100644 (file)
--- a/test/stdout/0467
+++ b/test/stdout/0467
@@ -1,21 +1,21 @@
 x@nosrv.test.ex is undeliverable: Unrouteable address
 x@srv01.test.ex
   router = r1, transport = t1
-  host ten-1.test.ex [V4NET.0.0.1] MX=0 port=25
+  host ten-1.test.ex [V4NET.0.0.1] MX=0 port=25 ad=no
 x@mx246.test.ex
   router = r1, transport = t1
-  host ten-1.test.ex [V4NET.0.0.1] MX=10
-  host v6.test.ex [unknown] MX=10 ** unusable **
+  host ten-1.test.ex [V4NET.0.0.1] MX=10 ad=no
+  host v6.test.ex [unknown] MX=10 ad=no ** unusable **
 x@srv02.test.ex
   router = r1, transport = t1
-  host ten-1.test.ex [V4NET.0.0.1] MX=1 port=99
-  host ten-2.test.ex [V4NET.0.0.2] MX=1 port=99
-  host ten-3.test.ex [V4NET.0.0.3] MX=3 port=66
+  host ten-1.test.ex [V4NET.0.0.1] MX=1 port=99 ad=no
+  host ten-2.test.ex [V4NET.0.0.2] MX=1 port=99 ad=no
+  host ten-3.test.ex [V4NET.0.0.3] MX=3 port=66 ad=no
 x@nosmtp.test.ex is undeliverable: an MX or SRV record indicated no SMTP service
 x@srv03.test.ex is undeliverable: Unrouteable address
 x@srv03.test.ex
   router = r1, transport = t1
-  host ten-4.test.ex [V4NET.0.0.4] MX=0 port=88
+  host ten-4.test.ex [V4NET.0.0.4] MX=0 port=88 ad=no
 
 ******** SERVER ********
 Listening on port 1224 ... 

diff --git a/test/stdout/0528 b/test/stdout/0528
index 71aa0173b2f79f76cad320387282034da5ff7a59..578e4fefe4abfbdb134a86f008e5d97c30829e15 100644 (file)
--- a/test/stdout/0528
+++ b/test/stdout/0528
@@ -1,7 +1,7 @@
 x@y
   router = r1, transport = t1
-  host host 127.0.0.1 [127.0.0.1] port=1225
-  host host 127.0.0.1 [127.0.0.1] port=1226
-  host host 127.0.0.1 [127.0.0.1] port=1227
-  host host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] port=1228
-  host host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] port=1223
+  host host 127.0.0.1 [127.0.0.1] port=1225 ad=no
+  host host 127.0.0.1 [127.0.0.1] port=1226 ad=no
+  host host 127.0.0.1 [127.0.0.1] port=1227 ad=no
+  host host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] port=1228 ad=no
+  host host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] port=1223 ad=no

diff --git a/test/stdout/0545 b/test/stdout/0545
index 1495ed9e642f274d179677a8a0c8ba6c711ae077..9936abc5e54e2b6961a534d71d8f2cb676440066 100644 (file)
--- a/test/stdout/0545
+++ b/test/stdout/0545
@@ -1,7 +1,7 @@
 userx@alias-eximtesthost.test.ex
     <-- userx@alias-eximtesthost
   router = dns, transport = smtp
-  host eximtesthost.test.ex [ip4.ip4.ip4.ip4] 
+  host eximtesthost.test.ex [ip4.ip4.ip4.ip4]  ad=no
 userx@alias-eximtesthost.test.ex
   router = dns, transport = smtp
-  host eximtesthost.test.ex [ip4.ip4.ip4.ip4] 
+  host eximtesthost.test.ex [ip4.ip4.ip4.ip4]  ad=no

diff --git a/test/stdout/0557 b/test/stdout/0557
index 5077c0d0aaa32f91637278c3f0f5ac4cbe86c910..cd31b5c02968405077e242a384d4a46c1aeab969 100644 (file)
--- a/test/stdout/0557
+++ b/test/stdout/0557
@@ -3,11 +3,11 @@ userx@test.ex cannot be resolved at this time: lookup failed for all hosts in r1
 userx@test.ex cannot be resolved at this time: lookup failed for all hosts in r1 router: host_find_failed=ignore host_all_ignored=defer
 userx@test.ex
   router = r1, transport = t1
-  host 127.0.0.1 [127.0.0.1] 
+  host 127.0.0.1 [127.0.0.1]  ad=no
 userx@test.ex
   router = r1, transport = t1
-  host 127.0.0.1 [127.0.0.1] 
-  host 127.0.0.2 [127.0.0.2] 
+  host 127.0.0.1 [127.0.0.1]  ad=no
+  host 127.0.0.2 [127.0.0.2]  ad=no
 userx@test.ex cannot be resolved at this time: lookup failed for all hosts in r1 router: host_find_failed=ignore host_all_ignored=defer
 userx@test.ex is undeliverable: Unrouteable address
 userx@test.ex is undeliverable: lookup failed for all hosts in r1 router: host_find_failed=ignore host_all_ignored=fail

diff --git a/test/stdout/5204 b/test/stdout/5204
index 5d438bb355784084ab9f9e5015ed7331e04ff7bf..7c61dad63f57716c17d1e27636b864acefd69382 100644 (file)
--- a/test/stdout/5204
+++ b/test/stdout/5204
@@ -5,10 +5,10 @@
 "DEFER cannot route this one (DEFER)"@some.host cannot be resolved at this time: cannot route this one (DEFER)
 "ACCEPT transport = other_smtp hosts=ten-1.test.ex"@some.host
   router = q, transport = other_smtp
-  host ten-1.test.ex [V4NET.0.0.1] 
+  host ten-1.test.ex [V4NET.0.0.1]  ad=no
 PASS@some.host
   router = s, transport = smtp
-  host 127.0.0.1 [127.0.0.1] 
+  host 127.0.0.1 [127.0.0.1]  ad=no
 "FREEZE cannot route this one (FREEZE)"@some.host cannot be resolved at this time: cannot route this one (FREEZE)
 postmaster@test.ex
     <-- "REDIRECT postmaster@test.ex"@some.host

diff --git a/test/stdout/5208 b/test/stdout/5208
index 493025abad14e14377373a87cb3d2559f43b6766..c1297cd273a486886b2e02e9f846a4ada0720aec 100644 (file)
--- a/test/stdout/5208
+++ b/test/stdout/5208
@@ -1,4 +1,4 @@
 x@query.program
   router = r1, transport = t1
-  host ten-2.test.ex [V4NET.0.0.2] MX=5
-  host ten-3.test.ex [V4NET.0.0.3] MX=6
+  host ten-2.test.ex [V4NET.0.0.2] MX=5 ad=no
+  host ten-3.test.ex [V4NET.0.0.3] MX=6 ad=no

diff --git a/test/stdout/5300 b/test/stdout/5300
index e2f83ccb36a9712301dad43b9d6a7e1fcde388df..5995ccd4fd255868cd9c5e94a8ceb81b6dd60057 100644 (file)
--- a/test/stdout/5300
+++ b/test/stdout/5300
@@ -1,6 +1,6 @@
 x@[V4NET.9.8.7]
   router = r1, transport = t1
-  host [V4NET.9.8.7] [V4NET.9.8.7] 
+  host [V4NET.9.8.7] [V4NET.9.8.7]  ad=no
 x@[127.0.0.1]
   router = r3, transport = t1
  0m   sss 10HmaX-0005vi-00 <y@[10.9.8.7]>