diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/confs/0475 | 5 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0002 | 5 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0475 | 3 | ||||
| -rw-r--r-- | test/stderr/0002 | 11 | ||||
| -rw-r--r-- | test/stderr/0475 | 9 | ||||
| -rw-r--r-- | test/stdout/0002 | 3 | ||||
| -rw-r--r-- | test/stdout/0475 | 1 |
7 files changed, 34 insertions, 3 deletions
diff --git a/test/confs/0475 b/test/confs/0475 index f279cfd63..ff050bd53 100644 --- a/test/confs/0475 +++ b/test/confs/0475 @@ -10,7 +10,7 @@ gecos_name = CALLER_NAME # ----- Main settings ----- -acl_smtp_rcpt = a1 +acl_smtp_rcpt = $local_part # ----- ACL ----- @@ -20,4 +20,7 @@ begin acl a1: deny hosts = 1.2.3.4 : <; 1.2.3.4::5.6.7.8 +a2: + deny hosts = 1.2.3/24 + # End diff --git a/test/scripts/0000-Basic/0002 b/test/scripts/0000-Basic/0002 index f869c6da4..e73b5a84b 100644 --- a/test/scripts/0000-Basic/0002 +++ b/test/scripts/0000-Basic/0002 @@ -692,3 +692,8 @@ Subject: =?iso-8859-8?Q?_here_we_go=3A_a_string_that_is_going_to_be_encoded=3A_i . quit **** +# Certain kind of error +exim -d -be +match_ip: 15 ${if match_ip{1.2.3.4}{1.2.3}} +match_ip: 16 ${if match_ip{1.2.3.4}{1.2.3.4/abc}} +**** diff --git a/test/scripts/0000-Basic/0475 b/test/scripts/0000-Basic/0475 index e863f07c6..1571f4e89 100644 --- a/test/scripts/0000-Basic/0475 +++ b/test/scripts/0000-Basic/0475 @@ -1,6 +1,7 @@ # malformed item in host list exim -bh V4NET.0.0.0 mail from:<> -rcpt to:<a@b> +rcpt to:<a1@b> +rcpt to:<a2@b> quit **** diff --git a/test/stderr/0002 b/test/stderr/0002 index 245d3904a..68d246ecd 100644 --- a/test/stderr/0002 +++ b/test/stderr/0002 @@ -348,3 +348,14 @@ LOG: 10HmbD-0005vi-00 Subject is: " here we go: a string that is going to be enc >>> processing "deny" >>> deny: condition test succeeded LOG: 10HmbD-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<> +Exim version x.yz .... +changed uid/gid: -C, -D, -be or -bf forces real uid + uid=CALLER_UID gid=CALLER_GID pid=pppp +configuration file is TESTSUITE/test-config +admin user +originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME +sender address = CALLER@myhost.test.ex +1.2.3.4 in "1.2.3"? no (malformed IPv4 address or address mask) +1.2.3.4 in "1.2.3.4/abc"? no (malformed IPv4 address or address mask) +search_tidyup called +>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0475 b/test/stderr/0475 index d28c7ba53..e254d08f7 100644 --- a/test/stderr/0475 +++ b/test/stderr/0475 @@ -12,4 +12,11 @@ LOG: unknown lookup type "<" in host list item "<; 1.2.3.4:5.6.7.8" >>> host in "1.2.3.4 : <; 1.2.3.4::5.6.7.8"? lookup deferred for <; 1.2.3.4:5.6.7.8 >>> deny: condition test deferred -LOG: H=[V4NET.0.0.0] F=<> temporarily rejected RCPT <a@b>: unknown lookup type "<" +LOG: H=[V4NET.0.0.0] F=<> temporarily rejected RCPT <a1@b>: unknown lookup type "<" +>>> using ACL "a2" +>>> processing "deny" +>>> check hosts = 1.2.3/24 +>>> host in "1.2.3/24"? no (malformed IPv4 address or address mask) +>>> deny: condition test failed +>>> end of ACL "a2": implicit DENY +LOG: H=[V4NET.0.0.0] F=<> rejected RCPT <a2@b> diff --git a/test/stdout/0002 b/test/stdout/0002 index 4d87e0acc..5cdba5219 100644 --- a/test/stdout/0002 +++ b/test/stdout/0002 @@ -658,3 +658,6 @@ xyz 354 Enter message, ending with "." on a line by itself
550 reply_address=<>
221 myhost.test.ex closing connection
+> match_ip: 15 +> match_ip: 16 +> diff --git a/test/stdout/0475 b/test/stdout/0475 index dd4af68db..2fc366e62 100644 --- a/test/stdout/0475 +++ b/test/stdout/0475 @@ -6,4 +6,5 @@ 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 OK
451 Temporary local problem - please try later
+550 Administrative prohibition
221 the.local.host.name closing connection
|