diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-03-16 11:14:46 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-03-16 11:14:46 +0000 |
| commit | 81e509d738395fbfd837fbda1681971591109f8a (patch) | |
| tree | 9a0edf0e18aef2f489e6a9988718cb75980a71d7 /test | |
| parent | e97957bc478f60d32649b329659d4b72748745c1 (diff) | |
User, not system, error message for VRFY defer.
Diffstat (limited to 'test')
| -rw-r--r-- | test/confs/0042 | 5 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0042 | 1 | ||||
| -rw-r--r-- | test/stderr/0042 | 12 | ||||
| -rw-r--r-- | test/stdout/0042 | 1 |
4 files changed, 19 insertions, 0 deletions
diff --git a/test/confs/0042 b/test/confs/0042 index 15e1e6729..4d994e4c5 100644 --- a/test/confs/0042 +++ b/test/confs/0042 @@ -24,6 +24,11 @@ fail_remote_domains: domains = ! +local_domains data = :fail: unrouteable mail domain "$domain" +fail_expansion: + driver = redirect + local_parts = expan + data = ${if with syntax error + localuser: driver = accept local_parts = userx diff --git a/test/scripts/0000-Basic/0042 b/test/scripts/0000-Basic/0042 index a0b2e4f2c..2c8975a69 100644 --- a/test/scripts/0000-Basic/0042 +++ b/test/scripts/0000-Basic/0042 @@ -2,4 +2,5 @@ exim -bh 1.1.1.1 vrfy userx@test.ex vrfy junkjunk@test.ex +vrfy expan@test.ex quit diff --git a/test/stderr/0042 b/test/stderr/0042 index 2c4cc1dc8..740dc1bfa 100644 --- a/test/stderr/0042 +++ b/test/stderr/0042 @@ -13,6 +13,7 @@ >>> routing userx@test.ex >>> test.ex in "test.ex"? yes (matched "test.ex") >>> test.ex in "! +local_domains"? no (matched "! +local_domains") +>>> userx in "expan"? no (end of list) >>> userx in "userx"? yes (matched "userx") >>> calling localuser router >>> routed by localuser router @@ -22,6 +23,17 @@ >>> routing junkjunk@test.ex >>> test.ex in "test.ex"? yes (matched "test.ex") >>> test.ex in "! +local_domains"? no (matched "! +local_domains") +>>> junkjunk in "expan"? no (end of list) >>> junkjunk in "userx"? no (end of list) >>> no more routers LOG: VRFY failed for junkjunk@test.ex H=[1.1.1.1] +>>> processing "accept" +>>> accept: condition test succeeded +>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> +>>> routing expan@test.ex +>>> test.ex in "test.ex"? yes (matched "test.ex") +>>> test.ex in "! +local_domains"? no (matched "! +local_domains") +>>> expan in "expan"? yes (matched "expan") +>>> calling fail_expansion router +>>> fail_expansion router: defer for expan@test.ex +>>> message: failed to expand "${if with syntax error": unknown condition "with" diff --git a/test/stdout/0042 b/test/stdout/0042 index 76d3552bc..8602d02d3 100644 --- a/test/stdout/0042 +++ b/test/stdout/0042 @@ -6,4 +6,5 @@ 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 <userx@test.ex> is deliverable
550 <junkjunk@test.ex> Unrouteable address
+451 Cannot resolve <expan@test.ex> at this time
221 the.local.host.name closing connection
|