https://bugs.exim.org/show_bug.cgi?id=1346
Git Commit <git@???> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |git@???
--- Comment #2 from Git Commit <git@???> ---
Git commit:
http://git.exim.org/exim.git/commitdiff/474f71bfffe53a9ade7addd3b0e363251487db79
commit 474f71bfffe53a9ade7addd3b0e363251487db79
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Wed May 27 12:41:08 2015 +0100
Commit: Jeremy Harris <jgh146exb@???>
CommitDate: Wed May 27 12:41:08 2015 +0100
Note MAIL commands in -bS batch, to avoid smtp_no_mail logline. Bug 1346
---
doc/doc-txt/ChangeLog | 2 ++
src/src/smtp_in.c | 1 +
test/confs/0006 | 1 +
3 files changed, 4 insertions(+)
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index dcae009..09f5c60 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -111,6 +111,8 @@ JH/31 Check the HELO verification lookup for DNSSEC, adding
new
JH/32 Bug 1397: Enable ECDHE on OpenSSL, just the NIST P-256 curve.
+JH/33 Bug 1346: Note MAIL cmd seen in -bS batch, to avoid smtp_no_mail log.
+
Exim version 4.85
-----------------
diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index aa39362..b451c48 100644
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -1645,6 +1645,7 @@ while (done <= 0)
it is the canonical extracted address which is all that is kept. */
case MAIL_CMD:
+ smtp_mailcmd_count++; /* Count for no-mail log */
if (sender_address != NULL)
/* The function moan_smtp_batch() does not return. */
moan_smtp_batch(smtp_cmd_buffer, "503 Sender already given");
diff --git a/test/confs/0006 b/test/confs/0006
index 3f5c25d..e85bb4e 100644
--- a/test/confs/0006
+++ b/test/confs/0006
@@ -11,6 +11,7 @@ gecos_name = CALLER_NAME
acl_smtp_rcpt = accept
trusted_users = CALLER
+log_selector = +smtp_no_mail
# ----- Routers -----
--
You are receiving this mail because:
You are on the CC list for the bug.
