diff options
| author | Tony Finch <dot@dotat.at> | 2011-01-14 14:16:53 +0000 |
|---|---|---|
| committer | Tony Finch <dot@dotat.at> | 2011-01-14 14:16:53 +0000 |
| commit | c0ea85abed9a15203691b049dd76104360fc0dc6 (patch) | |
| tree | f205ebb2402127f3a58eb36426380ba4f31b834a | |
| parent | 8c07b69f0292fa7dbfbd2409b389ae1e4ab5e222 (diff) | |
| download | exim4-c0ea85abed9a15203691b049dd76104360fc0dc6.tar.gz | |
src/transports/smtp.c: log LMTP confirmation same as SMTP
| -rw-r--r-- | doc/doc-txt/ChangeLog | 3 | ||||
| -rw-r--r-- | src/src/transports/smtp.c | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 0be0142b8..d19f30866 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -9,6 +9,9 @@ Exim version 4.74 TF/01 Failure to get a lock on a hints database can have serious consequences so log it to the panic log. +TF/02 Log LMTP confirmation messages in the same way as SMTP, + controlled using the smtp_confirmation log selector. + Exim version 4.73 ----------------- diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c index fb55ae01b..e06631f2f 100644 --- a/src/src/transports/smtp.c +++ b/src/src/transports/smtp.c @@ -1715,7 +1715,11 @@ if (!ok) ok = TRUE; else continue; } completed_address = TRUE; /* NOW we can set this flag */ - conf = string_sprintf("LMTP Successful delivery:%s", string_printing(buffer)); + if ((log_extra_selector & LX_smtp_confirmation) != 0) + { + uschar *s = string_printing(buffer); + conf = (s == buffer)? (uschar *)string_copy(s) : s; + } } /* SMTP, or success return from LMTP for this address. Pass back the |