From 11a5264b5b67a7f9e11edc188080c806d7c01422 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sat, 13 Oct 2018 18:18:53 +0100 Subject: [PATCH] Testsuite: tidying --- test/README | 2 +- test/confs/0135 | 2 +- test/confs/0268 | 6 +- test/confs/0272 | 2 +- test/confs/0296 | 2 +- test/confs/0345 | 2 +- test/confs/2112 | 2 +- test/confs/2133 | 2 +- test/log/0600 | 12 +-- test/log/2112 | 6 +- test/log/2133 | 2 +- test/mail/0600.CALLER | 3 +- test/mail/4560.a | 112 +++++++++++++-------------- test/mail/4562.a | 4 +- test/scripts/1990-TCP-Fast-Open/1990 | 1 + test/scripts/2100-OpenSSL/2112 | 2 +- test/scripts/2100-OpenSSL/2133 | 2 +- 17 files changed, 83 insertions(+), 81 deletions(-) diff --git a/test/README b/test/README index f9ee5d0a9..f4eeddbb4 100644 --- a/test/README +++ b/test/README @@ -1017,7 +1017,7 @@ one-off things to be done. CLIENT SCRIPTS -------------- -Lines in client scripts are of two kinds: +Lines in client scripts are of several kinds: (1) If a line begins with three question marks and a space, the rest of the line defines the start of expected output from the server. If what is diff --git a/test/confs/0135 b/test/confs/0135 index 2c62f0473..636294461 100644 --- a/test/confs/0135 +++ b/test/confs/0135 @@ -9,7 +9,7 @@ domainlist local_domains = test.ex qualify_domain = test.ex ignore_bounce_errors_after = 0s -admin_groups = CALLER +admin_groups = CALLERGROUP remote_max_parallel = 1 diff --git a/test/confs/0268 b/test/confs/0268 index e1e0be848..15a4ae24c 100644 --- a/test/confs/0268 +++ b/test/confs/0268 @@ -78,19 +78,19 @@ r9: domains = r9 allow_fail file = DIR/test-owned-by-exim - owngroups = CALLER : EXIMGROUP + owngroups = CALLERGROUP : EXIMGROUP r10: driver = redirect domains = r10 file = DIR/test-owned-by-exim - owngroups = CALLER + owngroups = CALLERGROUP r11: driver = redirect domains = r11 file = DIR/test-owned-by-exim - owngroups = CALLER : EXIMGROUP + owngroups = CALLERGROUP : EXIMGROUP modemask = 007 # End diff --git a/test/confs/0272 b/test/confs/0272 index f3788f15c..0ddb8f224 100644 --- a/test/confs/0272 +++ b/test/confs/0272 @@ -84,7 +84,7 @@ r10: driver = redirect domains = r10 file = DIR/aux-var/TESTNUM.exim - owngroups = CALLER + owngroups = CALLERGROUP r11: driver = redirect diff --git a/test/confs/0296 b/test/confs/0296 index e62a3d1a1..e1f545aba 100644 --- a/test/confs/0296 +++ b/test/confs/0296 @@ -6,7 +6,7 @@ primary_hostname = myhost.test.ex # ----- Main settings ----- -admin_groups = CALLER +admin_groups = CALLERGROUP trusted_users = CALLER system_filter = DIR/aux-fixed/TESTNUM.Filter diff --git a/test/confs/0345 b/test/confs/0345 index 99bdce0b4..651d07068 100644 --- a/test/confs/0345 +++ b/test/confs/0345 @@ -9,7 +9,7 @@ domainlist local_domains = test.ex qualify_domain = test.ex ignore_bounce_errors_after = 0s -admin_groups = CALLER +admin_groups = CALLERGROUP # ----- Routers ----- diff --git a/test/confs/2112 b/test/confs/2112 index aab264820..005925e11 100644 --- a/test/confs/2112 +++ b/test/confs/2112 @@ -79,7 +79,7 @@ client_r: client_s: driver = accept - local_parts = users + local_parts = user_s retry_use_local_part transport = send_to_server_req_passname diff --git a/test/confs/2133 b/test/confs/2133 index ff4350809..e58a0c65c 100644 --- a/test/confs/2133 +++ b/test/confs/2133 @@ -81,7 +81,7 @@ client_r: client_s: driver = accept - local_parts = users + local_parts = user_s retry_use_local_part transport = send_to_server_req_passname diff --git a/test/log/0600 b/test/log/0600 index 706a784ce..36ab9e005 100644 --- a/test/log/0600 +++ b/test/log/0600 @@ -7,12 +7,12 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER R=localuser T=local_delivery 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 10HmaY-0005vi-00 x-test-header-good1: -1999-03-02 09:44:33 10HmaY-0005vi-00 x-test-header-good2: -1999-03-02 09:44:33 10HmaY-0005vi-00 x-test-header-too-short: -1999-03-02 09:44:33 10HmaY-0005vi-00 x-test-header-too-long: -1999-03-02 09:44:33 10HmaY-0005vi-00 x-test-header-too-big: -1999-03-02 09:44:33 10HmaY-0005vi-00 x-test-header-truncated: +1999-03-02 09:44:33 10HmaY-0005vi-00 x-test-header-good1: +1999-03-02 09:44:33 10HmaY-0005vi-00 x-test-header-good2: +1999-03-02 09:44:33 10HmaY-0005vi-00 x-test-header-too-short: +1999-03-02 09:44:33 10HmaY-0005vi-00 x-test-header-too-long: +1999-03-02 09:44:33 10HmaY-0005vi-00 x-test-header-too-big: +1999-03-02 09:44:33 10HmaY-0005vi-00 x-test-header-truncated: 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER R=localuser T=local_delivery 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed diff --git a/test/log/2112 b/test/log/2112 index 341d34b0e..228c2b08c 100644 --- a/test/log/2112 +++ b/test/log/2112 @@ -9,7 +9,7 @@ 1999-03-02 09:44:33 this will fail to verify the cert name and fallback to unencrypted 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userr@test.ex 1999-03-02 09:44:33 this will pass the cert verify including name check -1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for users@test.ex +1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for user_s@test.ex 1999-03-02 09:44:33 Start queue run: pid=pppp -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 [ip4.ip4.ip4.ip4] SSL verify error: depth=0 error=unable to get local issuer certificate cert=/CN=server1.example.com 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=client_x T=send_to_server_failcert defer (-37) H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: TLS session: (SSL_connect): error: <> @@ -31,7 +31,7 @@ 1999-03-02 09:44:33 10HmbB-0005vi-00 => userr@test.ex R=client_r T=send_to_server_req_failname H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbG-0005vi-00" 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed 1999-03-02 09:44:33 10HmbC-0005vi-00 no IP address found for host noway.example.com -1999-03-02 09:44:33 10HmbC-0005vi-00 => users@test.ex R=client_s T=send_to_server_req_passname H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbH-0005vi-00" +1999-03-02 09:44:33 10HmbC-0005vi-00 => user_s@test.ex R=client_s T=send_to_server_req_passname H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbH-0005vi-00" 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed 1999-03-02 09:44:33 End queue run: pid=pppp -qf @@ -44,4 +44,4 @@ 1999-03-02 09:44:33 TLS error on connection from the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] (SSL_accept): error: <> 1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbA-0005vi-00@myhost.test.ex for userq@test.ex 1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" S=sss id=E10HmbB-0005vi-00@myhost.test.ex for userr@test.ex -1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" S=sss id=E10HmbC-0005vi-00@myhost.test.ex for users@test.ex +1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" S=sss id=E10HmbC-0005vi-00@myhost.test.ex for user_s@test.ex diff --git a/test/log/2133 b/test/log/2133 index 2341ff959..0d9e93112 100644 --- a/test/log/2133 +++ b/test/log/2133 @@ -11,7 +11,7 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 TLS session: (SSL_connect): error: <> 1999-03-02 09:44:33 10HmaY-0005vi-00 => userr@test.ex R=client_r T=send_to_server_req_failname H=the.local.host.name [ip4.ip4.ip4.ip4] C="250 OK id=10HmbC-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 10HmaZ-0005vi-00 => users@test.ex R=client_s T=send_to_server_req_passname H=server1.example.com [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbD-0005vi-00" +1999-03-02 09:44:33 10HmaZ-0005vi-00 => user_s@test.ex R=client_s T=send_to_server_req_passname H=server1.example.com [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbD-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 [ip4.ip4.ip4.ip4] SSL verify error: certificate name mismatch: DN="/CN=server1.example.com" H="the.local.host.name" 1999-03-02 09:44:33 10HmbA-0005vi-00 => usert@test.ex R=client_t T=send_to_server_req_failcarryon H=the.local.host.name [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/CN=server1.example.com" C="250 OK id=10HmbE-0005vi-00" diff --git a/test/mail/0600.CALLER b/test/mail/0600.CALLER index e9a50054e..9b2bf6100 100644 --- a/test/mail/0600.CALLER +++ b/test/mail/0600.CALLER @@ -11,13 +11,14 @@ x-test-header-good2: ßüöä€ÜÖÄ´ऑकजᐁᑌᑕ𫝆𫟘 x-test-header-too-short: Ã.Ã.Ã.ä-â‚.-Ü.Ã..Ã.-Â.-à..-à¤.-à¤.-á.-á‘.-á..-ð«..ð«Ÿ. x-test-header-too-long: øˆˆˆˆ-ä-øˆˆˆˆ--Ö-Ä-´-ऑ-क-ज-ᐁ-ᑌ-ᑕ-ø€€€€ð«Ÿ† x-test-header-too-big: ÷€€€-----󀀀 +x-test-header-truncated: ã Subject: This is a test message. Message-Id: From: CALLER@the.local.host.name Date: Tue, 2 Mar 1999 09:44:33 +0000 X-local-user: uid=CALLER_UID gid=CALLER_GID X-body-linecount: 3 -X-message-linecount: 16 +X-message-linecount: 17 X-received-count: 1 This is a test message. diff --git a/test/mail/4560.a b/test/mail/4560.a index 8f9735fe2..571555397 100644 --- a/test/mail/4560.a +++ b/test/mail/4560.a @@ -1,6 +1,6 @@ From CALLER@bloggs.com Tue Mar 02 09:44:33 1999 Authentication-Results: test.ex; - arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.client-ip=127.0.0.1 + arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1 Received: from [127.0.0.1] (helo=xxx) by test.ex with smtp (Exim x.yz) (envelope-from ) @@ -28,8 +28,8 @@ This is a simple test. From CALLER@bloggs.com Tue Mar 02 09:44:33 1999 Authentication-Results: test.ex; - iprev=pass (localhost) smtp.client-ip=127.0.0.1; - arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.client-ip=127.0.0.1 + iprev=pass (localhost) smtp.remote-ip=127.0.0.1; + arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1 Received: from localhost ([127.0.0.1] helo=test.ex) by test.ex with esmtp (Exim x.yz) (envelope-from ) @@ -60,20 +60,20 @@ This is a test body. From CALLER@bloggs.com Tue Mar 02 09:44:33 1999 Authentication-Results: test.ex; - iprev=pass (localhost) smtp.client-ip=127.0.0.1; - arc=pass (i=2) header.s=sel arc.oldest-pass=1 smtp.client-ip=127.0.0.1 + iprev=pass (localhost) smtp.remote-ip=127.0.0.1; + arc=pass (i=2) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1 Received: from localhost ([127.0.0.1] helo=test.ex) by test.ex with esmtp (Exim x.yz) (envelope-from ) id 10HmbC-0005vi-00 for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 ARC-Seal: i=2; cv=pass; a=rsa-sha256; d=test.ex; s=sel; - b=MYYY1fE5A9EbBkaRpJD6OvFBUALCd7U3J/zro6xlQJXJLW+NaeDCRtStbk/ARCcTkOgnX7ZOzs - iLuOphCpepZTMAGWhZtit1d19HK33+s0nCIzvx31BNqpEn3xewb4/jtxBvkyVomuUudSrjbO+u - 8nNmcIB7siu2S8lrTSj1PPw=; + b=gQvDl2aKy+MEWgwP9A31sLHf4b6zOSwZhglgBrO2apeKFIRv54YTKVe44/6D0iJurZM8mjndMy + u78sFMRrBb6zm99rUiEg48TDqIXOCJkSBpArs2liF34HdzpCsJxMgIIhxxNyVzjGGQdQCvSxm6 + e7tMbokkI+KFMnpG+G1Xjyk=; ARC-Authentication-Results: i=2; test.ex; - iprev=pass (localhost) smtp.client-ip=127.0.0.1; - arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.client-ip=127.0.0.1 + iprev=pass (localhost) smtp.remote-ip=127.0.0.1; + arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1 ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed; d=test.ex; s=sel; bh=HUzfKKxIjPIa07lkj5uzDQ3q5YTRF/NwAUE7dhrrfvs=; h=Subject; @@ -81,8 +81,8 @@ ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed; d=test.ex; s=sel; P4RkRsmKXqHCoaOiSOqLvBvc8822Ap0l7F/cT2Gk3VRR5ITZI2piAsgLzFpLOEJsGwGVdYsNdx 5rxBKMPvXAWZip//tBngMRw=; Authentication-Results: test.ex; - iprev=pass (localhost) smtp.client-ip=127.0.0.1; - arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.client-ip=127.0.0.1 + iprev=pass (localhost) smtp.remote-ip=127.0.0.1; + arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1 Received: from localhost ([127.0.0.1] helo=test.ex) by test.ex with esmtp (Exim x.yz) (envelope-from ) @@ -113,20 +113,20 @@ This is a test body. From CALLER@bloggs.com Tue Mar 02 09:44:33 1999 Authentication-Results: test.ex; - iprev=pass (localhost) smtp.client-ip=127.0.0.1; - arc=pass (i=3) header.s=sel arc.oldest-pass=2 smtp.client-ip=127.0.0.1 + iprev=pass (localhost) smtp.remote-ip=127.0.0.1; + arc=pass (i=3) header.s=sel arc.oldest-pass=2 smtp.remote-ip=127.0.0.1 Received: from localhost ([127.0.0.1] helo=test.ex) by test.ex with esmtp (Exim x.yz) (envelope-from ) id 10HmbG-0005vi-00 for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 ARC-Seal: i=3; cv=pass; a=rsa-sha256; d=test.ex; s=sel; - b=e7M+4ujsfzQumNrl/4TxXorL9CZosw/g881Ds0GRE5adcIum+IP7QubcIOVCPvUBUqypYDiLRp - MROYzmkSCE2GIWuzaQP/3K5qLPyScqHJvS7IfRhccWQt1TsG7HVsAnHZnLQqtRqOH7txQMtjpy - vtwBO70hk9GxKl9D/+cJ41k=; + b=advgCcXZhwJFZi5rzQgnThsSOX6MsCpnXWxyub3UbuQI5RonZOw7SwEVJ2j4Q32z1d54wws1/c + 2MJeB2ChZUy+J0rNrXLEWsZZtOrQDx1fEaGL7sXC8RYshnkboBiN8lbkuoZHUZWPILKIWd5V2M + pN4yMCO6kQ0wyOoUj8JousQ=; ARC-Authentication-Results: i=3; test.ex; - iprev=pass (localhost) smtp.client-ip=127.0.0.1; - arc=pass (i=2) header.s=sel arc.oldest-pass=2 smtp.client-ip=127.0.0.1 + iprev=pass (localhost) smtp.remote-ip=127.0.0.1; + arc=pass (i=2) header.s=sel arc.oldest-pass=2 smtp.remote-ip=127.0.0.1 ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed; d=test.ex; s=sel; bh=31zA4VNQZ2yhHUh+7vWASIL9kKqo6pSym1QghgPyUkM=; h=Subject; @@ -134,20 +134,20 @@ ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed; d=test.ex; s=sel; Ke1FhjdC7iXPv/Dj86J40D9yib5y7YC9Ce3px0xJSXDD+ml1eDi45rVo9GDkm1zVG3eZdESktT Iv0EvpWIFn7dpelS30IKk78=; Authentication-Results: test.ex; - iprev=pass (localhost) smtp.client-ip=127.0.0.1; - arc=pass (i=2) header.s=sel arc.oldest-pass=2 smtp.client-ip=127.0.0.1 + iprev=pass (localhost) smtp.remote-ip=127.0.0.1; + arc=pass (i=2) header.s=sel arc.oldest-pass=2 smtp.remote-ip=127.0.0.1 Received: from localhost ([127.0.0.1] helo=test.ex) by test.ex with esmtp (Exim x.yz) (envelope-from ) id 10HmbF-0005vi-00 for za@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 ARC-Seal: i=2; cv=pass; a=rsa-sha256; d=test.ex; s=sel; - b=SN3ee5Elw4yqVxQjcNV978Nj4mHfyVpWxau+IX9cSo9oHfx8Cn7nbjjPK7gwwu+tu9i2//afhl - sc+7qNkz3TLDVlII0DU9obOKks4zQXboWKIs0/b4yGUf1m/KaJNU9ClMVzHHwvDkFYh1OMpqCn - oPvOntgmIYGBp2JYDaPubmc=; + b=odwQlZ9ZCMTWG30i3IPycNo+3kLWIngjWVJKGF8d8CfNEIEeK7ao89Wy9bPEwcnXHYN2HnDjtL + UXPiuo0BLPS4UCAvVdBd1Kr/rUHfoIysIFF6OggChI2ZeUqRlkD1GRV7C5LACsDrGR+HQQzXPI + ugidXguiQVpY4mMgc3Kbr44=; ARC-Authentication-Results: i=2; test.ex; - iprev=pass (localhost) smtp.client-ip=127.0.0.1; - arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.client-ip=127.0.0.1 + iprev=pass (localhost) smtp.remote-ip=127.0.0.1; + arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1 ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed; d=test.ex; s=sel; bh=31zA4VNQZ2yhHUh+7vWASIL9kKqo6pSym1QghgPyUkM=; h=Subject; @@ -155,8 +155,8 @@ ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed; d=test.ex; s=sel; Avoox5GkxPCBgYfO6wzh801k7F12Usgo7ryY8lOgQ/4OQ77TawNHFnlQ1WxhpaR/lUYkTXZXm2 LDzSoSVOQ0uFYg3cFzp54OA=; Authentication-Results: test.ex; - iprev=pass (localhost) smtp.client-ip=127.0.0.1; - arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.client-ip=127.0.0.1 + iprev=pass (localhost) smtp.remote-ip=127.0.0.1; + arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1 Received: from localhost ([127.0.0.1] helo=test.ex) by test.ex with esmtp (Exim x.yz) (envelope-from ) @@ -191,7 +191,7 @@ This is a generic mailinglist footer From CALLER@bloggs.com Tue Mar 02 09:44:33 1999 Authentication-Results: test.ex; - iprev=pass (localhost) smtp.client-ip=127.0.0.1; + iprev=pass (localhost) smtp.remote-ip=127.0.0.1; arc=fail (i=3 (cv)) Received: from localhost ([127.0.0.1] helo=test.ex) by test.ex with esmtp (Exim x.yz) @@ -199,12 +199,12 @@ Received: from localhost ([127.0.0.1] helo=test.ex) id 10HmbL-0005vi-00 for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 ARC-Seal: i=3; cv=fail; a=rsa-sha256; d=test.ex; s=sel; - b=SWUvDQ1P3lgo13tJJeM68YmtvWI7gQqNWkCotGXdMN4wBcOpHPWI1oWcXb8uXu0VZOGi7tnznT - GokNUeB0MLtwsYMEr1JTlffMvwxqWaD37CmUsWg7JrTJ2NXPZ1qHKT21oFUvFEvkjd/RuoBiXJ - G7jbR5IG8oefz5Juq/ymDXU=; + b=SwyS6CAxe1WUpQ6/gjhehp05c2J3qn5TgqiEzNZENLQ0LmoFesan/Hs/WUXsu68TWbk12zSYGl + j8SymB40wpTVbyI0nB9X3f/EV35apVdZCCbb7fhDcItiaveQAYAQjupnD1Gzf7bvkFnHUNIyvc + mBRUsVzafYLyWHjoPimb0QE=; ARC-Authentication-Results: i=3; test.ex; - iprev=pass (localhost) smtp.client-ip=127.0.0.1; - arc=fail (i=2)(AMS body hash miscompare) header.s=sel arc.oldest-pass=0 smtp.client-ip=127.0.0.1 + iprev=pass (localhost) smtp.remote-ip=127.0.0.1; + arc=fail (i=2)(AMS body hash miscompare) header.s=sel arc.oldest-pass=0 smtp.remote-ip=127.0.0.1 ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed; d=test.ex; s=sel; bh=31zA4VNQZ2yhHUh+7vWASIL9kKqo6pSym1QghgPyUkM=; h=Subject; @@ -212,28 +212,28 @@ ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed; d=test.ex; s=sel; Ke1FhjdC7iXPv/Dj86J40D9yib5y7YC9Ce3px0xJSXDD+ml1eDi45rVo9GDkm1zVG3eZdESktT Iv0EvpWIFn7dpelS30IKk78=; Authentication-Results: test.ex; - iprev=pass (localhost) smtp.client-ip=127.0.0.1; - arc=fail (i=2)(AMS body hash miscompare) header.s=sel arc.oldest-pass=0 smtp.client-ip=127.0.0.1 + iprev=pass (localhost) smtp.remote-ip=127.0.0.1; + arc=fail (i=2)(AMS body hash miscompare) header.s=sel arc.oldest-pass=0 smtp.remote-ip=127.0.0.1 Received: from localhost ([127.0.0.1] helo=test.ex) by test.ex with esmtp (Exim x.yz) (envelope-from ) id 10HmbK-0005vi-00 for za@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Authentication-Results: test.ex; - iprev=pass (localhost) smtp.client-ip=127.0.0.1; - arc=pass (i=2) header.s=sel arc.oldest-pass=1 smtp.client-ip=127.0.0.1 + iprev=pass (localhost) smtp.remote-ip=127.0.0.1; + arc=pass (i=2) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1 Received: from localhost ([127.0.0.1] helo=test.ex) by test.ex with esmtp (Exim x.yz) (envelope-from ) id 10HmbJ-0005vi-00 for mza@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 ARC-Seal: i=2; cv=pass; a=rsa-sha256; d=test.ex; s=sel; - b=MYYY1fE5A9EbBkaRpJD6OvFBUALCd7U3J/zro6xlQJXJLW+NaeDCRtStbk/ARCcTkOgnX7ZOzs - iLuOphCpepZTMAGWhZtit1d19HK33+s0nCIzvx31BNqpEn3xewb4/jtxBvkyVomuUudSrjbO+u - 8nNmcIB7siu2S8lrTSj1PPw=; + b=gQvDl2aKy+MEWgwP9A31sLHf4b6zOSwZhglgBrO2apeKFIRv54YTKVe44/6D0iJurZM8mjndMy + u78sFMRrBb6zm99rUiEg48TDqIXOCJkSBpArs2liF34HdzpCsJxMgIIhxxNyVzjGGQdQCvSxm6 + e7tMbokkI+KFMnpG+G1Xjyk=; ARC-Authentication-Results: i=2; test.ex; - iprev=pass (localhost) smtp.client-ip=127.0.0.1; - arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.client-ip=127.0.0.1 + iprev=pass (localhost) smtp.remote-ip=127.0.0.1; + arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1 ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed; d=test.ex; s=sel; bh=HUzfKKxIjPIa07lkj5uzDQ3q5YTRF/NwAUE7dhrrfvs=; h=Subject; @@ -241,8 +241,8 @@ ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed; d=test.ex; s=sel; P4RkRsmKXqHCoaOiSOqLvBvc8822Ap0l7F/cT2Gk3VRR5ITZI2piAsgLzFpLOEJsGwGVdYsNdx 5rxBKMPvXAWZip//tBngMRw=; Authentication-Results: test.ex; - iprev=pass (localhost) smtp.client-ip=127.0.0.1; - arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.client-ip=127.0.0.1 + iprev=pass (localhost) smtp.remote-ip=127.0.0.1; + arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1 Received: from localhost ([127.0.0.1] helo=test.ex) by test.ex with esmtp (Exim x.yz) (envelope-from ) @@ -277,16 +277,16 @@ This is a generic mailinglist footer From CALLER@bloggs.com Tue Mar 02 09:44:33 1999 Authentication-Results: test.ex; - iprev=pass (localhost) smtp.client-ip=127.0.0.1; - arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.client-ip=127.0.0.1 + iprev=pass (localhost) smtp.remote-ip=127.0.0.1; + arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1 Received: from localhost ([127.0.0.1] helo=test.ex) by test.ex with esmtp (Exim x.yz) (envelope-from ) id 10HmbO-0005vi-00 for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Authentication-Results: test.ex; - iprev=pass (localhost) smtp.client-ip=127.0.0.1; - arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.client-ip=127.0.0.1 + iprev=pass (localhost) smtp.remote-ip=127.0.0.1; + arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1 Received: from localhost ([127.0.0.1] helo=test.ex) by test.ex with esmtp (Exim x.yz) (envelope-from ) @@ -317,7 +317,7 @@ This is a test body. From CALLER@bloggs.com Tue Mar 02 09:44:33 1999 Authentication-Results: test.ex; - iprev=pass (localhost) smtp.client-ip=127.0.0.1; + iprev=pass (localhost) smtp.remote-ip=127.0.0.1; dkim=pass header.d=dmarc.org header.s=clochette header.a=rsa-sha256; dkim=fail (body hash mismatch; body probably modified in transit) header.d=convivian.com header.s=default header.a=rsa-sha256; @@ -328,14 +328,14 @@ Received: from localhost ([127.0.0.1] helo=test.ex) id 10HmbQ-0005vi-00 for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 ARC-Seal: i=2; cv=fail; a=rsa-sha256; d=test.ex; s=sel; - b=cTfJCdk2kBIo+p9qyn5XD99OoJsGq5B2olKU9zbU2P7YrfsGYva+utsBO1hI4jAHUfJj191WV/ - YuxNGgTxlBHZxmKOEj4QeHSgYNXRx/0iJKFLGPX3k/oNFcjD2L35YhtpEfctsRawU3wU8QMm05 - m516OWV1S6tg0YR9MtS7kMc=; + b=e1ldkzDyxJIvQd+ZOylCkekKOj3WVUZiptsJYuoiM0tsBRoiHA5O6RDwrNzCQxRWT05PzW3GBy + Dkiejo2w30n9QBueQH4h8BvCl/QMlmmdaIy02ZKqfvtp1hxR125TREXdigK9ULQZF4rIrDma5S + hpd7e9cat3tVvL+aDVT6qBc=; ARC-Authentication-Results: i=2; test.ex; dkim=pass header.d=dmarc.org header.s=clochette header.a=rsa-sha256; dkim=fail (body hash mismatch; body probably modified in transit) header.d=convivian.com header.s=default header.a=rsa-sha256; - arc=fail (i=1)(AMS body hash miscompare) header.s=default arc.oldest-pass=0 smtp.client-ip=127.0.0.1 + arc=fail (i=1)(AMS body hash miscompare) header.s=default arc.oldest-pass=0 smtp.remote-ip=127.0.0.1 ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed; d=test.ex; s=sel; bh=DXU/xKzzQYeoYB254nZ0AzNm7z2YZ//FpTnhgIjPyt8=; h=Sender:Content-Type:Reply-To:From:List-Subscribe:List-Help:List-Post: @@ -348,7 +348,7 @@ Authentication-Results: test.ex; dkim=pass header.d=dmarc.org header.s=clochette header.a=rsa-sha256; dkim=fail (body hash mismatch; body probably modified in transit) header.d=convivian.com header.s=default header.a=rsa-sha256; - arc=fail (i=1)(AMS body hash miscompare) header.s=default arc.oldest-pass=0 smtp.client-ip=127.0.0.1 + arc=fail (i=1)(AMS body hash miscompare) header.s=default arc.oldest-pass=0 smtp.remote-ip=127.0.0.1 Received: from [127.0.0.1] (helo=xxx) by test.ex with smtp (Exim x.yz) (envelope-from ) @@ -481,7 +481,7 @@ http://lists.dmarc.org/mailman/listinfo/arc-discuss From CALLER@bloggs.com Tue Mar 02 09:44:33 1999 Authentication-Results: test.ex; - iprev=pass (localhost) smtp.client-ip=127.0.0.1; + iprev=pass (localhost) smtp.remote-ip=127.0.0.1; arc=none Received: from localhost ([127.0.0.1] helo=test.ex) by test.ex with esmtp (Exim x.yz) diff --git a/test/mail/4562.a b/test/mail/4562.a index c0e93411f..7346a7c2e 100644 --- a/test/mail/4562.a +++ b/test/mail/4562.a @@ -1,10 +1,10 @@ From CALLER@bloggs.com Tue Mar 02 09:44:33 1999 Authentication-Results: test.ex; - iprev=pass (localhost) smtp.client-ip=127.0.0.1; + iprev=pass (localhost) smtp.remote-ip=127.0.0.1; dkim=pass header.d=test.ex header.s=sel header.a=rsa-sha256; dkim=fail (body hash mismatch; body probably modified in transit) header.d=example.com header.s=sel header.a=rsa-sha256; - arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.client-ip=127.0.0.1 + arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1 Received: from localhost ([127.0.0.1] helo=test.ex) by test.ex with esmtp (Exim x.yz) (envelope-from ) diff --git a/test/scripts/1990-TCP-Fast-Open/1990 b/test/scripts/1990-TCP-Fast-Open/1990 index 3fffce2d4..04b41a7af 100644 --- a/test/scripts/1990-TCP-Fast-Open/1990 +++ b/test/scripts/1990-TCP-Fast-Open/1990 @@ -8,6 +8,7 @@ # option on the SYN, but the fast-output SMTP banner will not # be seen unless you also deliberately emulate a long path: # 'sudo tc qdisc add dev lo root netem delay 50ms' +# You'll need iproute-tc installed, for the tc command. # You'll need kernel-modules-extra installed, or you get # an unhelpful error from RTNETLINK. # To tidy up: 'sudo tc qdisc delete dev lo root' diff --git a/test/scripts/2100-OpenSSL/2112 b/test/scripts/2100-OpenSSL/2112 index b07b1c0ba..8dfb1dc06 100644 --- a/test/scripts/2100-OpenSSL/2112 +++ b/test/scripts/2100-OpenSSL/2112 @@ -40,7 +40,7 @@ Testing # exim -z 'this will pass the cert verify including name check' **** -exim users@test.ex +exim user_s@test.ex Testing **** # diff --git a/test/scripts/2100-OpenSSL/2133 b/test/scripts/2100-OpenSSL/2133 index 3b2221c9c..6b34de746 100644 --- a/test/scripts/2100-OpenSSL/2133 +++ b/test/scripts/2100-OpenSSL/2133 @@ -10,7 +10,7 @@ exim userr@test.ex Testing **** # this will pass the cert verify including name check -exim users@test.ex +exim user_s@test.ex Testing **** # this will fail to verify the cert name but carry on (try-verify mode) -- 2.25.1