Gitweb:
http://git.exim.org/exim.git/commitdiff/de11307f4085222c29051e5b8149ea3340707f26
Commit: de11307f4085222c29051e5b8149ea3340707f26
Parent: f926e27276301de1e2fd011b7edcd1b85d8c4754
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Tue Dec 23 20:02:53 2014 +0000
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Mon Jan 12 18:58:35 2015 +0000
Emphasize whitespace in hostnames in debug output
---
src/src/host.c | 4 ++--
test/stderr/0002 | 4 ++--
test/stderr/0020 | 2 +-
test/stderr/0023 | 4 ++--
test/stderr/0062 | 8 ++++----
test/stderr/0063 | 4 ++--
test/stderr/0064 | 4 ++--
test/stderr/0066 | 2 +-
test/stderr/0069 | 2 +-
test/stderr/0070 | 8 ++++----
test/stderr/0089 | 2 +-
test/stderr/0094 | 6 +++---
test/stderr/0303 | 4 ++--
test/stderr/0308 | 2 +-
test/stderr/0381 | 4 ++--
test/stderr/1000 | 2 +-
test/stderr/2202 | 2 +-
17 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/src/src/host.c b/src/src/host.c
index 7737704..1ef7327 100644
--- a/src/src/host.c
+++ b/src/src/host.c
@@ -1742,8 +1742,8 @@ if (sender_host_name == NULL)
HDEBUG(D_host_lookup)
{
uschar **aliases = sender_host_aliases;
- debug_printf("IP address lookup yielded %s\n", sender_host_name);
- while (*aliases != NULL) debug_printf(" alias %s\n", *aliases++);
+ debug_printf("IP address lookup yielded \"%s\"\n", sender_host_name);
+ while (*aliases != NULL) debug_printf(" alias \"%s\"\n", *aliases++);
}
/* We need to verify that a forward lookup on the name we found does indeed
diff --git a/test/stderr/0002 b/test/stderr/0002
index a30eb73..2d0d1ab 100644
--- a/test/stderr/0002
+++ b/test/stderr/0002
@@ -116,7 +116,7 @@ expanding: No
expanding: ----> No lookup yet: ${if eq{black}{white}{$sender_host_name}{No}}
result: ----> No lookup yet: No
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"
using host_fake_gethostbyname for ten-1.test.ex (IPv4)
MUNGED: ::1 will be omitted in what follows
get[host|ipnode]byname[2] looked up these IP addresses:
@@ -159,7 +159,7 @@ sender host name required, to match against partial-lsearch;TESTSUITE/aux-fixed/
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
+IP address lookup yielded "ten-1.test.ex"
using host_fake_gethostbyname for ten-1.test.ex (IPv4)
DNS lookup of ten-1.test.ex (A) using fakens
DNS lookup of ten-1.test.ex (A) succeeded
diff --git a/test/stderr/0020 b/test/stderr/0020
index cbab114..5a49a33 100644
--- a/test/stderr/0020
+++ b/test/stderr/0020
@@ -1,7 +1,7 @@
>>> host in hosts_connection_nolog? no (option unset)
>>> 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"
MUNGED: ::1 will be omitted in what follows
>>> get[host|ipnode]byname[2] looked up these IP addresses:
>>> name=manyhome.test.ex address=10.250.104.0
diff --git a/test/stderr/0023 b/test/stderr/0023
index 16c4aba..89c1d39 100644
--- a/test/stderr/0023
+++ b/test/stderr/0023
@@ -1087,8 +1087,8 @@ LOG: H=[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
->>> 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"
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
diff --git a/test/stderr/0062 b/test/stderr/0062
index 38648d6..936b696 100644
--- a/test/stderr/0062
+++ b/test/stderr/0062
@@ -28,7 +28,7 @@
>>> check hosts = +relay_hosts
>>> 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
+>>> IP address lookup yielded "ten-1.test.ex"
MUNGED: ::1 will be omitted in what follows
>>> get[host|ipnode]byname[2] looked up these IP addresses:
>>> name=ten-1.test.ex address=V4NET.0.0.1
@@ -77,7 +77,7 @@ LOG: 10HmaX-0005vi-00 <= userx@??? H=ten-1.test.ex [V4NET.0.0.1
>>> check hosts = +relay_hosts
>>> 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
+>>> IP address lookup yielded "ten-2.test.ex"
MUNGED: ::1 will be omitted in what follows
>>> get[host|ipnode]byname[2] looked up these IP addresses:
>>> name=ten-2.test.ex address=V4NET.0.0.2
@@ -122,8 +122,8 @@ LOG: 10HmaY-0005vi-00 <= userx@??? H=ten-2.test.ex [V4NET.0.0.2
>>> check hosts = +relay_hosts
>>> 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
+>>> IP address lookup yielded "ten-3.test.ex"
+>>> alias "ten-3-alias.test.ex"
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
diff --git a/test/stderr/0063 b/test/stderr/0063
index 16cf480..a32d699 100644
--- a/test/stderr/0063
+++ b/test/stderr/0063
@@ -28,7 +28,7 @@
>>> check hosts = +relay_hosts
>>> 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
+>>> IP address lookup yielded "ten-1.test.ex"
MUNGED: ::1 will be omitted in what follows
>>> get[host|ipnode]byname[2] looked up these IP addresses:
>>> name=ten-1.test.ex address=V4NET.0.0.1
@@ -73,7 +73,7 @@ LOG: 10HmaX-0005vi-00 <= userx@??? H=ten-1.test.ex [V4NET.0.0.1
>>> check hosts = +relay_hosts
>>> 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
+>>> IP address lookup yielded "ten-2.test.ex"
MUNGED: ::1 will be omitted in what follows
>>> get[host|ipnode]byname[2] looked up these IP addresses:
>>> name=ten-2.test.ex address=V4NET.0.0.2
diff --git a/test/stderr/0064 b/test/stderr/0064
index 47de0e7..82b68bb 100644
--- a/test/stderr/0064
+++ b/test/stderr/0064
@@ -28,7 +28,7 @@
>>> check hosts = +relay_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
+>>> IP address lookup yielded "ten-1.test.ex"
MUNGED: ::1 will be omitted in what follows
>>> get[host|ipnode]byname[2] looked up these IP addresses:
>>> name=ten-1.test.ex address=V4NET.0.0.1
@@ -73,7 +73,7 @@ LOG: 10HmaX-0005vi-00 <= userx@??? H=ten-1.test.ex [V4NET.0.0.1
>>> check hosts = +relay_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
+>>> IP address lookup yielded "ten-2.test.ex"
MUNGED: ::1 will be omitted in what follows
>>> get[host|ipnode]byname[2] looked up these IP addresses:
>>> name=ten-2.test.ex address=V4NET.0.0.2
diff --git a/test/stderr/0066 b/test/stderr/0066
index b86c2d5..de0821a 100644
--- a/test/stderr/0066
+++ b/test/stderr/0066
@@ -279,7 +279,7 @@ MUNGED: ::1 will be omitted in what follows
>>> name=ten-3.test.ex address=V4NET.0.0.3
>>> 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
+>>> IP address lookup yielded "ten-1.test.ex"
MUNGED: ::1 will be omitted in what follows
>>> get[host|ipnode]byname[2] looked up these IP addresses:
>>> name=ten-1.test.ex address=V4NET.0.0.1
diff --git a/test/stderr/0069 b/test/stderr/0069
index 0772c28..df768dd 100644
--- a/test/stderr/0069
+++ b/test/stderr/0069
@@ -3,7 +3,7 @@
>>> host in host_reject_connection? no (option unset)
>>> 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
+>>> IP address lookup yielded "ten-1.test.ex"
MUNGED: ::1 will be omitted in what follows
>>> get[host|ipnode]byname[2] looked up these IP addresses:
>>> name=ten-1.test.ex address=V4NET.0.0.1
diff --git a/test/stderr/0070 b/test/stderr/0070
index ebab42f..1df05cd 100644
--- a/test/stderr/0070
+++ b/test/stderr/0070
@@ -105,7 +105,7 @@ 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
->>> IP address lookup yielded ten-1.test.ex
+>>> IP address lookup yielded "ten-1.test.ex"
MUNGED: ::1 will be omitted in what follows
>>> get[host|ipnode]byname[2] looked up these IP addresses:
>>> name=ten-1.test.ex address=V4NET.0.0.1
@@ -128,8 +128,8 @@ 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
->>> 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"
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
@@ -163,7 +163,7 @@ 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
->>> IP address lookup yielded ten-1.test.ex
+>>> IP address lookup yielded "ten-1.test.ex"
MUNGED: ::1 will be omitted in what follows
>>> get[host|ipnode]byname[2] looked up these IP addresses:
>>> name=ten-1.test.ex address=V4NET.0.0.1
diff --git a/test/stderr/0089 b/test/stderr/0089
index 213760d..bacb291 100644
--- a/test/stderr/0089
+++ b/test/stderr/0089
@@ -49,7 +49,7 @@ LOG: H=(abc_xyz) [V4NET.0.0.0] F=<userx@???> rejected RCPT <userx@else
>>> host in host_reject_connection? no (option unset)
>>> 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
+>>> IP address lookup yielded "ten-99.test.ex"
MUNGED: ::1 will be omitted in what follows
>>> get[host|ipnode]byname[2] looked up these IP addresses:
>>> name=ten-99.test.ex address=V4NET.0.0.99
diff --git a/test/stderr/0094 b/test/stderr/0094
index 8626c5e..5346c5c 100644
--- a/test/stderr/0094
+++ b/test/stderr/0094
@@ -32,7 +32,7 @@ LOG: H=[V4NET.11.12.13] F=<userx@???> rejected RCPT <userx@???>: rel
>>> host in hosts_connection_nolog? no (option unset)
>>> 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"
MUNGED: ::1 will be omitted in what follows
>>> get[host|ipnode]byname[2] looked up these IP addresses:
>>> name=ten-1.test.ex address=V4NET.0.0.1
@@ -84,8 +84,8 @@ host in host_lookup? yes (matched "0.0.0.0/0")
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
+IP address lookup yielded "oneback.test.ex"
+ alias "host1.masq.test.ex"
using host_fake_gethostbyname for oneback.test.ex (IPv4)
DNS lookup of oneback.test.ex (A) using fakens
DNS lookup of oneback.test.ex (A) succeeded
diff --git a/test/stderr/0303 b/test/stderr/0303
index 9893e64..a1da41f 100644
--- a/test/stderr/0303
+++ b/test/stderr/0303
@@ -8,7 +8,7 @@
>>> host in helo_accept_junk_hosts? no (option unset)
>>> 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"
MUNGED: ::1 will be omitted in what follows
>>> get[host|ipnode]byname[2] looked up these IP addresses:
>>> name=ten-1.test.ex address=V4NET.0.0.1
@@ -24,7 +24,7 @@ MUNGED: ::1 will be omitted in what follows
>>> host in helo_accept_junk_hosts? no (option unset)
>>> [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"
MUNGED: ::1 will be omitted in what follows
>>> get[host|ipnode]byname[2] looked up these IP addresses:
>>> name=ten-1.test.ex address=V4NET.0.0.1
diff --git a/test/stderr/0308 b/test/stderr/0308
index 2c800bb..d8aca4e 100644
--- a/test/stderr/0308
+++ b/test/stderr/0308
@@ -32,7 +32,7 @@ LOG: no host name found for IP address V4NET.0.0.97
>>> check hosts = *.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
+>>> IP address lookup yielded "ten-1.test.ex"
MUNGED: ::1 will be omitted in what follows
>>> get[host|ipnode]byname[2] looked up these IP addresses:
>>> name=ten-1.test.ex address=V4NET.0.0.1
diff --git a/test/stderr/0381 b/test/stderr/0381
index 176287a..c1ead3f 100644
--- a/test/stderr/0381
+++ b/test/stderr/0381
@@ -37,8 +37,8 @@ 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
+IP address lookup yielded "x.gov.uk.test.ex"
+ alias "x.co.uk.test.ex"
using host_fake_gethostbyname for x.gov.uk.test.ex (IPv4)
DNS lookup of x.gov.uk.test.ex (A) using fakens
DNS lookup of x.gov.uk.test.ex (A) succeeded
diff --git a/test/stderr/1000 b/test/stderr/1000
index 669ddb4..6caf2cd 100644
--- a/test/stderr/1000
+++ b/test/stderr/1000
@@ -21,7 +21,7 @@ LOG: H=[2001:0ab8:037f:0020:0000:0000:0000:0001] Warning: matched hostlist
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? yes (matched "*")
>>> looking up host name for V6NET:1234:0005:0006:0007:0008:0abc:000d
->>> IP address lookup yielded test3.ipv6.test.ex
+>>> IP address lookup yielded "test3.ipv6.test.ex"
MUNGED: ::1 will be omitted in what follows
>>> get[host|ipnode]byname[2] looked up these IP addresses:
>>> name=test3.ipv6.test.ex address=V6NET:1234:5:6:7:8:abc:d
diff --git a/test/stderr/2202 b/test/stderr/2202
index fe6ea9e..2669d93 100644
--- a/test/stderr/2202
+++ b/test/stderr/2202
@@ -45,7 +45,7 @@ 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
+IP address lookup yielded "the.local.host.name"
using host_fake_gethostbyname for the.local.host.name (IPv4)
DNS lookup of the.local.host.name (A) using fakens
DNS lookup of the.local.host.name (A) succeeded
