From 4f780c09d2ab95bd9562ebe307a01043933adcd9 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Fri, 10 Nov 2023 14:37:23 +0000 Subject: [PATCH] fix doubled logging of message_id --- src/src/receive.c | 4 ++-- test/log/0021 | 2 +- test/paniclog/0021 | 2 +- test/stderr/0021 | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/src/receive.c b/src/src/receive.c index 8190c5941..041898a6b 100644 --- a/src/src/receive.c +++ b/src/src/receive.c @@ -3380,8 +3380,8 @@ if (extract_recip && (bad_addresses || recipients_count == 0)) } } - log_write(0, LOG_MAIN|LOG_PANIC, "%s %s found in headers", - message_id, bad_addresses ? "bad addresses" : "no recipients"); + log_write(0, LOG_MAIN|LOG_PANIC, "%s found in headers", + bad_addresses ? "bad addresses" : "no recipients"); fseek(spool_data_file, (long int)spool_data_start_offset(message_id), SEEK_SET); diff --git a/test/log/0021 b/test/log/0021 index 0f99f87bd..d5e5db32b 100644 --- a/test/log/0021 +++ b/test/log/0021 @@ -47,7 +47,7 @@ 1999-03-02 09:44:33 10HmbL-000000005vi-0000 <= ok@test3 H=[10.9.8.8] U=CALLER P=smtp S=sss 1999-03-02 09:44:33 10HmbL-000000005vi-0000 => x R=accept T=appendfile 1999-03-02 09:44:33 10HmbL-000000005vi-0000 Completed -1999-03-02 09:44:33 10HmaX-000000005vi-0000 10HmaX-000000005vi-0000 no recipients found in headers +1999-03-02 09:44:33 10HmaX-000000005vi-0000 no recipients found in headers 1999-03-02 09:44:33 10HmbM-000000005vi-0000 <= <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss 1999-03-02 09:44:33 10HmbM-000000005vi-0000 => CALLER R=accept T=appendfile 1999-03-02 09:44:33 10HmbM-000000005vi-0000 Completed diff --git a/test/paniclog/0021 b/test/paniclog/0021 index e2745765c..80e5b4ef0 100644 --- a/test/paniclog/0021 +++ b/test/paniclog/0021 @@ -4,4 +4,4 @@ 1999-03-02 09:44:33 rcpt accepted C=MAIL,RCPT 1999-03-02 09:44:33 ACL "warn" with "message" setting found in a non-message (EHLO or HELO) ACL: cannot specify header lines here: message ignored 1999-03-02 09:44:33 rcpt accepted C=EHLO,MAIL,RCPT -1999-03-02 09:44:33 10HmaX-000000005vi-0000 10HmaX-000000005vi-0000 no recipients found in headers +1999-03-02 09:44:33 10HmaX-000000005vi-0000 no recipients found in headers diff --git a/test/stderr/0021 b/test/stderr/0021 index 23de65a7b..59251c0b6 100644 --- a/test/stderr/0021 +++ b/test/stderr/0021 @@ -299,4 +299,4 @@ LOG: smtp_connection MAIN >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> 1999-03-02 09:44:33 ACL "warn" with "message" setting found in a non-message (EHLO or HELO) ACL: cannot specify header lines here: message ignored 1999-03-02 09:44:33 rcpt accepted C=EHLO,MAIL,RCPT -1999-03-02 09:44:33 10HmaX-000000005vi-0000 10HmaX-000000005vi-0000 no recipients found in headers +1999-03-02 09:44:33 10HmaX-000000005vi-0000 no recipients found in headers -- 2.30.2