From: Jeremy Harris Date: Sun, 17 May 2015 17:08:53 +0000 (+0100) Subject: Remove word "rejected" from ACL-discard log lines. Bug 1632 X-Git-Tag: exim-4_86_RC1~28 X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=commitdiff_plain;h=1f12df4d41f546751e14d52df36172f9bb54cce8 Remove word "rejected" from ACL-discard log lines. Bug 1632 --- diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index e7693c38d..789887e35 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -101,6 +101,8 @@ JH/28 Bug 1588: Do not use the A lookup following an AAAA for setting the FQDN. modern usage is to not canoicalize the domain to a CNAME target (and we were inconsistent anyway for A-only vs AAAA+A). +JH/29 Bug 1632: Removed the word "rejected" from line logged for ACL discards. + Exim version 4.85 ----------------- diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c index 9fa2ae6ed..37cc023d3 100644 --- a/src/src/smtp_in.c +++ b/src/src/smtp_in.c @@ -4425,13 +4425,11 @@ while (done <= 0) else smtp_user_msg(US"250", user_msg); rcpt_fail_count++; discarded = TRUE; - log_write(0, LOG_MAIN|LOG_REJECT, "%s F=<%s> rejected RCPT %s: " + log_write(0, LOG_MAIN|LOG_REJECT, "%s F=<%s> RCPT %s: " "discarded by %s ACL%s%s", host_and_ident(TRUE), - (sender_address_unrewritten != NULL)? - sender_address_unrewritten : sender_address, + sender_address_unrewritten? sender_address_unrewritten : sender_address, smtp_cmd_argument, recipients_discarded? "MAIL" : "RCPT", - (log_msg == NULL)? US"" : US": ", - (log_msg == NULL)? US"" : log_msg); + log_msg ? US": " : US"", log_msg ? log_msg : US""); } /* Either the ACL failed the address, or it was deferred. */ diff --git a/test/log/0416 b/test/log/0416 index 564d33262..f8b67d176 100644 --- a/test/log/0416 +++ b/test/log/0416 @@ -3,15 +3,15 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss for x@y 1999-03-02 09:44:33 10HmaX-0005vi-00 => blackhole (non-SMTP ACL discarded recipients) 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 U=CALLER F= rejected RCPT : discarded by MAIL ACL: discard message 2 -1999-03-02 09:44:33 U=CALLER F= rejected RCPT : discarded by MAIL ACL: discard message 2 +1999-03-02 09:44:33 U=CALLER F= RCPT : discarded by MAIL ACL: discard message 2 +1999-03-02 09:44:33 U=CALLER F= RCPT : discarded by MAIL ACL: discard message 2 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex U=CALLER P=local-smtp S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 => blackhole (MAIL ACL discarded recipients) 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 U=CALLER F= rejected RCPT : discarded by RCPT ACL: discard message 1 -1999-03-02 09:44:33 U=CALLER F= rejected RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 U=CALLER F= RCPT : discarded by RCPT ACL: discard message 1 +1999-03-02 09:44:33 U=CALLER F= RCPT : discarded by RCPT ACL 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local-smtp S=sss for a@b -1999-03-02 09:44:33 U=CALLER F= rejected RCPT : discarded by RCPT ACL: discard message 1 +1999-03-02 09:44:33 U=CALLER F= RCPT : discarded by RCPT ACL: discard message 1 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@test.ex U=CALLER P=local-smtp S=sss 1999-03-02 09:44:33 10HmbA-0005vi-00 => blackhole (RCPT ACL discarded recipients) 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed diff --git a/test/log/0570 b/test/log/0570 index 53ba80a61..298306cd7 100644 --- a/test/log/0570 +++ b/test/log/0570 @@ -1,8 +1,8 @@ 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= rejected RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= rejected RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@primary.test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 => blackhole (RCPT ACL discarded recipients) 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed @@ -12,8 +12,8 @@ 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= rejected RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= rejected RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaZ-0005vi-00@primary.test.ex 1999-03-02 09:44:33 10HmbA-0005vi-00 => blackhole (RCPT ACL discarded recipients) 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed @@ -23,11 +23,11 @@ 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= rejected RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbB-0005vi-00@primary.test.ex 1999-03-02 09:44:33 10HmbC-0005vi-00 => blackhole (RCPT ACL discarded recipients) 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= rejected RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL 1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbB-0005vi-00@primary.test.ex 1999-03-02 09:44:33 10HmbD-0005vi-00 => blackhole (RCPT ACL discarded recipients) 1999-03-02 09:44:33 10HmbD-0005vi-00 Completed @@ -39,11 +39,11 @@ 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= rejected RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL 1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbE-0005vi-00@primary.test.ex 1999-03-02 09:44:33 10HmbF-0005vi-00 => blackhole (RCPT ACL discarded recipients) 1999-03-02 09:44:33 10HmbF-0005vi-00 Completed -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= rejected RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL 1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbE-0005vi-00@primary.test.ex 1999-03-02 09:44:33 10HmbG-0005vi-00 => blackhole (RCPT ACL discarded recipients) 1999-03-02 09:44:33 10HmbG-0005vi-00 Completed @@ -53,11 +53,11 @@ 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= rejected RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL 1999-03-02 09:44:33 10HmbI-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbH-0005vi-00@primary.test.ex 1999-03-02 09:44:33 10HmbI-0005vi-00 => blackhole (RCPT ACL discarded recipients) 1999-03-02 09:44:33 10HmbI-0005vi-00 Completed -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= rejected RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL 1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbH-0005vi-00@primary.test.ex 1999-03-02 09:44:33 10HmbJ-0005vi-00 => blackhole (RCPT ACL discarded recipients) 1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed @@ -67,12 +67,12 @@ 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 10HmbK-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= rejected RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= rejected RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL 1999-03-02 09:44:33 10HmbL-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbK-0005vi-00@primary.test.ex 1999-03-02 09:44:33 10HmbL-0005vi-00 => blackhole (RCPT ACL discarded recipients) 1999-03-02 09:44:33 10HmbL-0005vi-00 Completed -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= rejected RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL 1999-03-02 09:44:33 10HmbM-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbK-0005vi-00@primary.test.ex 1999-03-02 09:44:33 10HmbM-0005vi-00 => blackhole (RCPT ACL discarded recipients) 1999-03-02 09:44:33 10HmbM-0005vi-00 Completed diff --git a/test/rejectlog/0416 b/test/rejectlog/0416 index 21ce4e229..b6335ba42 100644 --- a/test/rejectlog/0416 +++ b/test/rejectlog/0416 @@ -1,6 +1,6 @@ 1999-03-02 09:44:33 U=CALLER temporarily rejected EHLO or HELO xxx -1999-03-02 09:44:33 U=CALLER F= rejected RCPT : discarded by MAIL ACL: discard message 2 -1999-03-02 09:44:33 U=CALLER F= rejected RCPT : discarded by MAIL ACL: discard message 2 -1999-03-02 09:44:33 U=CALLER F= rejected RCPT : discarded by RCPT ACL: discard message 1 -1999-03-02 09:44:33 U=CALLER F= rejected RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 U=CALLER F= rejected RCPT : discarded by RCPT ACL: discard message 1 +1999-03-02 09:44:33 U=CALLER F= RCPT : discarded by MAIL ACL: discard message 2 +1999-03-02 09:44:33 U=CALLER F= RCPT : discarded by MAIL ACL: discard message 2 +1999-03-02 09:44:33 U=CALLER F= RCPT : discarded by RCPT ACL: discard message 1 +1999-03-02 09:44:33 U=CALLER F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 U=CALLER F= RCPT : discarded by RCPT ACL: discard message 1 diff --git a/test/rejectlog/0570 b/test/rejectlog/0570 index d179df73b..89a2fcf74 100644 --- a/test/rejectlog/0570 +++ b/test/rejectlog/0570 @@ -1,13 +1,13 @@ -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= rejected RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= rejected RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= rejected RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= rejected RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= rejected RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= rejected RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= rejected RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= rejected RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= rejected RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= rejected RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= rejected RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= rejected RCPT : discarded by RCPT ACL -1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= rejected RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL +1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F= RCPT : discarded by RCPT ACL