Add log selector sender_verify_fail.

6 files changed, 73 insertions, 0 deletions

diff --git a/test/confs/0462 b/test/confs/0462
index 31560b90f..7ff47e6b5 100644
--- a/test/confs/0462
+++ b/test/confs/0462
@@ -1,5 +1,7 @@
 # Exim test configuration 0462
 
+SELECTOR=
+
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
@@ -15,6 +17,7 @@ domainlist local_domains = test.ex
 
 acl_smtp_rcpt = $local_part
 smtp_return_error_details
+log_selector = SELECTOR
 
 # ----- ACL -----
 
diff --git a/test/log/0462 b/test/log/0462
index 3a5954e9a..ec4952f98 100644
--- a/test/log/0462
+++ b/test/log/0462
@@ -2,3 +2,4 @@
 1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<Ok@localhost> rejected RCPT <checkpm@test.ex>: Sender verify failed
 1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root sender verify fail for <NOTok@elsewhere>: response to "RCPT TO:<NOTok@elsewhere>" from 127.0.0.1 [127.0.0.1] was: 550 NO
 1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root F=<NOTok@elsewhere> rejected RCPT <nocheckpm@test.ex>: Sender verify failed
+1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root F=<NOTok2@elsewhere> rejected RCPT <nocheckpm@test.ex>: Sender verify failed
diff --git a/test/rejectlog/0462 b/test/rejectlog/0462
index 3a5954e9a..ec4952f98 100644
--- a/test/rejectlog/0462
+++ b/test/rejectlog/0462
@@ -2,3 +2,4 @@
 1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<Ok@localhost> rejected RCPT <checkpm@test.ex>: Sender verify failed
 1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root sender verify fail for <NOTok@elsewhere>: response to "RCPT TO:<NOTok@elsewhere>" from 127.0.0.1 [127.0.0.1] was: 550 NO
 1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root F=<NOTok@elsewhere> rejected RCPT <nocheckpm@test.ex>: Sender verify failed
+1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root F=<NOTok2@elsewhere> rejected RCPT <nocheckpm@test.ex>: Sender verify failed
diff --git a/test/scripts/0000-Basic/0462 b/test/scripts/0000-Basic/0462
index a6f3622ba..d12ced725 100644
--- a/test/scripts/0000-Basic/0462
+++ b/test/scripts/0000-Basic/0462
@@ -41,3 +41,20 @@ MAIL FROM:<NOTok@elsewhere>
 RCPT TO:<nocheckpm@test.ex>
 QUIT
 ****
+# Same again, but with sender_verify_fail logging turned off
+server PORT_S
+220 Server ready
+HELO
+250 OK
+MAIL FROM
+250 OK
+RCPT TO
+550 NO
+QUIT
+250 OK
+****
+sudo exim -DSELECTOR=-sender_verify_fail -d-all+verify -v -bs -oMa V4NET.0.0.2
+MAIL FROM:<NOTok2@elsewhere>
+RCPT TO:<nocheckpm@test.ex>
+QUIT
+****
diff --git a/test/stderr/0462 b/test/stderr/0462
index 876aacc79..238959945 100644
--- a/test/stderr/0462
+++ b/test/stderr/0462
@@ -79,3 +79,34 @@ LOG: MAIN REJECT
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+Exim version x.yz ....
+configuration file is TESTSUITE/test-config
+trusted user
+admin user
+LOG: smtp_connection MAIN
+  SMTP connection from root
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+Verifying NOTok2@elsewhere
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+Considering NOTok2@elsewhere
+Attempting full verification using callout
+callout cache: found domain record
+callout cache: no address record found
+interface=NULL port=1224
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+  SMTP<< 220 Server ready
+  SMTP>> HELO myhost.test.ex
+  SMTP<< 250 OK
+  SMTP>> MAIL FROM:<>
+  SMTP<< 250 OK
+  SMTP>> RCPT TO:<NOTok2@elsewhere>
+  SMTP<< 550 NO
+  SMTP>> QUIT
+wrote callout cache domain record:
+  result=1 postmaster=0 random=0
+wrote negative callout cache address record
+LOG: MAIN REJECT
+  H=[V4NET.0.0.2] U=root F=<NOTok2@elsewhere> rejected RCPT <nocheckpm@test.ex>: Sender verify failed
+LOG: smtp_connection MAIN
+  SMTP connection from root closed by QUIT
+>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stdout/0462 b/test/stdout/0462
index f454d0c23..004a788af 100644
--- a/test/stdout/0462
+++ b/test/stdout/0462
@@ -18,6 +18,14 @@
 550-Response: 550 NO

 550 Sender verify failed

 221 myhost.test.ex closing connection

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250 OK

+550-Verification failed for <NOTok2@elsewhere>

+550-Called:   127.0.0.1

+550-Sent:     RCPT TO:<NOTok2@elsewhere>

+550-Response: 550 NO

+550 Sender verify failed

+221 myhost.test.ex closing connection

 
 ******** SERVER ********
 Listening on port 1224 ... 
@@ -50,3 +58,15 @@ RCPT TO:<NOTok@elsewhere>
 QUIT
 250 OK
 End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+HELO myhost.test.ex
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<NOTok2@elsewhere>
+550 NO
+QUIT
+250 OK
+End of script