Note MAIL commands in -bS batch, to avoid smtp_no_mail logline. Bug 1346

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index dcae009b6d9dcff6510144e9425649b1be0f05d7..09f5c60490c354e684c39c4fde60d79e185e48a0 100644 (file)
--- 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 aa3936288e262a224a117af8ce3613693c291f5b..b451c48f586b6cce17e5c9f8a5ee3e25924405ac 100644 (file)
--- 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 3f5c25d3335f884a78cd284a83f1c2b93926b7a3..e85bb4ec4e4da0a1e3ae606f8bc63f8fbf866e76 100644 (file)
--- 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 -----