git://git.exim.org / exim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e4520c7)
Testsuite: output changes resulting
authorJeremy Harris <jgh146exb@wizmail.org>
Fri, 1 Dec 2023 16:51:13 +0000 (16:51 +0000)
committerJeremy Harris <jgh146exb@wizmail.org>
Fri, 1 Dec 2023 17:29:20 +0000 (17:29 +0000)
test/log/2102 patch | blob | history
test/stdout/4650 patch | blob | history

diff --git a/test/log/2102 b/test/log/2102
index 4702a6c7e9a7db4964ad971fbe1d0f30158e1d44..b20cf6100152fc2b3552e6977fa57f2dc6d1f44e 100644 (file)
--- a/test/log/2102
+++ b/test/log/2102
@@ -1,49 +1,49 @@
-1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER <CALLER@test.ex> R=abc T=local_delivery
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER <CALLER@test.ex> R=abc T=local_delivery
-1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => CALLER <CALLER@test.ex> R=abc T=local_delivery
-1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbA-0005vi-00 => CALLER <CALLER@test.ex> R=abc T=local_delivery
-1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
-1999-03-02 09:44:33 End queue run: pid=pppp -qf
+1999-03-02 09:44:33 Start queue run: pid=p1234 -qf
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 => CALLER <CALLER@test.ex> R=abc T=local_delivery
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 Completed
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 => CALLER <CALLER@test.ex> R=abc T=local_delivery
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 Completed
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 => CALLER <CALLER@test.ex> R=abc T=local_delivery
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 Completed
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 => CALLER <CALLER@test.ex> R=abc T=local_delivery
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 Completed
+1999-03-02 09:44:33 End queue run: pid=p1234 -qf
 
 ******** SERVER ********
 
 ******** SERVER ********
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 Our cert SN: <CN=server1.example_ec.com>
+1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D
+1999-03-02 09:44:33 Our cert SN: <CN=server1.example.com>
 1999-03-02 09:44:33 Peer did not present a cert
 1999-03-02 09:44:33 Peer did not present a cert
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= a@test.ex H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
-1999-03-02 09:44:33 Our cert SN: <CN=server1.example_ec.com>
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= a@test.ex H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
+1999-03-02 09:44:33 Our cert SN: <CN=server1.example.com>
 1999-03-02 09:44:33 Peer did not present a cert
 1999-03-02 09:44:33 Peer did not present a cert
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= "name with spaces"@test.ex H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= "name with spaces"@test.ex H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
 1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>>
 1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>>
-1999-03-02 09:44:33 Our cert SN: <CN=server1.example_ec.com>
+1999-03-02 09:44:33 Our cert SN: <CN=server1.example.com>
 1999-03-02 09:44:33 Peer cert:
 1999-03-02 09:44:33 ver 2
 1999-03-02 09:44:33 SR  <c9>
 1999-03-02 09:44:33 SN  <CN=server2.example.com>
 1999-03-02 09:44:33 IN  <CN=clica Signing Cert rsa,O=example.com>
 1999-03-02 09:44:33 IN/O <example.com>
 1999-03-02 09:44:33 Peer cert:
 1999-03-02 09:44:33 ver 2
 1999-03-02 09:44:33 SR  <c9>
 1999-03-02 09:44:33 SN  <CN=server2.example.com>
 1999-03-02 09:44:33 IN  <CN=clica Signing Cert rsa,O=example.com>
 1999-03-02 09:44:33 IN/O <example.com>
-1999-03-02 09:44:33 NB/r <Nov  1 12:34:30 2012 GMT>
-1999-03-02 09:44:33 NB   <Nov  1 12:34:30 2012 +0000>
-1999-03-02 09:44:33 NB/i <1351773270>
-1999-03-02 09:44:33 NA/i <2143283670>
-1999-03-02 09:44:33 NA   <Dec  1 12:34:30 2037 +0000>
+1999-03-02 09:44:33 NB/r <Nov  1 12:34:56 2019 GMT>
+1999-03-02 09:44:33 NB   <Nov  1 12:34:56 2019 +0000>
+1999-03-02 09:44:33 NB/i <1572611696>
+1999-03-02 09:44:33 NA/i <2364208496>
+1999-03-02 09:44:33 NA   <Dec  1 12:34:56 2044 +0000>
 1999-03-02 09:44:33 SA  <sha256WithRSAEncryption>
 1999-03-02 09:44:33 SA  <sha256WithRSAEncryption>
-1999-03-02 09:44:33 SG  <5d:2c:8d:dc:bf:45:79:5d:60:8e:57:08:fe:10:da:9d:34:eb:e6:b0:b0:5b:88:16:70:97:0b:ab:b4:1c:a8:04:99:40:84:1b:ed:45:6c:fc:30:9c:f2:f2:44:28:f3:76:28:a0:14:49:9f:a1:00:ac:2b:cf:88:68:ea:bc:21:d2:4b:29:fa:5e:38:d8:78:52:ae:0e:d8:ef:20:84:f3:43:8a:05:ea:17:f7:37:89:a8:9b:3a:ba:41:26:d2:e4:0f:a5:21:f6:c1:e7:15:90:b0:c4:5b:2b:d0:05:23:e7:84:45:77:24:b1:34:8f:24:a0:9b:69:39:52:0a:ec:b3:38:1e:70:47:60:23:ea:f7:3d:c7:0c:20:de:dd:d5:6f:56:76:db:74:24:c4:4e:13:e1:ee:0a:b5:c1:72:95:38:08:11:bc:e4:fe:d5:be:5f:80:1d:5d:c9:48:b8:40:43:5a:3e:2a:fa:bb:e7:df:29:79:d2:c2:3a:2d:f4:4b:02:f1:c3:05:88:84:9a:b4:af:03:c0:55:2b:72:b0:ba:f4:3b:5d:09:8f:6e:06:2a:52:0d:a4:4a:38:06:2c:c3:4c:83:a9:91:d9:6a:ed:a5:a1:fe:67:44:97:2c:f1:f9:4f:36:1f:92:57:0c:76:7a:d3:e0:6f:04:72:11:db:ae:4b:42>
+1999-03-02 09:44:33 SG  <43:92:24:83:bd:6e:40:cd:67:7e:2a:5d:fb:9d:89:f6:a2:9b:c5:06:47:d0:db:8e:20:52:59:97:b0:7f:69:f1:96:05:89:2f:6c:f8:e1:22:f7:28:1e:07:07:2b:81:47:05:1f:d7:74:f8:49:af:b4:86:15:7c:46:82:cd:63:f4:f1:e2:d8:d1:ba:6e:a5:63:92:27:97:5a:69:0e:42:b8:9f:78:09:9d:d5:0c:1e:37:49:a5:ac:35:c8:6a:ce:1e:50:69:27:a9:18:ab:19:50:10:64:2a:d9:4c:8a:47:79:4b:05:b8:fe:cb:c2:7c:ef:0e:99:46:a8:4a:68:52:33:95:8b:fe:0d:b1:4a:e3:21:5e:55:3a:4a:7e:21:91:0e:f7:85:d5:36:da:4b:22:51:16:a0:b7:7c:a5:d8:f6:a6:b2:15:3d:36:d6:01:46:aa:7a:9c:b9:52:24:36:d0:40:3d:cf:62:9b:b4:60:37:9a:5a:a5:f1:f8:e4:bc:30:11:05:3e:ad:4c:ef:6a:81:ca:e3:73:e0:1e:44:8c:9a:e1:41:41:c6:59:97:be:01:84:8b:30:da:9d:cb:a4:93:d8:54:d0:c6:58:eb:8c:ff:ef:7e:d3:40:8d:59:88:12:db:36:63:df:a2:1a:46:14:c6:c1:8a:75:aa:70:1f:4d:0c>
 1999-03-02 09:44:33 SAN <DNS=server2.example.com\nDNS=*.test.ex>
 1999-03-02 09:44:33 OCU <http://oscp.example.com/>
 1999-03-02 09:44:33 (no CRU)
 1999-03-02 09:44:33 SAN <DNS=server2.example.com\nDNS=*.test.ex>
 1999-03-02 09:44:33 OCU <http://oscp.example.com/>
 1999-03-02 09:44:33 (no CRU)
-1999-03-02 09:44:33 md5    fingerprint 1B701FAEF70F57451A50B2A91EF011EE
-1999-03-02 09:44:33 sha1   fingerprint DE737222042460A49F3E53A3FE05B9313E57327B
-1999-03-02 09:44:33 sha256 fingerprint D64B951B475CAB05CD7CFDBC4A1E4754D448FA554D6BB0411E065A5A885A013A
-1999-03-02 09:44:33 der_b64 MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIxMTAxMTIzNDMwWhcNMzcxMjAxMTIzNDMwWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxHHdAsbLWHT6remjd2Rw+Tb1EDjDgHkhc6X2d3KyEvcNkbp+RMhyC0grYbue0tOp8SU+3U+TjLAsc3xesuGJYmsC8ttWf3fNOCM7TmE80fSzbZ4j6B8z6jbGT+fblaunHTRJF5H+yRKrV+Nfi7Pqu0YO3dnlGuehg8jjDUq3QrPTSU67P7DyDQv68cgWmck4h9OOC/T81hkNJk99ThWMkTkj8WsmdLVysK8suaniNuhDQvRmF/OZBUGb6hqEdRYDz3rIjrENHCtOygPFtZhc/YNSYMokIcJw3mTPLwTE0GbCfLowhkjPYW6J7ZuOlTTQqF/9b3yIYTpmm8sGVacEEwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgggkqLnRlc3QuZXiCE3NlcnZlcjIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAF0sjdy/RXldYI5XCP4Q2p006+awsFuIFnCXC6u0HKgEmUCEG+1FbPwwnPLyRCjzdiigFEmfoQCsK8+IaOq8IdJLKfpeONh4Uq4O2O8ghPNDigXqF/c3iaibOrpBJtLkD6Uh9sHnFZCwxFsr0AUj54RFdySxNI8koJtpOVIK7LM4HnBHYCPq9z3HDCDe3dVvVnbbdCTEThPh7gq1wXKVOAgRvOT+1b5fgB1dyUi4QENaPir6u+ffKXnSwjot9EsC8cMFiISatK8DwFUrcrC69DtdCY9uBipSDaRKOAYsw0yDqZHZau2lof5nRJcs8flPNh+SVwx2etPgbwRyEduuS0I=
+1999-03-02 09:44:33 md5    fingerprint 0EC720D50B90219A2126318C8AC16427
+1999-03-02 09:44:33 sha1   fingerprint DDFDB41DEF1CB4425B7656C037A4614D194E1148
+1999-03-02 09:44:33 sha256 fingerprint 30C1CFCE92CA95887E8B4FDE58BD32E5FFEFBA9AF6F5A856FC5D33AB8DF8D9BF
+1999-03-02 09:44:33 der_b64 MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkxMTAxMTIzNDU2WhcNNDQxMjAxMTIzNDU2WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAof6VHfuK2WHcXTyvWXXmk98Smc4wLxTqU7/Lwh+hEqGcFNjlmv6A3blSUX76X/YCIjJljmy+i1HWyEevpEp1782h9W1OwrFZ4aUnJK+UMpThK66Dr8Xg26S6QPOebdteGkl/96hJSs0T3iLQauw/4E1fRe03ev+Ui2egtwtcFD8cmrVbE/UB47ClkXbZ3/Sz7VQGrRcAnvPe1rtTQmOxLCkS/8NLTXIx54wdEXJVcu83WciM+DeiCc1MqxO+dsJIswrGZ6gJ4Zc6NwiRy/AJuKSNU4PG/6nZEx0x3mzDTFXvqfe6hTYqCeKjFxH/uhTBn5lmClk6amehN234eyXsPQIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgggkqLnRlc3QuZXiCE3NlcnZlcjIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAEOSJIO9bkDNZ34qXfudifaim8UGR9DbjiBSWZewf2nxlgWJL2z44SL3KB4HByuBRwUf13T4Sa+0hhV8RoLNY/Tx4tjRum6lY5Inl1ppDkK4n3gJndUMHjdJpaw1yGrOHlBpJ6kYqxlQEGQq2UyKR3lLBbj+y8J87w6ZRqhKaFIzlYv+DbFK4yFeVTpKfiGRDveF1TbaSyJRFqC3fKXY9qayFT021gFGqnqcuVIkNtBAPc9im7RgN5papfH45LwwEQU+rUzvaoHK43PgHkSMmuFBQcZZl74BhIsw2p3LpJPYVNDGWOuM/+9+00CNWYgS2zZj36IaRhTGwYp1qnAfTQw=
 1999-03-02 09:44:33 cipher: TLS1.x:ke-RSA-AES256-SHAnnn:xxx
 1999-03-02 09:44:33 cipher_ TLS1.x:ke_RSA_WITH_ci_mac
 1999-03-02 09:44:33 ver:    TLS1.x
 1999-03-02 09:44:33 cipher: TLS1.x:ke-RSA-AES256-SHAnnn:xxx
 1999-03-02 09:44:33 cipher_ TLS1.x:ke_RSA_WITH_ci_mac
 1999-03-02 09:44:33 ver:    TLS1.x
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= b@test.ex H=(rhu.barb) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server2.example.com" S=sss
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 <= b@test.ex H=(rhu.barb) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server2.example.com" S=sss
+1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D
 1999-03-02 09:44:33 Our cert SN: <CN=server1.example_ec.com>
 1999-03-02 09:44:33 Peer did not present a cert
 1999-03-02 09:44:33 Our cert SN: <CN=server1.example_ec.com>
 1999-03-02 09:44:33 Peer did not present a cert
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= c@test.ex H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx CV=no S=sss
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 <= c@test.ex H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx CV=no S=sss
diff --git a/test/stdout/4650 b/test/stdout/4650
index 4da1909c6e64a804a0dfe18c3f7f72d7fc9ae058..d3e9ad711ca3310dbe0fad9e6e360dac463fd2ba 100644 (file)
--- a/test/stdout/4650
+++ b/test/stdout/4650
@@ -68,7 +68,7 @@ align_dkim 5
 align_spf 5
 action 2
 arc 11
 align_spf 5
 action 2
 arc 11
-arc_policy $d json:[]
+arc_policy 1 json:[]
 job 10HmaY-000000005vi-0000
 reporter myhost.test.ex
 received 1692480217
 job 10HmaY-000000005vi-0000
 reporter myhost.test.ex
 received 1692480217
@@ -89,4 +89,4 @@ align_dkim 4
 align_spf 5
 action 2
 arc 11
 align_spf 5
 action 2
 arc 11
-arc_policy $d json:[]
+arc_policy 1 json:[]
Master Exim source repository