summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeiko Schlittermann (HS12) <hs@schlittermann.de>2015-05-11 22:15:32 +0200
committerHeiko Schlittermann (HS12) <hs@schlittermann.de>2015-05-12 16:54:32 +0200
commitded5de1587888a66a86aa02549098c8821bd8efb (patch)
tree12b9327dec06d465622c50c4435be0b8fce9e8c0
parent8e0130284ead48da81351d4d2c22fe7eb23703d6 (diff)
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.
Diffstat
-rw-r--r--src/src/verify.c6
-rw-r--r--test/stdout/004518
-rw-r--r--test/stdout/00476
-rw-r--r--test/stdout/00542
-rw-r--r--test/stdout/00786
-rw-r--r--test/stdout/00892
-rw-r--r--test/stdout/01462
-rw-r--r--test/stdout/01616
-rw-r--r--test/stdout/018312
-rw-r--r--test/stdout/01864
-rw-r--r--test/stdout/018710
-rw-r--r--test/stdout/0190162
-rw-r--r--test/stdout/02398
-rw-r--r--test/stdout/03232
-rw-r--r--test/stdout/03448
-rw-r--r--test/stdout/03504
-rw-r--r--test/stdout/03644
-rw-r--r--test/stdout/036816
-rw-r--r--test/stdout/04052
-rw-r--r--test/stdout/04192
-rw-r--r--test/stdout/043068
-rw-r--r--test/stdout/04342
-rw-r--r--test/stdout/04632
-rw-r--r--test/stdout/04662
-rw-r--r--test/stdout/046714
-rw-r--r--test/stdout/052810
-rw-r--r--test/stdout/05454
-rw-r--r--test/stdout/05576
-rw-r--r--test/stdout/52044
-rw-r--r--test/stdout/52084
-rw-r--r--test/stdout/53002
31 files changed, 203 insertions, 197 deletions
diff --git a/src/src/verify.c b/src/src/verify.c
index b77978bfc..8a408686f 100644
--- 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 5c998117d..28b0ff130 100644
--- 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 258578d9a..5d5fb5431 100644
--- 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 ca26171e7..e65ab29d4 100644
--- 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 272e0f224..45f3678f6 100644
--- 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 0238dbffb..a075e1cd5 100644
--- 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 953a87442..0de260b50 100644
--- 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 0593ee327..a7f7eca3d 100644
--- 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 2737f0938..888e7a3c1 100644
--- 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 3653da9b7..bfe0227cc 100644
--- 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 cef8628c9..be62b6e44 100644
--- 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 4ca02adc5..351d70722 100644
--- 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 29766a24a..64edde126 100644
--- 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 136a4d85e..7af74b06d 100644
--- 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 2452f7692..7d49c555c 100644
--- 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 71109bd86..8631b6f2b 100644
--- 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 7990d897c..4b3ad2308 100644
--- 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 cfd96796e..7302d740b 100644
--- 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 8a0641056..620638bbb 100644
--- 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 0d7d734d1..e56240329 100644
--- 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 de3056664..75887bedc 100644
--- 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 c438f0e2b..ed4e976ec 100644
--- 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 1bd1f1fa3..27d6cfe31 100644
--- 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 517f664e4..71fd0dada 100644
--- 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 553dda850..140020f3c 100644
--- 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 71aa0173b..578e4fefe 100644
--- 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 1495ed9e6..9936abc5e 100644
--- 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 5077c0d0a..cd31b5c02 100644
--- 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 5d438bb35..7c61dad63 100644
--- 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 493025aba..c1297cd27 100644
--- 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 e2f83ccb3..5995ccd4f 100644
--- 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]>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 16:42:21 +0000