diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2015-05-17 18:08:53 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2015-05-17 18:08:53 +0100 |
| commit | 1f12df4d41f546751e14d52df36172f9bb54cce8 (patch) | |
| tree | 3b9d0bc33ddbe7ccb89e815a19fb33eca2c785e0 /src | |
| parent | b5a60d02b6983fca92f422b88f5f03f7889a1ace (diff) | |
Remove word "rejected" from ACL-discard log lines. Bug 1632
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/smtp_in.c | 8 |
1 files changed, 3 insertions, 5 deletions
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. */ |