X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/aa7c82b2e34a4b0b341c6d05f81b4a349dcd06be..611b1961b81552737ae9345dac12a3f1cd914212:/test/stdout/0002 diff --git a/test/stdout/0002 b/test/stdout/0002 index c009fbd12..20f418360 100644 --- a/test/stdout/0002 +++ b/test/stdout/0002 @@ -6,11 +6,15 @@ > # Some fixed variables > > exim_path: TESTSUITE/eximdir/exim +> exim_version: x.yz +> config_dir: TESTSUITE +> config_file: TESTSUITE/test-config > primary_hostname: myhost.test.ex > primary_hostname: myhost.test.ex > qualify_domain: myhost.test.ex > bounce_return_size_limit: 102400 > spool_directory: TESTSUITE/spool +> queue_name: > Failed: unknown variable in "${unknown}" > h_subject: (should be empty) > h_subject: (should be empty) @@ -48,6 +52,37 @@ > reduce: +abc > reduce: 6 > reduce: 9 +> # Check for extract corrupting reduce's +> reduce: a , b +> +> listnamed: *.aa.bb : ^\Nxxx(.*) +> listnamed: *.aa.bb : ^\Nxxx(.*) +> listnamed: V4NET.11.12.13 : iplsearch;TESTSUITE/aux-fixed/0002.iplsearch +> listnamed: *.aa.bb : ^\Nxxx(.*) : ;; +> listnamed: a : b;c : *.aa.bb : ^\Nxxx(.*) : ;; : 2001::630::212::8::204::::b664 +> Failed: "nolist" is not a named list +> listnamed: *.aa.bb : ^\Nxxx(.*) +> Failed: "hlist" is not a domain named list +> Failed: bad suffix on "list" operator +> +> listcount: 3 +> listcount: 0 +> listcount: 3 +> listcount: 2 +> +> listextract: b +> listextract: XcX +> listextract: +> listextract: +> listextract: fail +> Failed: "listextract" failed and "fail" requested +> +> sort: 1:2:3:4 +> sort: 4,3,2,1 +> sort: a:aa:B:c +> sort: 10 smtp.ex.com:100 r2.ex.com:666 r99.ex.com +> sort: 10,smtp.ex.com:100,r2.ex.com:666,r99.ex.com +> sort: "" > > # Tests with iscntrl() and illegal separators > @@ -63,6 +98,21 @@ > > # Operators > +> Failed: Not enough arguments for 'acl' (min is 1) +> Failed: Not enough arguments for 'acl' (min is 1) +> Failed: error from acl "a_nosuch" +> acl: (0) [] [] +> acl: (1) [person@dom.ain] [] +> acl: (2) [firstarg] [secondarg] +> acl: (1) [arg with spaces] [] +> acl: +> acl: +> acl: (0) [] [] +> acl: (1) [person@dom.ain] [] +> Failed: error from acl "a_defer" +> acl: (2) [new arg1] [top_arg_1] +> acl: (1) [1] [] (1) [2] [] (1) [3] [] (1) [4] [] +> > addrss: local-part@dom.ain > addrss: local-part@dom.ain > domain: dom.ain @@ -73,8 +123,12 @@ > addresses: local-part@dom.ain+xyz@abc > addresses: local-part@dom.ain:xyz@abc:p@q:r@s > addresses: +> Failed: output separator missing in expanding ${addresses:>} +> +> escape: B7\267F2\362 +> excape8bit: undisturbed text tab +newline tab\134backslash ~tilde\177DEL\200\201. > -> escape: B7\267F2\362 > eval: 2 > eval: 7 > eval: 9 @@ -121,7 +175,21 @@ > hex2b64:MPPJPkZDbetYunCBao7BJA== > hex2b64:ztcfpyNSMb7Tg/rP3EHE3cwi7PE= > -> The base62 operator is actually a base36 operator in the Darwin and Cygwin +> base32: 0 <> +> base32: 1 +> base32: 31 <7> +> base32: 32 +> base32: 42 +> Failed: argument for base32 operator is "0x1", which is not a decimal number +> +> base32d: 0 0 +> base32d: 1 1 +> base32d: 31 31 +> base32d: 32 32 +> base32d: 42 42 +> Failed: argument for base32d operator is "ABC", which is not a base 32 number +> +> the base62 operator is actually a base36 operator in the Darwin and Cygwin > environments. Write cunning tests that produce the same output in both cases, > while doing a reasonable check. > @@ -142,6 +210,17 @@ > mask: 0.0.0.0/0 > Failed: missing mask value in "192.168.10.206" > Failed: "a.b.c.d" is not an IP address +> ipv6denorm: 0000:0000:0000:0000:0000:0000:0000:0001 +> ipv6denorm: fe00:0000:0000:0000:0000:0000:0000:0001 +> ipv6denorm: 0000:0000:0000:0000:0000:ffff:c0a8:0001 +> ipv6denorm: fe80:0000:0000:0000:0000:0000:c0a8:0001 +> ipv6norm: ::1 +> ipv6norm: 2a00:: +> ipv6norm: 2a00::1 +> ipv6norm: 2a00:eadf::1:0 +> ipv6norm: 2a00:eadf:0:1:: +> ipv6norm: 2a00:: +> ipv6norm: 2a00:2:3:4:5:6:7:8 > nhash: 19 0/61 > lc/uc: the quick BROWN FOX > length: The quick abc @@ -166,12 +245,18 @@ > quote_local_part: "abcd\"ef" > quote_local_part: "" > rxquote:aZ09\_\,\-Q ab\*cd abcd\"ef +> hexquote: \x01\x02\x03\x04\x05\x06\x07\x20\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x20\x10\x11\x12\x13\x14\x15\x16\x17\x20\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f\x20\x20!"#$%&'\x20()*+,-./\x2001234567\x2089:;<=>?\x20@ABCDEFG\x20HIJKLMNO\x20PQRSTUVW\x20XYZ[\]^_\x20`abcdefg\x20hijklmno\x20pqrstuvw\x20xyz{|}~\x7f > substr: ba 34 1 > substr: barb rhuba > substr: > substr: > str2b64:YWJjZA== > str2b64:VGhlIHF1aWNrIGJyb3duIAogZm94 +> base64: YWJjZA== +> base64: VGhlIHF1aWNrIGJyb3duIAogZm94 +> base64d:abcd +> base64d:The quick brown + fox > strlen: 0 > strlen: 1 > strlen: 8 @@ -205,9 +290,9 @@ > > # Error forms > -> Failed: missing or misplaced { or } +> Failed: Not enough arguments for 'hash' (min is 2) > Failed: "nonnumber" is not a number (in "hash" expansion) -> Failed: Too many arguments for "hash" (max is 3) +> Failed: Too many arguments for 'hash' (max is 3) > Failed: "-2" is not a positive number (in "substr" expansion) > > # Skipped operators @@ -220,12 +305,20 @@ > md5: NO > mask: NO > +> # Number suffixes in conditions +> 1k: y +> 1K: y +> 1M: y +> 1G: y +> > # Numeric overflow > # >32b should work, >64b not > -> 4096M y -> 4096000000 y -> 4611686018427387904 y +> 1 > 2047M n +> 1 > 2048M n +> 1 > 4096000000 n +> 1 > 4096M n +> 1 > 4611686018427387904 n > Failed: absolute value of integer "46116860184273879040" is too large (overflow) > > # Conditions @@ -258,6 +351,7 @@ > 5>3m: n > Failed: invalid integer "3z " > Failed: integer expected but "a" found +> Failed: integer expected but "${substr_2_2:65535}" found > > >0: n > =: y @@ -270,7 +364,8 @@ > Failed: unknown variable "post" after "def:" > def:h_f n > def:h_f n -> Failed: missing or misplaced { or } +> Failed: curly-bracket problem in conditional yes/no parsing: 'yes' part did not start with '{' + remaining string is ':{y}{n}}' > > exists: y > exists: n @@ -299,6 +394,8 @@ > isip: y 1.2.3.4 > isip4: y 1.2.3.4 > isip6: n 1.2.3.4 +> isip: n ::1.2.3.256 +> isip4: n 1.2.3.256 > isip: n 1:2:3:4 > isip4: n 1:2:3:4 > isip6: n 1:2:3:4 @@ -308,6 +405,7 @@ > isip: y fe80::a00:20ff:fe86:a061 > isip4: n fe80::a00:20ff:fe86:a061 > isip6: y fe80::a00:20ff:fe86:a061 +> isip: y fe80::1.2.3.4 > isip: n rhubarb > isip4: n rhubarb > isip6: n rhubarb @@ -356,6 +454,12 @@ > queue_running after or: y > first_delivery after or: y > +> # acl expansion condition +> acl if: Y:(0) [] [] +> acl if: Y:(1) [argY] [] +> acl if: N:(2) [argN] [arg2] +> Failed: error from acl "a_defer" +> > # Default values for both if strings > > ${if eq{1}{1}} >true< @@ -391,8 +495,8 @@ > a.b.c: *.b.c > ab.c: *b.c > xyz: ^X -> Xyz: ^X -> Zyz: ^Z +> .Xyz: ^X +> .Zyz: ^Z > a b: "^a +b" > a b: "^a +b" > a:b: lookup succeeded @@ -407,8 +511,8 @@ > a.b.c: *.b.c > ab.c: *b.c > xyz: ^X -> Xyz: ^X -> Zyz: ^Z +> .Xyz: ^X +> .Zyz: ^Z > a b: "^a +b" > a b: "^a +b" > a:b: lookup succeeded @@ -427,10 +531,10 @@ > > # Some tests of case-(in)dependence > -> MiXeD-CD: Data found for case-dependent MiXeD-CD -> MixeD-CD: NOT FOUND -> MiXeD-Ncd: Data found for case-independent MiXeD-nCD -> MixeD-Ncd: Data found for case-independent MiXeD-nCD +> .MiXeD-CD: Data found for case-dependent MiXeD-CD +> .MixeD-CD: NOT FOUND +> .MiXeD-Ncd: Data found for case-independent MiXeD-nCD +> .MixeD-Ncd: Data found for case-independent MiXeD-nCD > > # IP address (CIDR) lookups > @@ -474,12 +578,12 @@ > 2 > 2 > 2 -> Empty:<> -> Empty:<> +> empty:<> +> empty:<> > <3> > <3> -> Empty:<> -> Empty:<> +> empty:<> +> empty:<> > no Z > no 4 > Failed: "extract" failed and "fail" requested @@ -498,6 +602,10 @@ > Failed: first argument of "extract" must not be empty > b > +> a:b:c +> Failed: missing '}' closing extract inside "map" item +> a:b:c +> > # Translation > > abcdea aaa xyz zbcdez @@ -511,7 +619,7 @@ > " yes" true EXPECT: true > " no" false EXPECT: false > "yes " true EXPECT: true -> Failed: unrecognised boolean value "-1" +> "-1" true EXPECT: true > "0" false EXPECT: false > "1" true EXPECT: true > " 0 " false EXPECT: false @@ -521,6 +629,7 @@ > " " false EXPECT: false > Failed: unrecognised boolean value "text" > Failed: unrecognised boolean value "text" +> Failed: unrecognised boolean value "-text" > Failed: unrecognised boolean value "text" > Failed: unrecognised boolean value "text" > "00" false EXPECT: false @@ -553,8 +662,8 @@ > abcd abcd > <:abcd:> =?iso-8859-8?Q?=3C=3Aabcd=3A=3E?= > <:ab cd:> =?iso-8859-8?Q?=3C=3Aab_cd=3A=3E?= -> Long: =?iso-8859-8?Q?_here_we_go=3A_a_string_that_is_going_to_be_encoded=3A_?= =?iso-8859-8?Q?it_will_go_over_the_75-char_limit?= -> Long: =?iso-8859-8?Q?_here_we_go=3A_a_string_that_is_going_to_be_encoded=3A_?= =?iso-8859-8?Q?it_will_go_over_the_75-char_limit_by_a_long_way=3B_in?= =?iso-8859-8?Q?_fact_this_one_will_go_over_the_150_character_limit?= +> long: =?iso-8859-8?Q?_here_we_go=3A_a_string_that_is_going_to_be_encoded=3A_?= =?iso-8859-8?Q?it_will_go_over_the_75-char_limit?= +> long: =?iso-8859-8?Q?_here_we_go=3A_a_string_that_is_going_to_be_encoded=3A_?= =?iso-8859-8?Q?it_will_go_over_the_75-char_limit_by_a_long_way=3B_in?= =?iso-8859-8?Q?_fact_this_one_will_go_over_the_150_character_limit?= > > # RFC 2047 decode > @@ -581,7 +690,7 @@ > > # File insertion > -> Failed: missing or misplaced { or } +> Failed: Not enough arguments for 'readfile' (min is 1) > abcde 12345 @@ -599,25 +708,25 @@ xyz > abcd 1234 -> RC=0 +> rc=0 > 1 -> RC=0 +> rc=0 > abcd 1234 -> RC=0 +> rc=0 > 2 -> RC=1 +> rc=1 > abcd 1234 -> RC=1 +> rc=1 > N -> RC=127 +> rc=127 > >><< -> RC=0 +> rc=0 > 1!=2 -> RC=0 +> rc=0 > > # PRVS > @@ -627,9 +736,9 @@ xyz > > # Syntax errors > -> Failed: prvs second argument must be a single digit -> Failed: prvs second argument must be a single digit -> Failed: prvs second argument must be a single digit +> Failed: prvs third argument must be a single digit +> Failed: prvs third argument must be a single digit +> Failed: prvs third argument must be a single digit > > # Correct checks; can't put explicit addresses in the tests, because they > # will change over time. @@ -667,7 +776,8 @@ xyz > Failed: unknown condition "xya" inside "and{...}" condition > Failed: condition name expected, but found "${lookup{x}lsear" inside "and{...}" condition > Failed: missing } at end of string - could be header name not terminated by colon -> Failed: missing or misplaced { or } +> Failed: curly-bracket problem in conditional yes/no parsing: did not close with '}' + remaining string is '' > Failed: missing or misplaced { or } - could be header name not terminated by colon > Failed: each subcondition inside an "or{...}" condition must be in its own {} > Failed: missing } at end of condition inside "or" group @@ -714,6 +824,11 @@ xyz > > true > +> # Environment access +> +> CALLER +> correct +> > > escape: B7·F2ò > @@ -723,6 +838,7 @@ xyz > yes > match_address: no > +> -be Sender host name and address etc, all unset > -oMa sender_host_address = > sender_host_port = 0 > -oMaa sender_host_authenticated = @@ -734,6 +850,7 @@ xyz > -oMs sender_host_name = > -oMt sender_ident = CALLER > +> -be Sender host name and address etc, all set except host name. > -oMa sender_host_address = V4NET.0.0.1 > sender_host_port = 1234 > -oMaa sender_host_authenticated = AAA @@ -744,16 +861,20 @@ xyz > -oMr received_protocol = special > -oMt sender_ident = me > +> -be Sender host name explicitly set > -oMa sender_host_address = V4NET.0.0.1 > sender_host_port = 1234 > -oMs sender_host_name = my.host.name > +> be Sender host name lookup fails (V4NET.11.12.13 is not reverse registered) > -oMs sender_host_name = > host_lookup_failed = 1 > +> -be Sender host name and protocol set by Sendmail-compatible option > -p received_protocol = special > -p sender_host_name = host.name > +> -be Sender host name and address etc, all set except host name > -oMa sender_host_address = V4NET.0.0.1 > sender_host_port = 1234 > -oMaa sender_host_authenticated = AAA @@ -830,3 +951,6 @@ xyz > match_ip: 15 > match_ip: 16 > +> in list +> in list +>