tests: update for log tracker time handling changes

since we now calculate the time in UTC rather than local time, the time
values of each test had to be touched. those should differ by `E10`
(3600 seconds) in most cases since we set the TZ to Europe/Vienna for
the tests.

Signed-off-by: Mira Limbeck <m.limbeck@proxmox.com>

diff --git a/tests/test_output_after_queue b/tests/test_output_after_queue
index dfcd4eec2c431d6a7ddc7c4f55a54ec1e1e0ad16..6e9f277b77edc1f6b2f10210cb18f981b019465a 100644 (file)
--- a/tests/test_output_after_queue
+++ b/tests/test_output_after_queue
@@ -5,11 +5,11 @@
 # End Query Options
 
 QENTRY: 21BCE3807B6
-CTIME: 5FDCCEB8
+CTIME: 5FDCC0A8
 SIZE: 2053
 CLIENT: pmg.localhost[192.168.22.40]
 MSGID: <xyz>
-TO:5FDCCEB8:21BCE3807B6:Q: from <mailtestsender2@localhost.localdomain> to <pmgtest@localhost> (381C6F5DFA39502F470)
+TO:5FDCC0A8:21BCE3807B6:Q: from <mailtestsender2@localhost.localdomain> to <pmgtest@localhost> (381C6F5DFA39502F470)
 SMTP:
 L00000002 Dec 18 15:46:00 pmg postfix/smtpd[24784]: connect from pmg.localhost[192.168.22.40]
 L00000003 Dec 18 15:46:00 pmg postfix/smtpd[24784]: 21BCE3807B6: client=pmg.localhost[192.168.22.40]
@@ -25,14 +25,14 @@ L0000000A Dec 18 15:46:00 pmg postfix/lmtp[24788]: 21BCE3807B6: to=<pmgtest@loca
 L0000000B Dec 18 15:46:00 pmg postfix/qmgr[24651]: 21BCE3807B6: removed
 
 QENTRY: CFC5F42740
-CTIME: 5FDCCFCE
+CTIME: 5FDCC1BE
 SIZE: 7102
 CLIENT: test.localdomain[192.168.22.40]
 MSGID: <xyz>
-TO:5FDCCFCE:CFC5F42740:A: from <test@test.localdomain> to <test4@localhost> (88F2E42667)
-TO:5FDCCFCE:CFC5F42740:A: from <test@test.localdomain> to <test3@localhost> (88F2E42667)
-TO:5FDCCFCE:CFC5F42740:A: from <test@test.localdomain> to <test2@localhost> (88F2E42667)
-TO:5FDCCFCE:CFC5F42740:A: from <test@test.localdomain> to <test1@localhost> (88F2E42667)
+TO:5FDCC1BE:CFC5F42740:A: from <test@test.localdomain> to <test4@localhost> (88F2E42667)
+TO:5FDCC1BE:CFC5F42740:A: from <test@test.localdomain> to <test3@localhost> (88F2E42667)
+TO:5FDCC1BE:CFC5F42740:A: from <test@test.localdomain> to <test2@localhost> (88F2E42667)
+TO:5FDCC1BE:CFC5F42740:A: from <test@test.localdomain> to <test1@localhost> (88F2E42667)
 SMTP:
 L0000000C Dec 18 15:50:34 proxmox-new postfix/smtpd[13169]: connect from test.localdomain[192.168.22.40]
 L0000000D Dec 18 15:50:34 proxmox-new postfix/smtpd[13169]: CFC5F42740: client=test.localdomain[192.168.22.40]
@@ -55,14 +55,14 @@ L00000022 Dec 18 15:50:38 proxmox-new postfix/lmtp[13174]: CFC5F42740: to=<test4
 L00000023 Dec 18 15:50:38 proxmox-new postfix/qmgr[18171]: CFC5F42740: removed
 
 QENTRY: 88F2E42667
-CTIME: 5FDCCFCE
+CTIME: 5FDCC1BE
 SIZE: 8037
 CLIENT: localhost.localdomain[127.0.0.1],
 MSGID: <xyz>
-TO:5FDCCFCE:88F2E42667:2: from <test@test.localdomain> to <test4@localhost> (192.168.22.40[192.168.22.40]:25)
-TO:5FDCCFCE:88F2E42667:2: from <test@test.localdomain> to <test3@localhost> (192.168.22.40[192.168.22.40]:25)
-TO:5FDCCFCE:88F2E42667:2: from <test@test.localdomain> to <test2@localhost> (192.168.22.40[192.168.22.40]:25)
-TO:5FDCCFCE:88F2E42667:2: from <test@test.localdomain> to <test1@localhost> (192.168.22.40[192.168.22.40]:25)
+TO:5FDCC1BE:88F2E42667:2: from <test@test.localdomain> to <test4@localhost> (192.168.22.40[192.168.22.40]:25)
+TO:5FDCC1BE:88F2E42667:2: from <test@test.localdomain> to <test3@localhost> (192.168.22.40[192.168.22.40]:25)
+TO:5FDCC1BE:88F2E42667:2: from <test@test.localdomain> to <test2@localhost> (192.168.22.40[192.168.22.40]:25)
+TO:5FDCC1BE:88F2E42667:2: from <test@test.localdomain> to <test1@localhost> (192.168.22.40[192.168.22.40]:25)
 SMTP:
 L00000014 Dec 18 15:50:38 proxmox-new postfix/smtpd[13179]: connect from localhost.localdomain[127.0.0.1]
 L00000015 Dec 18 15:50:38 proxmox-new postfix/smtpd[13179]: 88F2E42667: client=localhost.localdomain[127.0.0.1], orig_client=test.localdomain[192.168.22.40]
@@ -77,19 +77,19 @@ L00000026 Dec 18 15:50:38 proxmox-new postfix/smtp[13180]: 88F2E42667: to=<test3
 L00000027 Dec 18 15:50:38 proxmox-new postfix/smtp[13180]: 88F2E42667: to=<test4@localhost>, relay=192.168.22.40[192.168.22.40]:25, delay=0.15, delays=0.05/0/0.04/0.05, dsn=2.0.0, status=sent (250 2.0.0 Ok: queued as C928BF624F6)
 L00000028 Dec 18 15:50:38 proxmox-new postfix/qmgr[18171]: 88F2E42667: removed
 
-SMTPD: T5FDCCFDAL00000000
-CTIME: 5FDCCFDA
+SMTPD: T5FDCC1CAL00000000
+CTIME: 5FDCC1CA
 CLIENT: 10.0.0.1
-TO:5FDCCFDA:T5FDCCFDAL00000000:N: from <rbl_reject_test@localhost.localdomain> to <test@reject.localhost.localdomain>
+TO:5FDCC1CA:T5FDCC1CAL00000000:N: from <rbl_reject_test@localhost.localdomain> to <test@reject.localhost.localdomain>
 LOGS:
 L00000029 Dec 18 15:50:50 proxmox-new postfix/postscreen[32700]: NOQUEUE: reject: RCPT from [10.0.0.1]:34453: 550 5.7.1 Service unavailable; client [10.0.0.1] blocked using zen.spamhaus.org; from=<rbl_reject_test@localhost.localdomain>, to=<test@reject.localhost.localdomain>, proto=ESMTP, helo=<localhost.localdomain>
 
 QENTRY: 0022C3801B5
-CTIME: 5FDCD100
+CTIME: 5FDCC2F0
 SIZE: 2053
 CLIENT: pmg.localhost[192.168.22.40]
 MSGID: <dc730f87-0b1d-3ecf-b9a5-5b4d910be95f@localhost>
-TO:5FDCD100:0022C3801B5:B: from <mailtestsender2@localhost.localdomain> to <pmgtest@localhost> (none)
+TO:5FDCC2F0:0022C3801B5:B: from <mailtestsender2@localhost.localdomain> to <pmgtest@localhost> (none)
 SMTP:
 L0000002A Dec 18 15:55:43 pmg postfix/smtpd[29323]: connect from pmg.localhost[192.168.22.40]
 L0000002B Dec 18 15:55:44 pmg postfix/smtpd[29323]: 0022C3801B5: client=pmg.localhost[192.168.22.40]
@@ -104,10 +104,10 @@ L0000002D Dec 18 15:55:44 pmg postfix/qmgr[24651]: 0022C3801B5: from=<mailtestse
 L00000034 Dec 18 15:55:44 pmg postfix/lmtp[29327]: 0022C3801B5: to=<pmgtest@localhost>, relay=127.0.0.1[127.0.0.1]:10023, delay=0.07, delays=0.02/0.01/0.02/0.02, dsn=2.7.0, status=sent (250 2.7.0 BLOCKED (3802E45DFA503808B06))
 L00000035 Dec 18 15:55:44 pmg postfix/qmgr[24651]: 0022C3801B5: removed
 
-SMTPD: T5FDCD200L00000001
-CTIME: 5FDCD200
+SMTPD: T5FDCC3F0L00000001
+CTIME: 5FDCC3F0
 CLIENT: 192.0.2.0
-TO:5FDCD200:T5FDCD200L00000001:N: from <info@test.example> to <>
+TO:5FDCC3F0:T5FDCC3F0L00000001:N: from <info@test.example> to <>
 LOGS:
 L00000037 Dec 18 16:00:00 pmg postfix/postscreen[42055]: NOQUEUE: reject: RCPT from [192.0.2.0]:38834: 550 5.7.1 Service unavailable; client [192.0.2.0] blocked using testbl.example; from=<info@test.example>, to=<>, proto=ESMTP, helo=<testhost.example>
 

diff --git a/tests/test_output_after_queue_duplicate_msgid b/tests/test_output_after_queue_duplicate_msgid
index 80e29ddda314ab7b230324f0970eeb71a9bada26..9f8bb0c092e67d9deae5e211f13af0dbcab9201b 100644 (file)
--- a/tests/test_output_after_queue_duplicate_msgid
+++ b/tests/test_output_after_queue_duplicate_msgid
@@ -5,11 +5,11 @@
 # End Query Options
 
 QENTRY: A673520AB5
-CTIME: 5E26A944
+CTIME: 5E269B34
 SIZE: 162287
 CLIENT: localhost[127.0.0.1],
 MSGID: <redacted:msgid>
-TO:5E26A944:A673520AB5:2: from <redacted:returnpath@domain.tld> to <redacted:recipient@mydomain.tld> (192.168.1.002[192.168.1.002]:25)
+TO:5E269B34:A673520AB5:2: from <redacted:returnpath@domain.tld> to <redacted:recipient@mydomain.tld> (192.168.1.002[192.168.1.002]:25)
 SMTP:
 L0000000A Jan 21 07:33:24 pmghost postfix/smtpd[29375]: connect from localhost[127.0.0.1]
 L0000000B Jan 21 07:33:24 pmghost postfix/smtpd[29375]: A673520AB5: client=localhost[127.0.0.1], orig_client=pmghost.mydomain.tld[192.168.1.001]
@@ -21,11 +21,11 @@ L00000010 Jan 21 07:33:24 pmghost postfix/smtp[29376]: A673520AB5: to=<redacted:
 L00000011 Jan 21 07:33:24 pmghost postfix/qmgr[529]: A673520AB5: removed
 
 QENTRY: DEF2520A69
-CTIME: 5E26A944
+CTIME: 5E269B34
 SIZE: 161138
 CLIENT: pmghost.mydomain.tld[192.168.1.001]
 MSGID: <redacted:msgid>
-TO:5E26A944:DEF2520A69:A: from <redacted:returnpath@domain.tld> to <redacted:recipient@mydomain.tld> (A673520AB5)
+TO:5E269B34:DEF2520A69:A: from <redacted:returnpath@domain.tld> to <redacted:recipient@mydomain.tld> (A673520AB5)
 SMTP:
 L00000001 Jan 21 07:33:20 pmghost postfix/smtpd[29361]: connect from pmghost.mydomain.tld[192.168.1.001]
 L00000002 Jan 21 07:33:20 pmghost postfix/smtpd[29361]: DEF2520A69: client=pmghost.mydomain.tld[192.168.1.001]

diff --git a/tests/test_output_after_queue_host b/tests/test_output_after_queue_host
index 219bdb97cbbb39ce26ca1957eb13cbeb3e67cf70..90da86760c6df4bae0f628dbb4483fec968a1d84 100644 (file)
--- a/tests/test_output_after_queue_host
+++ b/tests/test_output_after_queue_host
@@ -6,11 +6,11 @@
 # End Query Options
 
 QENTRY: 21BCE3807B6
-CTIME: 5FDCCEB8
+CTIME: 5FDCC0A8
 SIZE: 2053
 CLIENT: pmg.localhost[192.168.22.40]
 MSGID: <xyz>
-TO:5FDCCEB8:21BCE3807B6:Q: from <mailtestsender2@localhost.localdomain> to <pmgtest@localhost> (381C6F5DFA39502F470)
+TO:5FDCC0A8:21BCE3807B6:Q: from <mailtestsender2@localhost.localdomain> to <pmgtest@localhost> (381C6F5DFA39502F470)
 SMTP:
 L00000002 Dec 18 15:46:00 pmg postfix/smtpd[24784]: connect from pmg.localhost[192.168.22.40]
 L00000003 Dec 18 15:46:00 pmg postfix/smtpd[24784]: 21BCE3807B6: client=pmg.localhost[192.168.22.40]
@@ -26,14 +26,14 @@ L0000000A Dec 18 15:46:00 pmg postfix/lmtp[24788]: 21BCE3807B6: to=<pmgtest@loca
 L0000000B Dec 18 15:46:00 pmg postfix/qmgr[24651]: 21BCE3807B6: removed
 
 QENTRY: 88F2E42667
-CTIME: 5FDCCFCE
+CTIME: 5FDCC1BE
 SIZE: 8037
 CLIENT: localhost.localdomain[127.0.0.1],
 MSGID: <xyz>
-TO:5FDCCFCE:88F2E42667:2: from <test@test.localdomain> to <test4@localhost> (192.168.22.40[192.168.22.40]:25)
-TO:5FDCCFCE:88F2E42667:2: from <test@test.localdomain> to <test3@localhost> (192.168.22.40[192.168.22.40]:25)
-TO:5FDCCFCE:88F2E42667:2: from <test@test.localdomain> to <test2@localhost> (192.168.22.40[192.168.22.40]:25)
-TO:5FDCCFCE:88F2E42667:2: from <test@test.localdomain> to <test1@localhost> (192.168.22.40[192.168.22.40]:25)
+TO:5FDCC1BE:88F2E42667:2: from <test@test.localdomain> to <test4@localhost> (192.168.22.40[192.168.22.40]:25)
+TO:5FDCC1BE:88F2E42667:2: from <test@test.localdomain> to <test3@localhost> (192.168.22.40[192.168.22.40]:25)
+TO:5FDCC1BE:88F2E42667:2: from <test@test.localdomain> to <test2@localhost> (192.168.22.40[192.168.22.40]:25)
+TO:5FDCC1BE:88F2E42667:2: from <test@test.localdomain> to <test1@localhost> (192.168.22.40[192.168.22.40]:25)
 SMTP:
 L00000014 Dec 18 15:50:38 proxmox-new postfix/smtpd[13179]: connect from localhost.localdomain[127.0.0.1]
 L00000015 Dec 18 15:50:38 proxmox-new postfix/smtpd[13179]: 88F2E42667: client=localhost.localdomain[127.0.0.1], orig_client=test.localdomain[192.168.22.40]
@@ -49,11 +49,11 @@ L00000027 Dec 18 15:50:38 proxmox-new postfix/smtp[13180]: 88F2E42667: to=<test4
 L00000028 Dec 18 15:50:38 proxmox-new postfix/qmgr[18171]: 88F2E42667: removed
 
 QENTRY: 0022C3801B5
-CTIME: 5FDCD100
+CTIME: 5FDCC2F0
 SIZE: 2053
 CLIENT: pmg.localhost[192.168.22.40]
 MSGID: <dc730f87-0b1d-3ecf-b9a5-5b4d910be95f@localhost>
-TO:5FDCD100:0022C3801B5:B: from <mailtestsender2@localhost.localdomain> to <pmgtest@localhost> (none)
+TO:5FDCC2F0:0022C3801B5:B: from <mailtestsender2@localhost.localdomain> to <pmgtest@localhost> (none)
 SMTP:
 L0000002A Dec 18 15:55:43 pmg postfix/smtpd[29323]: connect from pmg.localhost[192.168.22.40]
 L0000002B Dec 18 15:55:44 pmg postfix/smtpd[29323]: 0022C3801B5: client=pmg.localhost[192.168.22.40]

diff --git a/tests/test_output_after_queue_qid b/tests/test_output_after_queue_qid
index 6cc9a9ec796ba04e5e45803d7623538e436e4ecc..791d29a6c8eae3fa6263708c95d60063efc27ef5 100644 (file)
--- a/tests/test_output_after_queue_qid
+++ b/tests/test_output_after_queue_qid
@@ -6,11 +6,11 @@
 # End Query Options
 
 QENTRY: 0022C3801B5
-CTIME: 5FDCD100
+CTIME: 5FDCC2F0
 SIZE: 2053
 CLIENT: pmg.localhost[192.168.22.40]
 MSGID: <dc730f87-0b1d-3ecf-b9a5-5b4d910be95f@localhost>
-TO:5FDCD100:0022C3801B5:B: from <mailtestsender2@localhost.localdomain> to <pmgtest@localhost> (none)
+TO:5FDCC2F0:0022C3801B5:B: from <mailtestsender2@localhost.localdomain> to <pmgtest@localhost> (none)
 SMTP:
 L0000002A Dec 18 15:55:43 pmg postfix/smtpd[29323]: connect from pmg.localhost[192.168.22.40]
 L0000002B Dec 18 15:55:44 pmg postfix/smtpd[29323]: 0022C3801B5: client=pmg.localhost[192.168.22.40]

diff --git a/tests/test_output_after_queue_relay_before_lmtp b/tests/test_output_after_queue_relay_before_lmtp
index c4d0fdf062153d4dc57d2d3167db4474058459ea..df54c0941817f2d631980943bfd8bfebf6d45cde 100644 (file)
--- a/tests/test_output_after_queue_relay_before_lmtp
+++ b/tests/test_output_after_queue_relay_before_lmtp
@@ -5,11 +5,11 @@
 # End Query Options
 
 QENTRY: A673520AB5
-CTIME: 5E26A944
+CTIME: 5E269B34
 SIZE: 162287
 CLIENT: localhost[127.0.0.1],
 MSGID: <redacted:msgid>
-TO:5E26A944:A673520AB5:2: from <redacted:returnpath@domain.tld> to <redacted:recipient@mydomain.tld> (192.168.1.002[192.168.1.002]:25)
+TO:5E269B34:A673520AB5:2: from <redacted:returnpath@domain.tld> to <redacted:recipient@mydomain.tld> (192.168.1.002[192.168.1.002]:25)
 SMTP:
 L00000009 Jan 21 07:33:24 pmghost postfix/smtpd[29375]: connect from localhost[127.0.0.1]
 L0000000A Jan 21 07:33:24 pmghost postfix/smtpd[29375]: A673520AB5: client=localhost[127.0.0.1], orig_client=pmghost.mydomain.tld[192.168.1.001]
@@ -21,11 +21,11 @@ L0000000F Jan 21 07:33:24 pmghost postfix/smtp[29376]: A673520AB5: to=<redacted:
 L00000010 Jan 21 07:33:24 pmghost postfix/qmgr[529]: A673520AB5: removed
 
 QENTRY: DEF2520A69
-CTIME: 5E26A944
+CTIME: 5E269B34
 SIZE: 161138
 CLIENT: pmghost.mydomain.tld[192.168.1.001]
 MSGID: <redacted:msgid>
-TO:5E26A944:DEF2520A69:A: from <redacted:returnpath@domain.tld> to <redacted:recipient@mydomain.tld> (A673520AB5)
+TO:5E269B34:DEF2520A69:A: from <redacted:returnpath@domain.tld> to <redacted:recipient@mydomain.tld> (A673520AB5)
 SMTP:
 L00000001 Jan 21 07:33:20 pmghost postfix/smtpd[29361]: connect from pmghost.mydomain.tld[192.168.1.001]
 L00000002 Jan 21 07:33:20 pmghost postfix/smtpd[29361]: DEF2520A69: client=pmghost.mydomain.tld[192.168.1.001]

diff --git a/tests/test_output_after_queue_search_string b/tests/test_output_after_queue_search_string
index f658b9df31d23f5425ec3a0e3c13fd1d8e33a160..a513167b4c986667e5f5bf505fa4b87ace8bc09d 100644 (file)
--- a/tests/test_output_after_queue_search_string
+++ b/tests/test_output_after_queue_search_string
@@ -5,17 +5,17 @@
 # END:       2020-12-18 16:00:00 (1608307200)
 # End Query Options
 
-SMTPD: T5FDCCFDAL00000000
-CTIME: 5FDCCFDA
+SMTPD: T5FDCC1CAL00000000
+CTIME: 5FDCC1CA
 CLIENT: 10.0.0.1
-TO:5FDCCFDA:T5FDCCFDAL00000000:N: from <rbl_reject_test@localhost.localdomain> to <test@reject.localhost.localdomain>
+TO:5FDCC1CA:T5FDCC1CAL00000000:N: from <rbl_reject_test@localhost.localdomain> to <test@reject.localhost.localdomain>
 LOGS:
 L00000029 Dec 18 15:50:50 proxmox-new postfix/postscreen[32700]: NOQUEUE: reject: RCPT from [10.0.0.1]:34453: 550 5.7.1 Service unavailable; client [10.0.0.1] blocked using zen.spamhaus.org; from=<rbl_reject_test@localhost.localdomain>, to=<test@reject.localhost.localdomain>, proto=ESMTP, helo=<localhost.localdomain>
 
-SMTPD: T5FDCD200L00000001
-CTIME: 5FDCD200
+SMTPD: T5FDCC3F0L00000001
+CTIME: 5FDCC3F0
 CLIENT: 192.0.2.0
-TO:5FDCD200:T5FDCD200L00000001:N: from <info@test.example> to <>
+TO:5FDCC3F0:T5FDCC3F0L00000001:N: from <info@test.example> to <>
 LOGS:
 L00000037 Dec 18 16:00:00 pmg postfix/postscreen[42055]: NOQUEUE: reject: RCPT from [192.0.2.0]:38834: 550 5.7.1 Service unavailable; client [192.0.2.0] blocked using testbl.example; from=<info@test.example>, to=<>, proto=ESMTP, helo=<testhost.example>
 

diff --git a/tests/test_output_before_queue b/tests/test_output_before_queue
index aca61b9d4c7289936af9a5178b503445bee7dcef..62ab84991ca8bef2b6ce368b405a077c9f7a9f12 100644 (file)
--- a/tests/test_output_before_queue
+++ b/tests/test_output_before_queue
@@ -4,10 +4,10 @@
 # End: 2020-12-18 15:40:00 (1608306000)
 # End Query Options
 
-SMTPD: T5FDCC4EFL00000000
-CTIME: 5FDCC4EF
+SMTPD: T5FDCB6DFL00000000
+CTIME: 5FDCB6DF
 CLIENT: pmg.localhost[192.168.22.40]
-TO:5FDCC4EF:T5FDCC4EFL00000000:B: from <mailtestsender2@localhost.localdomain> to <pmgtest@localhost.localdomain>
+TO:5FDCB6DF:T5FDCB6DFL00000000:B: from <mailtestsender2@localhost.localdomain> to <pmgtest@localhost.localdomain>
 LOGS:
 L00000002 Dec 18 15:04:15 pmg postfix/smtpd[21842]: connect from pmg.localhost[192.168.22.40]
 L00000003 Dec 18 15:04:15 pmg postfix/smtpd[21842]: NOQUEUE: client=pmg.localhost[192.168.22.40]
@@ -17,10 +17,10 @@ L00000007 Dec 18 15:04:15 pmg pmg-smtp-filter[1565]: 381C4E5DFA31DF9E90F: proces
 L00000008 Dec 18 15:04:15 pmg postfix/smtpd[21842]: proxy-reject: END-OF-MESSAGE: 554 5.7.1 Rejected for policy reasons (381C4E5DFA31DF9E90F); from=<mailtestsender2@localhost.localdomain> to=<pmgtest@localhost.localdomain> proto=ESMTP helo=<localhost.localdomain>
 L00000009 Dec 18 15:04:15 pmg postfix/smtpd[21842]: disconnect from pmg.localhost[192.168.22.40] ehlo=1 mail=1 rcpt=1 data=0/1 commands=3/4
 
-SMTPD: T5FDCC572L00000000
-CTIME: 5FDCC572
+SMTPD: T5FDCB762L00000000
+CTIME: 5FDCB762
 CLIENT: pmg.localhost[192.168.22.40]
-TO:5FDCC572:T5FDCC572L00000000:Q: from <mailtestsender2@localhost.localdomain> to <pmgtest@localhost.localdomain>
+TO:5FDCB762:T5FDCB762L00000000:Q: from <mailtestsender2@localhost.localdomain> to <pmgtest@localhost.localdomain>
 LOGS:
 L0000000A Dec 18 15:06:26 pmg postfix/smtpd[21949]: connect from pmg.localhost[192.168.22.40]
 L0000000B Dec 18 15:06:26 pmg postfix/smtpd[21949]: NOQUEUE: client=pmg.localhost[192.168.22.40]
@@ -30,10 +30,10 @@ L00000010 Dec 18 15:06:26 pmg pmg-smtp-filter[1564]: 381C4E5DFA32622BFC4: proces
 L00000011 Dec 18 15:06:26 pmg postfix/smtpd[21949]: proxy-accept: END-OF-MESSAGE: 250 2.5.0 OK (381C4E5DFA32622BFC4); from=<mailtestsender2@localhost.localdomain> to=<pmgtest@localhost.localdomain> proto=ESMTP helo=<localhost.localdomain>
 L00000012 Dec 18 15:06:26 pmg postfix/smtpd[21949]: disconnect from pmg.localhost[192.168.22.40] ehlo=1 mail=1 rcpt=1 data=1 commands=4
 
-SMTPD: T5FDCC5EAL00000000
-CTIME: 5FDCC5EA
+SMTPD: T5FDCB7DAL00000000
+CTIME: 5FDCB7DA
 CLIENT: pmg.localhost[192.168.22.40]
-TO:5FDCC5EA:T5FDCC5EAL00000000:Q: from <mailtestsender3@localhost.localdomain> to <pmgtes2@localhost.localdomain>
+TO:5FDCB7DA:T5FDCB7DAL00000000:Q: from <mailtestsender3@localhost.localdomain> to <pmgtes2@localhost.localdomain>
 LOGS:
 L00000013 Dec 18 15:08:26 pmg postfix/smtpd[21949]: connect from pmg.localhost[192.168.22.40]
 L00000014 Dec 18 15:08:26 pmg postfix/smtpd[21949]: NOQUEUE: client=pmg.localhost[192.168.22.40]
@@ -43,10 +43,10 @@ L00000019 Dec 18 15:08:26 pmg pmg-smtp-filter[1564]: 381C4E5DFA32622BFC4: proces
 L0000001A Dec 18 15:08:26 pmg postfix/smtpd[21949]: proxy-accept: END-OF-MESSAGE: 250 2.5.0 OK (381C4E5DFA32622BFC4); from=<mailtestsender3@localhost.localdomain> to=<pmgtes2@localhost.localdomain> proto=ESMTP helo=<localhost.localdomain>
 L0000001B Dec 18 15:08:26 pmg postfix/smtpd[21949]: disconnect from pmg.localhost[192.168.22.40] ehlo=1 mail=1 rcpt=1 data=1 commands=4
 
-SMTPD: T5FDCC662L00000000
-CTIME: 5FDCC662
+SMTPD: T5FDCB852L00000000
+CTIME: 5FDCB852
 CLIENT: pmg.localhost[192.168.22.40]
-TO:5FDCC662:T5FDCC662L00000000:Q: from <mailtestsender3@localhost.localdomain> to <pmgtest@localhost.localdomain>
+TO:5FDCB852:T5FDCB852L00000000:Q: from <mailtestsender3@localhost.localdomain> to <pmgtest@localhost.localdomain>
 LOGS:
 L0000001C Dec 18 15:10:26 pmg postfix/smtpd[21949]: connect from pmg.localhost[192.168.22.40]
 L0000001D Dec 18 15:10:26 pmg postfix/smtpd[21949]: NOQUEUE: client=pmg.localhost[192.168.22.40]
@@ -57,14 +57,14 @@ L00000023 Dec 18 15:10:26 pmg postfix/smtpd[21949]: proxy-accept: END-OF-MESSAGE
 L00000024 Dec 18 15:10:26 pmg postfix/smtpd[21949]: disconnect from pmg.localhost[192.168.22.40] ehlo=1 mail=1 rcpt=1 data=1 commands=4
 
 QENTRY: 1C6B541C5D
-CTIME: 5FDCCD39
+CTIME: 5FDCBF29
 SIZE: 7298
 CLIENT: localhost.localdomain[127.0.0.1],
 MSGID: <xyz>
-TO:5FDCCC85:1C6B541C5D:P: from <test@test.localdomain> to <test4@localhost> (192.168.22.40[192.168.22.40]:25)
-TO:5FDCCC85:1C6B541C5D:P: from <test@test.localdomain> to <test3@localhost> (192.168.22.40[192.168.22.40]:25)
-TO:5FDCCC85:1C6B541C5D:P: from <test@test.localdomain> to <test2@localhost> (192.168.22.40[192.168.22.40]:25)
-TO:5FDCCC85:1C6B541C5D:P: from <test@test.localdomain> to <test1@localhost> (192.168.22.40[192.168.22.40]:25)
+TO:5FDCBE75:1C6B541C5D:P: from <test@test.localdomain> to <test4@localhost> (192.168.22.40[192.168.22.40]:25)
+TO:5FDCBE75:1C6B541C5D:P: from <test@test.localdomain> to <test3@localhost> (192.168.22.40[192.168.22.40]:25)
+TO:5FDCBE75:1C6B541C5D:P: from <test@test.localdomain> to <test2@localhost> (192.168.22.40[192.168.22.40]:25)
+TO:5FDCBE75:1C6B541C5D:P: from <test@test.localdomain> to <test1@localhost> (192.168.22.40[192.168.22.40]:25)
 SMTP:
 L00000025 Dec 18 15:36:32 proxmox-new postfix/smtpd[29902]: connect from test.localdomain[192.168.22.40]
 L00000026 Dec 18 15:36:33 proxmox-new postfix/smtpd[29902]: NOQUEUE: client=test.localdomain[192.168.22.40]
@@ -90,10 +90,10 @@ L00000036 Dec 18 15:36:37 proxmox-new postfix/smtp[29913]: 1C6B541C5D: to=<test3
 L00000037 Dec 18 15:36:37 proxmox-new postfix/smtp[29913]: 1C6B541C5D: to=<test4@localhost>, relay=192.168.22.40[192.168.22.40]:25, delay=0.15, delays=0.05/0/0.05/0.05, dsn=2.0.0, status=sent (250 2.0.0 Ok: queued as C19A3F62578)
 L00000038 Dec 18 15:36:37 proxmox-new postfix/qmgr[6194]: 1C6B541C5D: removed
 
-SMTPD: T5FDCCD46L00000000
-CTIME: 5FDCCD46
+SMTPD: T5FDCBF36L00000000
+CTIME: 5FDCBF36
 CLIENT: 10.0.0.1
-TO:5FDCCD46:T5FDCCD46L00000000:N: from <rbl_reject_test@localhost.localdomain> to <test@reject.localhost.localdomain>
+TO:5FDCBF36:T5FDCBF36L00000000:N: from <rbl_reject_test@localhost.localdomain> to <test@reject.localhost.localdomain>
 LOGS:
 L0000003A Dec 18 15:39:50 proxmox-new postfix/postscreen[32700]: NOQUEUE: reject: RCPT from [10.0.0.1]:34453: 550 5.7.1 Service unavailable; client [10.0.0.1] blocked using zen.spamhaus.org; from=<rbl_reject_test@localhost.localdomain>, to=<test@reject.localhost.localdomain>, proto=ESMTP, helo=<localhost.localdomain>
 

diff --git a/tests/test_output_before_queue_from_to b/tests/test_output_before_queue_from_to
index 610bf34fe5d24ebbebbbd4bdfe359e46657add36..7e499d86793b2409ec496184169d82d8b387a9bc 100644 (file)
--- a/tests/test_output_before_queue_from_to
+++ b/tests/test_output_before_queue_from_to
@@ -6,10 +6,10 @@
 # End: 2020-12-18 15:40:00 (1608306000)
 # End Query Options
 
-SMTPD: T5FDCC662L00000000
-CTIME: 5FDCC662
+SMTPD: T5FDCB852L00000000
+CTIME: 5FDCB852
 CLIENT: pmg.localhost[192.168.22.40]
-TO:5FDCC662:T5FDCC662L00000000:Q: from <mailtestsender3@localhost.localdomain> to <pmgtest@localhost.localdomain>
+TO:5FDCB852:T5FDCB852L00000000:Q: from <mailtestsender3@localhost.localdomain> to <pmgtest@localhost.localdomain>
 LOGS:
 L0000001C Dec 18 15:10:26 pmg postfix/smtpd[21949]: connect from pmg.localhost[192.168.22.40]
 L0000001D Dec 18 15:10:26 pmg postfix/smtpd[21949]: NOQUEUE: client=pmg.localhost[192.168.22.40]

diff --git a/tests/test_output_before_queue_host b/tests/test_output_before_queue_host
index 4595d25a88aacc2b42b578d4734a2db9d41ffda3..5460e325babdaab3341eafd469bf0eb9813c6710 100644 (file)
--- a/tests/test_output_before_queue_host
+++ b/tests/test_output_before_queue_host
@@ -5,10 +5,10 @@
 # End: 2020-12-18 15:40:00 (1608306000)
 # End Query Options
 
-SMTPD: T5FDCC4EFL00000000
-CTIME: 5FDCC4EF
+SMTPD: T5FDCB6DFL00000000
+CTIME: 5FDCB6DF
 CLIENT: pmg.localhost[192.168.22.40]
-TO:5FDCC4EF:T5FDCC4EFL00000000:B: from <mailtestsender2@localhost.localdomain> to <pmgtest@localhost.localdomain>
+TO:5FDCB6DF:T5FDCB6DFL00000000:B: from <mailtestsender2@localhost.localdomain> to <pmgtest@localhost.localdomain>
 LOGS:
 L00000002 Dec 18 15:04:15 pmg postfix/smtpd[21842]: connect from pmg.localhost[192.168.22.40]
 L00000003 Dec 18 15:04:15 pmg postfix/smtpd[21842]: NOQUEUE: client=pmg.localhost[192.168.22.40]
@@ -18,10 +18,10 @@ L00000007 Dec 18 15:04:15 pmg pmg-smtp-filter[1565]: 381C4E5DFA31DF9E90F: proces
 L00000008 Dec 18 15:04:15 pmg postfix/smtpd[21842]: proxy-reject: END-OF-MESSAGE: 554 5.7.1 Rejected for policy reasons (381C4E5DFA31DF9E90F); from=<mailtestsender2@localhost.localdomain> to=<pmgtest@localhost.localdomain> proto=ESMTP helo=<localhost.localdomain>
 L00000009 Dec 18 15:04:15 pmg postfix/smtpd[21842]: disconnect from pmg.localhost[192.168.22.40] ehlo=1 mail=1 rcpt=1 data=0/1 commands=3/4
 
-SMTPD: T5FDCC572L00000000
-CTIME: 5FDCC572
+SMTPD: T5FDCB762L00000000
+CTIME: 5FDCB762
 CLIENT: pmg.localhost[192.168.22.40]
-TO:5FDCC572:T5FDCC572L00000000:Q: from <mailtestsender2@localhost.localdomain> to <pmgtest@localhost.localdomain>
+TO:5FDCB762:T5FDCB762L00000000:Q: from <mailtestsender2@localhost.localdomain> to <pmgtest@localhost.localdomain>
 LOGS:
 L0000000A Dec 18 15:06:26 pmg postfix/smtpd[21949]: connect from pmg.localhost[192.168.22.40]
 L0000000B Dec 18 15:06:26 pmg postfix/smtpd[21949]: NOQUEUE: client=pmg.localhost[192.168.22.40]
@@ -31,10 +31,10 @@ L00000010 Dec 18 15:06:26 pmg pmg-smtp-filter[1564]: 381C4E5DFA32622BFC4: proces
 L00000011 Dec 18 15:06:26 pmg postfix/smtpd[21949]: proxy-accept: END-OF-MESSAGE: 250 2.5.0 OK (381C4E5DFA32622BFC4); from=<mailtestsender2@localhost.localdomain> to=<pmgtest@localhost.localdomain> proto=ESMTP helo=<localhost.localdomain>
 L00000012 Dec 18 15:06:26 pmg postfix/smtpd[21949]: disconnect from pmg.localhost[192.168.22.40] ehlo=1 mail=1 rcpt=1 data=1 commands=4
 
-SMTPD: T5FDCC5EAL00000000
-CTIME: 5FDCC5EA
+SMTPD: T5FDCB7DAL00000000
+CTIME: 5FDCB7DA
 CLIENT: pmg.localhost[192.168.22.40]
-TO:5FDCC5EA:T5FDCC5EAL00000000:Q: from <mailtestsender3@localhost.localdomain> to <pmgtes2@localhost.localdomain>
+TO:5FDCB7DA:T5FDCB7DAL00000000:Q: from <mailtestsender3@localhost.localdomain> to <pmgtes2@localhost.localdomain>
 LOGS:
 L00000013 Dec 18 15:08:26 pmg postfix/smtpd[21949]: connect from pmg.localhost[192.168.22.40]
 L00000014 Dec 18 15:08:26 pmg postfix/smtpd[21949]: NOQUEUE: client=pmg.localhost[192.168.22.40]
@@ -44,10 +44,10 @@ L00000019 Dec 18 15:08:26 pmg pmg-smtp-filter[1564]: 381C4E5DFA32622BFC4: proces
 L0000001A Dec 18 15:08:26 pmg postfix/smtpd[21949]: proxy-accept: END-OF-MESSAGE: 250 2.5.0 OK (381C4E5DFA32622BFC4); from=<mailtestsender3@localhost.localdomain> to=<pmgtes2@localhost.localdomain> proto=ESMTP helo=<localhost.localdomain>
 L0000001B Dec 18 15:08:26 pmg postfix/smtpd[21949]: disconnect from pmg.localhost[192.168.22.40] ehlo=1 mail=1 rcpt=1 data=1 commands=4
 
-SMTPD: T5FDCC662L00000000
-CTIME: 5FDCC662
+SMTPD: T5FDCB852L00000000
+CTIME: 5FDCB852
 CLIENT: pmg.localhost[192.168.22.40]
-TO:5FDCC662:T5FDCC662L00000000:Q: from <mailtestsender3@localhost.localdomain> to <pmgtest@localhost.localdomain>
+TO:5FDCB852:T5FDCB852L00000000:Q: from <mailtestsender3@localhost.localdomain> to <pmgtest@localhost.localdomain>
 LOGS:
 L0000001C Dec 18 15:10:26 pmg postfix/smtpd[21949]: connect from pmg.localhost[192.168.22.40]
 L0000001D Dec 18 15:10:26 pmg postfix/smtpd[21949]: NOQUEUE: client=pmg.localhost[192.168.22.40]
@@ -58,14 +58,14 @@ L00000023 Dec 18 15:10:26 pmg postfix/smtpd[21949]: proxy-accept: END-OF-MESSAGE
 L00000024 Dec 18 15:10:26 pmg postfix/smtpd[21949]: disconnect from pmg.localhost[192.168.22.40] ehlo=1 mail=1 rcpt=1 data=1 commands=4
 
 QENTRY: 1C6B541C5D
-CTIME: 5FDCCD39
+CTIME: 5FDCBF29
 SIZE: 7298
 CLIENT: localhost.localdomain[127.0.0.1],
 MSGID: <xyz>
-TO:5FDCCC85:1C6B541C5D:P: from <test@test.localdomain> to <test4@localhost> (192.168.22.40[192.168.22.40]:25)
-TO:5FDCCC85:1C6B541C5D:P: from <test@test.localdomain> to <test3@localhost> (192.168.22.40[192.168.22.40]:25)
-TO:5FDCCC85:1C6B541C5D:P: from <test@test.localdomain> to <test2@localhost> (192.168.22.40[192.168.22.40]:25)
-TO:5FDCCC85:1C6B541C5D:P: from <test@test.localdomain> to <test1@localhost> (192.168.22.40[192.168.22.40]:25)
+TO:5FDCBE75:1C6B541C5D:P: from <test@test.localdomain> to <test4@localhost> (192.168.22.40[192.168.22.40]:25)
+TO:5FDCBE75:1C6B541C5D:P: from <test@test.localdomain> to <test3@localhost> (192.168.22.40[192.168.22.40]:25)
+TO:5FDCBE75:1C6B541C5D:P: from <test@test.localdomain> to <test2@localhost> (192.168.22.40[192.168.22.40]:25)
+TO:5FDCBE75:1C6B541C5D:P: from <test@test.localdomain> to <test1@localhost> (192.168.22.40[192.168.22.40]:25)
 SMTP:
 L00000025 Dec 18 15:36:32 proxmox-new postfix/smtpd[29902]: connect from test.localdomain[192.168.22.40]
 L00000026 Dec 18 15:36:33 proxmox-new postfix/smtpd[29902]: NOQUEUE: client=test.localdomain[192.168.22.40]

diff --git a/tests/test_output_before_queue_mixed_accept_block_quarantine b/tests/test_output_before_queue_mixed_accept_block_quarantine
index 637b40a5a7f652f118d5d1bd517a1690c0c06592..8a0417a373ae5c0cd2061bcc60eca194021ad28f 100644 (file)
--- a/tests/test_output_before_queue_mixed_accept_block_quarantine
+++ b/tests/test_output_before_queue_mixed_accept_block_quarantine
@@ -5,13 +5,13 @@
 # End Query Options
 
 QENTRY: E1C6561393
-CTIME: 5EAAF183
+CTIME: 5EAAD563
 SIZE: 1436
 CLIENT: localhost[127.0.0.1],
 MSGID: <20200430134439.GE6794@test@localdomain>
-TO:5EAAF179:E1C6561393:R: from <senduser@test@localdomain> to <reject@test.recipient.example> (192.0.2.69[192.0.2.69]:25)
-TO:5EAAF178:E1C6561393:B: from <senduser@test@localdomain> to <blocked@test.recipient.example> (none)
-TO:5EAAF178:E1C6561393:Q: from <senduser@test@localdomain> to <quarantined@test.recipient.example> (612405EAAD648755DD)
+TO:5EAAD559:E1C6561393:R: from <senduser@test@localdomain> to <reject@test.recipient.example> (192.0.2.69[192.0.2.69]:25)
+TO:5EAAD558:E1C6561393:B: from <senduser@test@localdomain> to <blocked@test.recipient.example> (none)
+TO:5EAAD558:E1C6561393:Q: from <senduser@test@localdomain> to <quarantined@test.recipient.example> (612405EAAD648755DD)
 SMTP:
 L00000003 Apr 30 15:40:39 pmg6 postfix/smtpd[21615]: connect from unknown[2001:DB8:1:12::75]
 L00000004 Apr 30 15:40:39 pmg6 postfix/smtpd[21615]: Anonymous TLS connection established from unknown[2001:DB8:1:12::75]: TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)

diff --git a/tests/test_output_before_queue_mixed_downstream b/tests/test_output_before_queue_mixed_downstream
index 4536a056ad9e29682600faee8b7e7c7c4fccc9a8..c0e6d908c4fe1abbfcbe0ba4c9603da90d94480c 100644 (file)
--- a/tests/test_output_before_queue_mixed_downstream
+++ b/tests/test_output_before_queue_mixed_downstream
@@ -4,23 +4,23 @@
 # End: 2020-12-18 16:10:00 (1608307800)
 # End Query Options
 
-SMTPD: T5FDCD200L00000001
-CTIME: 5FDCD200
+SMTPD: T5FDCC3F0L00000001
+CTIME: 5FDCC3F0
 CLIENT: 192.0.2.0
-TO:5FDCD200:T5FDCD200L00000001:N: from <info@test.example> to <>
+TO:5FDCC3F0:T5FDCC3F0L00000001:N: from <info@test.example> to <>
 
 QENTRY: E2487636D9
-CTIME: 5FDCD233
+CTIME: 5FDCC423
 SIZE: 3628
 MSGID: <20200428171350.E2487636D9@pmg6.rosa.proxmox.com>
-TO:5FDCD233:E2487636D9:2: from <> to <sender@test.localdomain> (test.localdomain[192.0.2.0.70]:25)
+TO:5FDCC423:E2487636D9:2: from <> to <sender@test.localdomain> (test.localdomain[192.0.2.0.70]:25)
 
 QENTRY: B8010636D6
-CTIME: 5FDCD233
+CTIME: 5FDCC423
 SIZE: 1436
 CLIENT: localhost[127.0.0.1],
 MSGID: <20200428171349.GC5963@test.localdomain>
-TO:5FDCD232:B8010636D6:P: from <sender@test.localdomain> to <discard@test.recipient.example> (192.0.2.0.69[192.0.2.0.69]:25)
-TO:5FDCD232:B8010636D6:R: from <sender@test.localdomain> to <reject@test.recipient.example> (192.0.2.0.69[192.0.2.0.69]:25)
-TO:5FDCD232:B8010636D6:D: from <sender@test.localdomain> to <defer@test.recipient.example> (192.0.2.0.69[192.0.2.0.69]:25)
+TO:5FDCC422:B8010636D6:P: from <sender@test.localdomain> to <discard@test.recipient.example> (192.0.2.0.69[192.0.2.0.69]:25)
+TO:5FDCC422:B8010636D6:R: from <sender@test.localdomain> to <reject@test.recipient.example> (192.0.2.0.69[192.0.2.0.69]:25)
+TO:5FDCC422:B8010636D6:D: from <sender@test.localdomain> to <defer@test.recipient.example> (192.0.2.0.69[192.0.2.0.69]:25)
 

diff --git a/tests/test_output_before_queue_qid b/tests/test_output_before_queue_qid
index e2eb137eb01cd899ec9aacb64a77ef9a088ec85b..46728a297d52a22d55454097ee6c807ed3fa2380 100644 (file)
--- a/tests/test_output_before_queue_qid
+++ b/tests/test_output_before_queue_qid
@@ -6,14 +6,14 @@
 # End Query Options
 
 QENTRY: 1C6B541C5D
-CTIME: 5FDCCD39
+CTIME: 5FDCBF29
 SIZE: 7298
 CLIENT: localhost.localdomain[127.0.0.1],
 MSGID: <xyz>
-TO:5FDCCC85:1C6B541C5D:P: from <test@test.localdomain> to <test4@localhost> (192.168.22.40[192.168.22.40]:25)
-TO:5FDCCC85:1C6B541C5D:P: from <test@test.localdomain> to <test3@localhost> (192.168.22.40[192.168.22.40]:25)
-TO:5FDCCC85:1C6B541C5D:P: from <test@test.localdomain> to <test2@localhost> (192.168.22.40[192.168.22.40]:25)
-TO:5FDCCC85:1C6B541C5D:P: from <test@test.localdomain> to <test1@localhost> (192.168.22.40[192.168.22.40]:25)
+TO:5FDCBE75:1C6B541C5D:P: from <test@test.localdomain> to <test4@localhost> (192.168.22.40[192.168.22.40]:25)
+TO:5FDCBE75:1C6B541C5D:P: from <test@test.localdomain> to <test3@localhost> (192.168.22.40[192.168.22.40]:25)
+TO:5FDCBE75:1C6B541C5D:P: from <test@test.localdomain> to <test2@localhost> (192.168.22.40[192.168.22.40]:25)
+TO:5FDCBE75:1C6B541C5D:P: from <test@test.localdomain> to <test1@localhost> (192.168.22.40[192.168.22.40]:25)
 SMTP:
 L00000025 Dec 18 15:36:32 proxmox-new postfix/smtpd[29902]: connect from test.localdomain[192.168.22.40]
 L00000026 Dec 18 15:36:33 proxmox-new postfix/smtpd[29902]: NOQUEUE: client=test.localdomain[192.168.22.40]

diff --git a/tests/test_output_before_queue_search_string b/tests/test_output_before_queue_search_string
index da04042cdbbe1013fe5a4abb4daeb968f6124697..2f57b8a2ffaa670b4c2905c81e0cd01ba0d1d188 100644 (file)
--- a/tests/test_output_before_queue_search_string
+++ b/tests/test_output_before_queue_search_string
@@ -5,10 +5,10 @@
 # End: 2020-12-18 15:40:00 (1608306000)
 # End Query Options
 
-SMTPD: T5FDCC4EFL00000000
-CTIME: 5FDCC4EF
+SMTPD: T5FDCB6DFL00000000
+CTIME: 5FDCB6DF
 CLIENT: pmg.localhost[192.168.22.40]
-TO:5FDCC4EF:T5FDCC4EFL00000000:B: from <mailtestsender2@localhost.localdomain> to <pmgtest@localhost.localdomain>
+TO:5FDCB6DF:T5FDCB6DFL00000000:B: from <mailtestsender2@localhost.localdomain> to <pmgtest@localhost.localdomain>
 LOGS:
 L00000002 Dec 18 15:04:15 pmg postfix/smtpd[21842]: connect from pmg.localhost[192.168.22.40]
 L00000003 Dec 18 15:04:15 pmg postfix/smtpd[21842]: NOQUEUE: client=pmg.localhost[192.168.22.40]
@@ -18,10 +18,10 @@ L00000007 Dec 18 15:04:15 pmg pmg-smtp-filter[1565]: 381C4E5DFA31DF9E90F: proces
 L00000008 Dec 18 15:04:15 pmg postfix/smtpd[21842]: proxy-reject: END-OF-MESSAGE: 554 5.7.1 Rejected for policy reasons (381C4E5DFA31DF9E90F); from=<mailtestsender2@localhost.localdomain> to=<pmgtest@localhost.localdomain> proto=ESMTP helo=<localhost.localdomain>
 L00000009 Dec 18 15:04:15 pmg postfix/smtpd[21842]: disconnect from pmg.localhost[192.168.22.40] ehlo=1 mail=1 rcpt=1 data=0/1 commands=3/4
 
-SMTPD: T5FDCCD46L00000000
-CTIME: 5FDCCD46
+SMTPD: T5FDCBF36L00000000
+CTIME: 5FDCBF36
 CLIENT: 10.0.0.1
-TO:5FDCCD46:T5FDCCD46L00000000:N: from <rbl_reject_test@localhost.localdomain> to <test@reject.localhost.localdomain>
+TO:5FDCBF36:T5FDCBF36L00000000:N: from <rbl_reject_test@localhost.localdomain> to <test@reject.localhost.localdomain>
 LOGS:
 L0000003A Dec 18 15:39:50 proxmox-new postfix/postscreen[32700]: NOQUEUE: reject: RCPT from [10.0.0.1]:34453: 550 5.7.1 Service unavailable; client [10.0.0.1] blocked using zen.spamhaus.org; from=<rbl_reject_test@localhost.localdomain>, to=<test@reject.localhost.localdomain>, proto=ESMTP, helo=<localhost.localdomain>
 

diff --git a/tests/test_output_before_queue_syntax_reject b/tests/test_output_before_queue_syntax_reject
index 5be90db1439a0c73d2208a15b2f71aa7bb8edb10..383b5e74ea4272f08279335b33d400bb1f5863ac 100644 (file)
--- a/tests/test_output_before_queue_syntax_reject
+++ b/tests/test_output_before_queue_syntax_reject
@@ -4,10 +4,10 @@
 # End: 2020-08-27 14:05:00 (1598537100)
 # End Query Options
 
-SMTPD: T5F47BD58L00000000
-CTIME: 5F47BD58
+SMTPD: T5F47A138L00000000
+CTIME: 5F47A138
 CLIENT: pmgsender[192.168.22.40]
-TO:5F47BD58:T5F47BD58L00000000:N: from <test@pmgsender.local> to <test@pmgreceiver.local>
+TO:5F47A138:T5F47A138L00000000:N: from <test@pmgsender.local> to <test@pmgreceiver.local>
 LOGS:
 L00000001 Aug 27 14:04:08 pmg6 postfix/smtpd[7567]: connect from pmgsender[192.168.22.40]
 L00000002 Aug 27 14:04:08 pmg6 postfix/smtpd[7567]: Anonymous TLS connection established from pmgsender[192.168.22.40]: TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256

diff --git a/tests/test_output_before_queue_to b/tests/test_output_before_queue_to
index 49793dd4128de03ed16a6f2178661285c96f4605..5fe39bd1c8abd569ca4ac557d404d0af3e9bcbf5 100644 (file)
--- a/tests/test_output_before_queue_to
+++ b/tests/test_output_before_queue_to
@@ -5,10 +5,10 @@
 # End: 2020-12-18 15:40:00 (1608306000)
 # End Query Options
 
-SMTPD: T5FDCC5EAL00000000
-CTIME: 5FDCC5EA
+SMTPD: T5FDCB7DAL00000000
+CTIME: 5FDCB7DA
 CLIENT: pmg.localhost[192.168.22.40]
-TO:5FDCC5EA:T5FDCC5EAL00000000:Q: from <mailtestsender3@localhost.localdomain> to <pmgtes2@localhost.localdomain>
+TO:5FDCB7DA:T5FDCB7DAL00000000:Q: from <mailtestsender3@localhost.localdomain> to <pmgtes2@localhost.localdomain>
 LOGS:
 L00000013 Dec 18 15:08:26 pmg postfix/smtpd[21949]: connect from pmg.localhost[192.168.22.40]
 L00000014 Dec 18 15:08:26 pmg postfix/smtpd[21949]: NOQUEUE: client=pmg.localhost[192.168.22.40]

diff --git a/tests/test_output_before_queue_to_search_string b/tests/test_output_before_queue_to_search_string
index 5fe963a2dfbdd2a95e5d95de7373899b5efce697..db7d14f0af96ae8354ca2d3669d9a6b12ebee78c 100644 (file)
--- a/tests/test_output_before_queue_to_search_string
+++ b/tests/test_output_before_queue_to_search_string
@@ -6,10 +6,10 @@
 # End: 2020-05-18 16:10:00 (1589818200)
 # End Query Options
 
-SMTPD: T5EC2B077L00000002
-CTIME: 5EC2B077
+SMTPD: T5EC29457L00000002
+CTIME: 5EC29457
 CLIENT: pmg-demo.proxmox.com[192.168.30.128]
-TO:5EC2B077:T5EC2B077L00000002:B: from <mailtestsender.bad@proxtest.com> to <ferdl@example.proxmox.com>
+TO:5EC29457:T5EC29457L00000002:B: from <mailtestsender.bad@proxtest.com> to <ferdl@example.proxmox.com>
 LOGS:
 L00000003 May 18 15:57:43 pmg-demo postfix/smtpd[16982]: connect from pmg-demo.proxmox.com[192.168.30.128]
 L00000004 May 18 15:57:43 pmg-demo postfix/smtpd[16982]: NOQUEUE: client=pmg-demo.proxmox.com[192.168.30.128]
@@ -22,11 +22,11 @@ L0000000B May 18 15:57:43 pmg-demo postfix/smtpd[16982]: proxy-accept: END-OF-ME
 L0000000C May 18 15:57:43 pmg-demo postfix/smtpd[16982]: disconnect from pmg-demo.proxmox.com[192.168.30.128] ehlo=1 mail=1 rcpt=2 data=1 commands=5
 
 QENTRY: 6B2CD3209E0
-CTIME: 5EC2B1EB
+CTIME: 5EC295CB
 SIZE: 2342
 CLIENT: localhost.localdomain[127.0.0.1],
 MSGID: <20200518140355.6B2CD3209E0@pmg-demo.proxmox.com>
-TO:5EC2B1EB:6B2CD3209E0:B: from <mailtestsender.good@proxtest.com> to <ferdl@example.proxmox.com> (none)
+TO:5EC295CB:6B2CD3209E0:B: from <mailtestsender.good@proxtest.com> to <ferdl@example.proxmox.com> (none)
 SMTP:
 L00000024 May 18 16:03:55 pmg-demo postfix/smtpd[16982]: connect from pmg-demo.proxmox.com[192.168.30.128]
 L00000025 May 18 16:03:55 pmg-demo postfix/smtpd[16982]: NOQUEUE: client=pmg-demo.proxmox.com[192.168.30.128]
@@ -48,11 +48,11 @@ L00000033 May 18 16:03:55 pmg-demo postfix/smtp[17728]: 6B2CD3209E0: to=<office@
 L00000034 May 18 16:03:55 pmg-demo postfix/qmgr[1097]: 6B2CD3209E0: removed
 
 QENTRY: 264C33209E0
-CTIME: 5EC2B303
+CTIME: 5EC296E3
 SIZE: 2339
 CLIENT: localhost.localdomain[127.0.0.1],
 MSGID: <20200518140835.264C33209E0@pmg-demo.proxmox.com>
-TO:5EC2B303:264C33209E0:B: from <mailtestsender.good@proxtest.com> to <ferdl@example.proxmox.com> (none)
+TO:5EC296E3:264C33209E0:B: from <mailtestsender.good@proxtest.com> to <ferdl@example.proxmox.com> (none)
 SMTP:
 L00000037 May 18 16:08:34 pmg-demo postfix/smtpd[16982]: connect from pmg-demo.proxmox.com[192.168.30.128]
 L00000038 May 18 16:08:34 pmg-demo postfix/smtpd[16982]: NOQUEUE: client=pmg-demo.proxmox.com[192.168.30.128]
@@ -74,11 +74,11 @@ L00000046 May 18 16:08:35 pmg-demo postfix/smtp[17728]: 264C33209E0: to=<ceo@exa
 L00000047 May 18 16:08:35 pmg-demo postfix/qmgr[1097]: 264C33209E0: removed
 
 QENTRY: 86D0C3209DE
-CTIME: 5EC2B344
+CTIME: 5EC29724
 SIZE: 2932
 CLIENT: localhost.localdomain[127.0.0.1],
 MSGID: <20200518140940.86D0C3209DE@pmg-demo.proxmox.com>
-TO:5EC2B344:86D0C3209DE:B: from <mailtestsender.good@proxtest.com> to <ferdl@example.proxmox.com> (none)
+TO:5EC29724:86D0C3209DE:B: from <mailtestsender.good@proxtest.com> to <ferdl@example.proxmox.com> (none)
 SMTP:
 L0000004A May 18 16:09:39 pmg-demo postfix/smtpd[16982]: connect from pmg-demo.proxmox.com[192.168.30.128]
 L0000004B May 18 16:09:39 pmg-demo postfix/smtpd[16982]: NOQUEUE: client=pmg-demo.proxmox.com[192.168.30.128]

diff --git a/tests/test_output_time_rfc3339_mixed b/tests/test_output_time_rfc3339_mixed
index 3e628b86925099c949a26c8db3c72b320c99034b..5accb12e0f16143a704ceade84d4c0086228e2f7 100644 (file)
--- a/tests/test_output_time_rfc3339_mixed
+++ b/tests/test_output_time_rfc3339_mixed
@@ -5,12 +5,12 @@
 # End Query Options
 
 QENTRY: 520C9C0192
-CTIME: 6495AB99
+CTIME: 64958F79
 SIZE: 1902
 CLIENT: pmghost.mydomain.tld[192.168.1.001]
 MSGID: <redacted:msgid>
-TO:6495AB99:520C9C0192:Q: from <redacted:returnpath@domain.tld> to <user@domain2.tld> (C01C264958F7962FEA)
-TO:6495AB99:520C9C0192:Q: from <redacted:returnpath@domain.tld> to <test@mydomain.tld> (C01C264958F7962FEA)
+TO:64958F79:520C9C0192:Q: from <redacted:returnpath@domain.tld> to <user@domain2.tld> (C01C264958F7962FEA)
+TO:64958F79:520C9C0192:Q: from <redacted:returnpath@domain.tld> to <test@mydomain.tld> (C01C264958F7962FEA)
 SMTP:
 L00000004 2023-06-23T14:26:29.331019+02:00 pmg1 postfix/smtpd[1181]: connect from pmghost.mydomain.tld[192.168.1.001]
 L00000005 2023-06-23T14:26:29.336189+02:00 pmg1 postfix/smtpd[1181]: 520C9C0192: client=pmghost.mydomain.tld[192.168.1.001]
@@ -29,12 +29,12 @@ L00000011 2023-06-23T14:26:33.461645+02:00 pmg1 postfix/lmtp[1186]: 520C9C0192:
 L00000012 2023-06-23T14:26:33.461834+02:00 pmg1 postfix/qmgr[1136]: 520C9C0192: removed
 
 QENTRY: 866B7C0192
-CTIME: 6495C7FD
+CTIME: 6495ABDD
 SIZE: 44585
 CLIENT: pmghost.mydomain.tld[192.168.1.001]
 MSGID: <redacted:msgid>
-TO:6495C7FD:866B7C0192:Q: from <redacted:returnpath@domain.tld> to <user@domain2.tld> (C01C364958FBD55D53)
-TO:6495C7FD:866B7C0192:Q: from <redacted:returnpath@domain.tld> to <test@mydomain.tld> (C01C364958FBD55D53)
+TO:6495ABDD:866B7C0192:Q: from <redacted:returnpath@domain.tld> to <user@domain2.tld> (C01C364958FBD55D53)
+TO:6495ABDD:866B7C0192:Q: from <redacted:returnpath@domain.tld> to <test@mydomain.tld> (C01C364958FBD55D53)
 SMTP:
 L00000019 2023-06-23T14:27:40.550478Z pmg1 postfix/smtpd[1181]: connect from pmghost.mydomain.tld[192.168.1.001]
 L0000001A 2023-06-23T14:27:40.550799Z pmg1 postfix/smtpd[1181]: 866B7C0192: client=pmghost.mydomain.tld[192.168.1.001]
@@ -53,12 +53,12 @@ L00000026 2023-06-23T14:27:41.429627Z pmg1 postfix/lmtp[1186]: 866B7C0192: to=<u
 L00000027 2023-06-23T14:27:41.429803Z pmg1 postfix/qmgr[1136]: 866B7C0192: removed
 
 QENTRY: C4EC9C0192
-CTIME: 6495E44A
+CTIME: 6495C82A
 SIZE: 130922
 CLIENT: pmghost.mydomain.tld[192.168.1.001]
 MSGID: <redacted:msgid>
-TO:6495E44A:C4EC9C0192:Q: from <redacted:returnpath@domain.tld> to <user@domain2.tld> (C01D364958FEA2A254)
-TO:6495E44A:C4EC9C0192:Q: from <redacted:returnpath@domain.tld> to <test@mydomain.tld> (C01D364958FEA2A254)
+TO:6495C82A:C4EC9C0192:Q: from <redacted:returnpath@domain.tld> to <user@domain2.tld> (C01D364958FEA2A254)
+TO:6495C82A:C4EC9C0192:Q: from <redacted:returnpath@domain.tld> to <test@mydomain.tld> (C01D364958FEA2A254)
 SMTP:
 L0000002C 2023-06-23T14:28:23.806586-02:00 pmg1 postfix/smtpd[1181]: connect from pmghost.mydomain.tld[192.168.1.001]
 L0000002D 2023-06-23T14:28:23.806755-02:00 pmg1 postfix/smtpd[1181]: C4EC9C0192: client=pmghost.mydomain.tld[192.168.1.001]
@@ -77,11 +77,11 @@ L00000038 2023-06-23T14:28:26.241632-02:00 pmg1 postfix/lmtp[1186]: C4EC9C0192:
 L00000039 2023-06-23T14:28:26.242140-02:00 pmg1 postfix/qmgr[1136]: C4EC9C0192: removed
 
 QENTRY: 71386C0192
-CTIME: 6495E461
+CTIME: 6495C841
 SIZE: 129347
 CLIENT: localhost.localdomain[127.0.0.1]
 MSGID: <redacted:msgid>
-TO:6495E461:71386C0192:2: from <postmaster@pmghost.mydomain.tld> to <user@domain2.tld> (relay.domain3.tld[192.168.1.002]:25)
+TO:6495C841:71386C0192:2: from <postmaster@pmghost.mydomain.tld> to <user@domain2.tld> (relay.domain3.tld[192.168.1.002]:25)
 SMTP:
 L0000003C 2023-06-23T14:28:42.463301-02:00 pmg1 postfix/smtpd[1274]: connect from localhost.localdomain[127.0.0.1]
 L0000003D 2023-06-23T14:28:42.463813-02:00 pmg1 postfix/smtpd[1274]: 71386C0192: client=localhost.localdomain[127.0.0.1]

diff --git a/tests/test_output_timechange b/tests/test_output_timechange
index 1c19799680d73282b10ec4602ca41cbe66d8d0bc..2137bf4053bc59a85efe934b055e35036b3b0859 100644 (file)
--- a/tests/test_output_timechange
+++ b/tests/test_output_timechange
@@ -5,11 +5,11 @@
 # End Query Options
 
 QENTRY: 3AA60B752
-CTIME: 5E7EAE04
+CTIME: 5E7E9FF4
 SIZE: 5935
 CLIENT: bbs.domain.example[192.0.2.245]
 MSGID: <57213b21fafd7b52a6e07ef664c7e8a4@bbs.domain.example>
-TO:5E7EAE01:3AA60B752:A: from <office@domain.example> to <tb@msp1.example> (48070B766)
+TO:5E7E9FF1:3AA60B752:A: from <office@domain.example> to <tb@msp1.example> (48070B766)
 SMTP:
 L00000006 Mar 28 01:53:05 proxmox-pmg postfix/smtpd[23385]: connect from bbs.domain.example[192.0.2.245]
 L00000007 Mar 28 01:53:05 proxmox-pmg postfix/smtpd[23385]: 3AA60B752: client=bbs.domain.example[192.0.2.245]
@@ -25,11 +25,11 @@ L00000014 Mar 28 01:53:05 proxmox-pmg postfix/lmtp[23389]: 3AA60B752: to=<tb@msp
 L00000015 Mar 28 01:53:05 proxmox-pmg postfix/qmgr[570]: 3AA60B752: removed
 
 QENTRY: 48070B766
-CTIME: 5E7EAE04
+CTIME: 5E7E9FF4
 SIZE: 5816
 CLIENT: localhost[127.0.0.1],
 MSGID: <57213b21fafd7b52a6e07ef664c7e8a4@bbs.domain.example>
-TO:5E7EAE04:48070B766:2: from <office@domain.example> to <tb@msp1.example> (mta6.msp1.example[192.0.2.72]:25)
+TO:5E7E9FF4:48070B766:2: from <office@domain.example> to <tb@msp1.example> (mta6.msp1.example[192.0.2.72]:25)
 SMTP:
 L0000000D Mar 28 01:53:05 proxmox-pmg postfix/smtpd[23393]: connect from localhost[127.0.0.1]
 L0000000E Mar 28 01:53:05 proxmox-pmg postfix/smtpd[23393]: 48070B766: client=localhost[127.0.0.1], orig_client=bbs.domain.example[192.0.2.245]
@@ -42,12 +42,12 @@ L00000017 Mar 28 01:53:08 proxmox-pmg postfix/smtp[23394]: 48070B766: to=<tb@msp
 L00000018 Mar 28 01:53:08 proxmox-pmg postfix/qmgr[570]: 48070B766: removed
 
 QENTRY: B76CCB76D
-CTIME: 5E7EBF8B
+CTIME: 5E7EB17B
 SIZE: 136634
 CLIENT: backoffice.domain2.example[192.0.2.249]
 MSGID: <7nwfURRJWcDhR89oZjv9eCy7YKOpCFfXDGTDMakN0k@backoffice.domain2.example>
-TO:5E7EBF84:B76CCB76D:A: from <office@domain2.example> to <ext1@external1.example> (CF907B795)
-TO:5E7EBF84:B76CCB76D:A: from <office@domain2.example> to <backoffice@domain2.example> (CF907B795)
+TO:5E7EB174:B76CCB76D:A: from <office@domain2.example> to <ext1@external1.example> (CF907B795)
+TO:5E7EB174:B76CCB76D:A: from <office@domain2.example> to <backoffice@domain2.example> (CF907B795)
 SMTP:
 L00000025 Mar 28 03:07:48 proxmox-pmg postfix/smtpd[23509]: connect from backoffice.domain2.example[192.0.2.249]
 L00000026 Mar 28 03:07:48 proxmox-pmg postfix/smtpd[23509]: B76CCB76D: client=backoffice.domain2.example[192.0.2.249]
@@ -65,12 +65,12 @@ L00000035 Mar 28 03:07:48 proxmox-pmg postfix/lmtp[23513]: B76CCB76D: to=<ext1@e
 L00000036 Mar 28 03:07:48 proxmox-pmg postfix/qmgr[570]: B76CCB76D: removed
 
 QENTRY: CF907B795
-CTIME: 5E7EBF8B
+CTIME: 5E7EB17B
 SIZE: 136511
 CLIENT: localhost[127.0.0.1],
 MSGID: <7nwfURRJWcDhR89oZjv9eCy7YKOpCFfXDGTDMakN0k@backoffice.domain2.example>
-TO:5E7EBF8B:CF907B795:2: from <office@domain2.example> to <ext1@external1.example> (smtp.external1.example[192.0.2.51]:25)
-TO:5E7EBF86:CF907B795:2: from <office@domain2.example> to <backoffice@domain2.example> (smtp.domain2.example[192.0.2.180]:25)
+TO:5E7EB17B:CF907B795:2: from <office@domain2.example> to <ext1@external1.example> (smtp.external1.example[192.0.2.51]:25)
+TO:5E7EB176:CF907B795:2: from <office@domain2.example> to <backoffice@domain2.example> (smtp.domain2.example[192.0.2.180]:25)
 SMTP:
 L0000002C Mar 28 03:07:48 proxmox-pmg postfix/smtpd[23517]: connect from localhost[127.0.0.1]
 L0000002D Mar 28 03:07:48 proxmox-pmg postfix/smtpd[23517]: CF907B795: client=localhost[127.0.0.1], orig_client=backoffice.domain2.example[192.0.2.249]
@@ -84,28 +84,28 @@ L00000039 Mar 28 03:07:55 proxmox-pmg postfix/smtp[23519]: Trusted TLS connectio
 L0000003A Mar 28 03:07:55 proxmox-pmg postfix/smtp[23519]: CF907B795: to=<ext1@external1.example>, relay=smtp.external1.example[192.0.2.51]:25, delay=6.6, delays=0.01/0.03/6.3/0.33, dsn=2.0.0, status=sent (250 2.0.0 Ok: queued as 61FE04093ED0)
 L0000003B Mar 28 03:07:55 proxmox-pmg postfix/qmgr[570]: CF907B795: removed
 
-SMTPD: T5F9CC8B2L00000000
-CTIME: 5F9CC8B2
+SMTPD: T5F9CBAA2L00000000
+CTIME: 5F9CBAA2
 CLIENT: 192.0.2.213
-TO:5F9CC8B2:T5F9CC8B2L00000000:N: from <contact@spammer1.example> to <list1@listserv.domain.example>
+TO:5F9CBAA2:T5F9CBAA2L00000000:N: from <contact@spammer1.example> to <list1@listserv.domain.example>
 LOGS:
 L0000005C Oct 31 02:15:14 proxmox-pmg postfix/postscreen[6185]: NOQUEUE: reject: RCPT from [192.0.2.213]:12641: 550 5.7.1 Service unavailable; client [192.0.2.213] blocked using zen.spamhaus.org; from=<contact@spammer1.example>, to=<list1@listserv.domain.example>, proto=ESMTP, helo=<spammer1.example>
 
-SMTPD: T5F9CCB56L00000001
-CTIME: 5F9CCB57
+SMTPD: T5F9CBD46L00000001
+CTIME: 5F9CBD47
 CLIENT: unknown[192.0.2.214]
-TO:5F9CCB56:T5F9CCB56L00000001:G: from <product1@spammer2.example> to <list1@listserv.domain.example>
+TO:5F9CBD46:T5F9CBD46L00000001:G: from <product1@spammer2.example> to <list1@listserv.domain.example>
 LOGS:
 L00000061 Oct 31 02:26:30 proxmox-pmg postfix/smtpd[6264]: connect from unknown[192.0.2.214]
 L00000064 Oct 31 02:26:30 proxmox-pmg postfix/smtpd[6264]: NOQUEUE: reject: RCPT from unknown[192.0.2.214]: 450 4.7.1 <list1@listserv.domain.example>: Recipient address rejected: Service is unavailable (try later); from=<product1@spammer2.example> to=<list1@listserv.domain.example> proto=ESMTP helo=<spammer2.example>
 L00000065 Oct 31 02:26:31 proxmox-pmg postfix/smtpd[6264]: disconnect from unknown[192.0.2.214] ehlo=1 mail=1 rcpt=0/1 data=0/1 quit=1 commands=3/5
 
 QENTRY: 7EC601A15F
-CTIME: 5F9CD1B3
+CTIME: 5F9CC3A3
 SIZE: 11013
 CLIENT: bbs.domain.example[192.0.2.245]
 MSGID: <ac1e470c93dbecffeda550e0c96da154@bbs.domain.example>
-TO:5F9CD1B2:7EC601A15F:A: from <office@domain.example> to <ks@msp2.example> (8D0041A173)
+TO:5F9CC3A2:7EC601A15F:A: from <office@domain.example> to <ks@msp2.example> (8D0041A173)
 SMTP:
 L0000006E Oct 31 02:53:38 proxmox-pmg postfix/smtpd[6006]: connect from bbs.domain.example[192.0.2.245]
 L0000006F Oct 31 02:53:38 proxmox-pmg postfix/smtpd[6006]: 7EC601A15F: client=bbs.domain.example[192.0.2.245]
@@ -121,11 +121,11 @@ L0000007C Oct 31 02:53:38 proxmox-pmg postfix/lmtp[6008]: 7EC601A15F: to=<ks@msp
 L0000007D Oct 31 02:53:38 proxmox-pmg postfix/qmgr[567]: 7EC601A15F: removed
 
 QENTRY: 8D0041A173
-CTIME: 5F9CD1B3
+CTIME: 5F9CC3A3
 SIZE: 10893
 CLIENT: localhost[127.0.0.1],
 MSGID: <ac1e470c93dbecffeda550e0c96da154@bbs.domain.example>
-TO:5F9CD1B3:8D0041A173:2: from <office@domain.example> to <ks@msp2.example> (mx-in.msp2.example[2001:db8:1111:1111::1b]:25)
+TO:5F9CC3A3:8D0041A173:2: from <office@domain.example> to <ks@msp2.example> (mx-in.msp2.example[2001:db8:1111:1111::1b]:25)
 SMTP:
 L00000075 Oct 31 02:53:38 proxmox-pmg postfix/smtpd[6012]: connect from localhost[127.0.0.1]
 L00000076 Oct 31 02:53:38 proxmox-pmg postfix/smtpd[6012]: 8D0041A173: client=localhost[127.0.0.1], orig_client=bbs.domain.example[192.0.2.245]
@@ -138,11 +138,11 @@ L0000007F Oct 31 02:53:39 proxmox-pmg postfix/smtp[6013]: 8D0041A173: to=<ks@msp
 L00000080 Oct 31 02:53:39 proxmox-pmg postfix/qmgr[567]: 8D0041A173: removed
 
 QENTRY: 44A0B1A1BB
-CTIME: 5F9CC530
+CTIME: 5F9CB720
 SIZE: 28128
 CLIENT: www.domain.example[192.0.2.69]
 MSGID: <NTI1OTkyMAAC20549Y5BAMTYzNTY0MjAxMjcyMDg4@www.domain.example>
-TO:5F9CC52C:44A0B1A1BB:A: from <news@domain.example> to <mbox1@domain.example> (53EF81A1CD)
+TO:5F9CB71C:44A0B1A1BB:A: from <news@domain.example> to <mbox1@domain.example> (53EF81A1CD)
 SMTP:
 L0000008E Oct 31 02:00:12 proxmox-pmg postfix/smtpd[6520]: connect from www.domain.example[192.0.2.69]
 L0000008F Oct 31 02:00:12 proxmox-pmg postfix/smtpd[6520]: 44A0B1A1BB: client=www.domain.example[192.0.2.69]
@@ -158,11 +158,11 @@ L0000009C Oct 31 02:00:12 proxmox-pmg postfix/lmtp[6523]: 44A0B1A1BB: to=<mbox1@
 L0000009D Oct 31 02:00:12 proxmox-pmg postfix/qmgr[567]: 44A0B1A1BB: removed
 
 QENTRY: 53EF81A1CD
-CTIME: 5F9CC530
+CTIME: 5F9CB720
 SIZE: 28014
 CLIENT: localhost[127.0.0.1],
 MSGID: <NTI1OTkyMAAC20549Y5BAMTYzNTY0MjAxMjcyMDg4@www.domain.example>
-TO:5F9CC530:53EF81A1CD:2: from <news@domain.example> to <mbox1@domain.example> (mail.domain.example[192.0.2.106]:25)
+TO:5F9CB720:53EF81A1CD:2: from <news@domain.example> to <mbox1@domain.example> (mail.domain.example[192.0.2.106]:25)
 SMTP:
 L00000095 Oct 31 02:00:12 proxmox-pmg postfix/smtpd[6527]: connect from localhost[127.0.0.1]
 L00000096 Oct 31 02:00:12 proxmox-pmg postfix/smtpd[6527]: 53EF81A1CD: client=localhost[127.0.0.1], orig_client=www.domain.example[192.0.2.69]
@@ -174,21 +174,21 @@ L0000009E Oct 31 02:00:12 proxmox-pmg postfix/smtp[6512]: Trusted TLS connection
 L0000009F Oct 31 02:00:16 proxmox-pmg postfix/smtp[6512]: 53EF81A1CD: to=<mbox1@domain.example>, relay=mail.domain.example[192.0.2.106]:25, delay=4.2, delays=0/0/0.34/3.9, dsn=2.5.0, status=sent (250 2.5.0 OK (448AE617DEA9CB1BE8))
 L000000A0 Oct 31 02:00:16 proxmox-pmg postfix/qmgr[567]: 53EF81A1CD: removed
 
-SMTPD: T5F9CC5D0L00000000
-CTIME: 5F9CC5D1
+SMTPD: T5F9CB7C0L00000000
+CTIME: 5F9CB7C1
 CLIENT: unknown[192.0.2.215]
-TO:5F9CC5D1:T5F9CC5D0L00000000:G: from <product2@spammer3.example> to <list1@listserv.domain.example>
+TO:5F9CB7C1:T5F9CB7C0L00000000:G: from <product2@spammer3.example> to <list1@listserv.domain.example>
 LOGS:
 L000000A9 Oct 31 02:02:56 proxmox-pmg postfix/smtpd[6548]: connect from unknown[192.0.2.215]
 L000000AB Oct 31 02:02:57 proxmox-pmg postfix/smtpd[6548]: NOQUEUE: reject: RCPT from unknown[192.0.2.215]: 450 4.7.1 <list1@listserv.domain.example>: Recipient address rejected: Service is unavailable (try later); from=<product2@spammer3.example> to=<list1@listserv.domain.example> proto=ESMTP helo=<spammer3.example>
 L000000AC Oct 31 02:02:57 proxmox-pmg postfix/smtpd[6548]: disconnect from unknown[192.0.2.215] ehlo=1 mail=1 rcpt=0/1 data=0/1 quit=1 commands=3/5
 
 QENTRY: BBA631A1D1
-CTIME: 5F9CC653
+CTIME: 5F9CB843
 SIZE: 10843
 CLIENT: bbs.domain.example[192.0.2.245]
 MSGID: <ff48fa12236e379e1a34cd6f50430922@bbs.domain.example>
-TO:5F9CC652:BBA631A1D1:A: from <office@domain.example> to <jw@msp3.example> (C9D5E1A1E6)
+TO:5F9CB842:BBA631A1D1:A: from <office@domain.example> to <jw@msp3.example> (C9D5E1A1E6)
 SMTP:
 L000000B1 Oct 31 02:05:06 proxmox-pmg postfix/smtpd[6570]: connect from bbs.domain.example[192.0.2.245]
 L000000B2 Oct 31 02:05:06 proxmox-pmg postfix/smtpd[6570]: BBA631A1D1: client=bbs.domain.example[192.0.2.245]
@@ -204,11 +204,11 @@ L000000BF Oct 31 02:05:06 proxmox-pmg postfix/lmtp[6573]: BBA631A1D1: to=<jw@msp
 L000000C0 Oct 31 02:05:06 proxmox-pmg postfix/qmgr[567]: BBA631A1D1: removed
 
 QENTRY: C9D5E1A1E6
-CTIME: 5F9CC653
+CTIME: 5F9CB843
 SIZE: 10724
 CLIENT: localhost[127.0.0.1],
 MSGID: <ff48fa12236e379e1a34cd6f50430922@bbs.domain.example>
-TO:5F9CC653:C9D5E1A1E6:2: from <office@domain.example> to <jw@msp3.example> (mx-in.msp2.example[2001:db8:1111:1111::1a]:25)
+TO:5F9CB843:C9D5E1A1E6:2: from <office@domain.example> to <jw@msp3.example> (mx-in.msp2.example[2001:db8:1111:1111::1a]:25)
 SMTP:
 L000000B8 Oct 31 02:05:06 proxmox-pmg postfix/smtpd[6577]: connect from localhost[127.0.0.1]
 L000000B9 Oct 31 02:05:06 proxmox-pmg postfix/smtpd[6577]: C9D5E1A1E6: client=localhost[127.0.0.1], orig_client=bbs.domain.example[192.0.2.245]
@@ -221,22 +221,22 @@ L000000C2 Oct 31 02:05:07 proxmox-pmg postfix/smtp[6578]: C9D5E1A1E6: to=<jw@msp
 L000000C3 Oct 31 02:05:07 proxmox-pmg postfix/qmgr[567]: C9D5E1A1E6: removed
 
 QENTRY: 3C2EE26E95
-CTIME: 5FEE65FF
+CTIME: 5FEE57EF
 SIZE: 0
 QMGR:
 L000000CD Dec 31 23:59:59 proxmox-pmg postfix/qmgr[567]: 3C2EE26E95: removed
 
 QENTRY: 42EA826EA2
-CTIME: 5FEE65FF
+CTIME: 5FEE57EF
 SIZE: 10334
 CLIENT: backoffice.domain.example[192.0.2.249]
 MSGID: <LpNdZDCBBeeogzOLgHlkvs93WqJU4ZLlol8UCBOYmY@backoffice.domain.example>
-TO:5FEE65FF:42EA826EA2:A: from <noreply@domain.example> to <mbox5@domain.example> (51BD826EBE)
-TO:5FEE65FF:42EA826EA2:A: from <noreply@domain.example> to <backoffice@domain2.example> (51BD826EBE)
-TO:5FEE65FF:42EA826EA2:A: from <noreply@domain.example> to <backoffice@domain2.example> (51BD826EBE)
-TO:5FEE65FF:42EA826EA2:A: from <noreply@domain.example> to <mbox4@domain2.example> (51BD826EBE)
-TO:5FEE65FF:42EA826EA2:A: from <noreply@domain.example> to <mbox2@domain2.example> (51BD826EBE)
-TO:5FEE65FF:42EA826EA2:A: from <noreply@domain.example> to <mbox3@domain2.example> (51BD826EBE)
+TO:5FEE57EF:42EA826EA2:A: from <noreply@domain.example> to <mbox5@domain.example> (51BD826EBE)
+TO:5FEE57EF:42EA826EA2:A: from <noreply@domain.example> to <backoffice@domain2.example> (51BD826EBE)
+TO:5FEE57EF:42EA826EA2:A: from <noreply@domain.example> to <backoffice@domain2.example> (51BD826EBE)
+TO:5FEE57EF:42EA826EA2:A: from <noreply@domain.example> to <mbox4@domain2.example> (51BD826EBE)
+TO:5FEE57EF:42EA826EA2:A: from <noreply@domain.example> to <mbox2@domain2.example> (51BD826EBE)
+TO:5FEE57EF:42EA826EA2:A: from <noreply@domain.example> to <mbox3@domain2.example> (51BD826EBE)
 SMTP:
 L000000C5 Dec 31 23:59:59 proxmox-pmg postfix/smtpd[26384]: connect from backoffice.domain.example[192.0.2.249]
 L000000C6 Dec 31 23:59:59 proxmox-pmg postfix/smtpd[26384]: 42EA826EA2: client=backoffice.domain.example[192.0.2.249]
@@ -262,15 +262,15 @@ L000000DF Dec 31 23:59:59 proxmox-pmg postfix/lmtp[26389]: 42EA826EA2: to=<mbox5
 L000000E0 Dec 31 23:59:59 proxmox-pmg postfix/qmgr[567]: 42EA826EA2: removed
 
 QENTRY: 51BD826EBE
-CTIME: 5FEE65FF
+CTIME: 5FEE57EF
 SIZE: 10218
 CLIENT: localhost[127.0.0.1],
 MSGID: <LpNdZDCBBeeogzOLgHlkvs93WqJU4ZLlol8UCBOYmY@backoffice.domain.example>
-TO:5FEE65FF:51BD826EBE:2: from <noreply@domain.example> to <backoffice@domain2.example> (smtp.domain2.example[192.0.2.180]:25)
-TO:5FEE65FF:51BD826EBE:2: from <noreply@domain.example> to <mbox4@domain2.example> (smtp.domain2.example[192.0.2.180]:25)
-TO:5FEE65FF:51BD826EBE:2: from <noreply@domain.example> to <mbox2@domain2.example> (smtp.domain2.example[192.0.2.180]:25)
-TO:5FEE65FF:51BD826EBE:2: from <noreply@domain.example> to <mbox3@domain2.example> (smtp.domain2.example[192.0.2.180]:25)
-TO:5FEE65FF:51BD826EBE:2: from <noreply@domain.example> to <mbox5@domain.example> (mail.domain.example[192.0.2.106]:25)
+TO:5FEE57EF:51BD826EBE:2: from <noreply@domain.example> to <backoffice@domain2.example> (smtp.domain2.example[192.0.2.180]:25)
+TO:5FEE57EF:51BD826EBE:2: from <noreply@domain.example> to <mbox4@domain2.example> (smtp.domain2.example[192.0.2.180]:25)
+TO:5FEE57EF:51BD826EBE:2: from <noreply@domain.example> to <mbox2@domain2.example> (smtp.domain2.example[192.0.2.180]:25)
+TO:5FEE57EF:51BD826EBE:2: from <noreply@domain.example> to <mbox3@domain2.example> (smtp.domain2.example[192.0.2.180]:25)
+TO:5FEE57EF:51BD826EBE:2: from <noreply@domain.example> to <mbox5@domain.example> (mail.domain.example[192.0.2.106]:25)
 SMTP:
 L000000CE Dec 31 23:59:59 proxmox-pmg postfix/smtpd[26398]: connect from localhost[127.0.0.1]
 L000000CF Dec 31 23:59:59 proxmox-pmg postfix/smtpd[26398]: 51BD826EBE: client=localhost[127.0.0.1], orig_client=backoffice.domain.example[192.0.2.249]
@@ -287,8 +287,8 @@ L000000E7 Dec 31 23:59:59 proxmox-pmg postfix/smtp[26403]: 51BD826EBE: to=<mbox4
 L000000E8 Dec 31 23:59:59 proxmox-pmg postfix/smtp[26403]: 51BD826EBE: to=<backoffice@domain2.example>, relay=smtp.domain2.example[192.0.2.180]:25, delay=1.2, delays=0.05/0/0.22/0.89, dsn=2.5.0, status=sent (250 2.5.0 OK (46BE861CF83FDA43DE))
 L000000E9 Dec 31 23:59:59 proxmox-pmg postfix/qmgr[567]: 51BD826EBE: removed
 
-SMTPD: T5FEE65FFL00000001
-CTIME: 5FEE65FF
+SMTPD: T5FEE57EFL00000001
+CTIME: 5FEE57EF
 CLIENT: localhost[127.0.0.1]
 LOGS:
 L000000CC Dec 31 23:59:59 proxmox-pmg postfix/smtpd[26400]: connect from localhost[127.0.0.1]