git://git.exim.org / users / jgh / exim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Callouts: filter smtp response for bad chars before using in our smtp response. ...
[users/jgh/exim.git] / test / stderr / 0398
diff --git a/test/stderr/0398 b/test/stderr/0398
index 96cf8999d59e0012570be9a0c2ef552df94067c0..82e188f1bb99ec7aa0c11c8e34e6022971d982c4 100644 (file)
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -21,7 +21,7 @@ log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<abc@local>
 using ACL "rcpt"
-processing "deny"
+processing "deny" (TESTSUITE/test-config 19)
 check senders = qq@remote
 address match test: subject=qq@remote pattern=qq@remote
 remote in "remote"? yes (matched "remote")
@@ -47,8 +47,8 @@ r2 router called for qq@remote
   domain = remote
 route_item = * 127.0.0.1
 remote in "*"? yes (matched "*")
-original list of hosts = "127.0.0.1" options = 
-expanded list of hosts = "127.0.0.1" options = 
+original list of hosts = '127.0.0.1' options = ''
+expanded list of hosts = '127.0.0.1' options = ''
 set transport t2
 finding IP address for 127.0.0.1
 calling host_find_byname
@@ -70,7 +70,7 @@ routed by r2 router
 ----------- end verify ------------
 sender qq@remote verified ok
 deny: condition test failed in ACL "rcpt"
-processing "warn"
+processing "warn" (TESTSUITE/test-config 21)
 check senders = qq@remote
 address match test: subject=qq@remote pattern=qq@remote
 remote in "remote"? yes (matched "remote")
@@ -96,8 +96,8 @@ r2 router called for qq@remote
   domain = remote
 route_item = * 127.0.0.1
 remote in "*"? yes (matched "*")
-original list of hosts = "127.0.0.1" options = 
-expanded list of hosts = "127.0.0.1" options = 
+original list of hosts = '127.0.0.1' options = ''
+expanded list of hosts = '127.0.0.1' options = ''
 finding IP address for 127.0.0.1
 calling host_find_byname
 using host_fake_gethostbyname for 127.0.0.1 (IPv4)
@@ -116,19 +116,19 @@ routed by r2 router
   transport: t2
   host 127.0.0.1 [127.0.0.1]
 Attempting full verification using callout
-locking TESTSUITE/spool/db/callout.lockfile
-locked  TESTSUITE/spool/db/callout.lockfile
-EXIM_DBOPEN: file <TESTSUITE/spool/db/callout> dir <TESTSUITE/spool/db> flags=O_RDWR
-returned from EXIM_DBOPEN: 0xAAAAAAAA
-opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR
-dbfn_read: key=remote
+ locking TESTSUITE/spool/db/callout.lockfile
+ locked  TESTSUITE/spool/db/callout.lockfile
+ EXIM_DBOPEN: file <TESTSUITE/spool/db/callout> dir <TESTSUITE/spool/db> flags=O_RDWR
+ returned from EXIM_DBOPEN: 0xAAAAAAAA
+ opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR
+ dbfn_read: key=remote
 callout cache: found domain record for remote
-dbfn_read: key=qq@remote
+ dbfn_read: key=qq@remote
 callout cache: no address record found for qq@remote
-EXIM_DBCLOSE(0xAAAAAAAA)
-closed hints database and lockfile
+ EXIM_DBCLOSE(0xAAAAAAAA)
+ closed hints database and lockfile
 interface=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP<< 220 Server ready
 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
   SMTP>> EHLO mail.test.ex
@@ -142,29 +142,30 @@ cmd buf flush ddd bytes
   SMTP<< 250 OK
   SMTP>> RCPT TO:<qq@remote>
 cmd buf flush ddd bytes
+sync_responses expect rcpt
   SMTP<< 550 Unknown
   SMTP>> QUIT
 cmd buf flush ddd bytes
   SMTP<< 250 OK
   SMTP(close)>>
-locking TESTSUITE/spool/db/callout.lockfile
-locked  TESTSUITE/spool/db/callout.lockfile
-EXIM_DBOPEN: file <TESTSUITE/spool/db/callout> dir <TESTSUITE/spool/db> flags=O_RDWR|O_CREAT
-returned from EXIM_DBOPEN: 0xAAAAAAAA
-opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR|O_CREAT
-dbfn_write: key=remote
+ locking TESTSUITE/spool/db/callout.lockfile
+ locked  TESTSUITE/spool/db/callout.lockfile
+ EXIM_DBOPEN: file <TESTSUITE/spool/db/callout> dir <TESTSUITE/spool/db> flags=O_RDWR|O_CREAT
+ returned from EXIM_DBOPEN: 0xAAAAAAAA
+ opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR|O_CREAT
+ dbfn_write: key=remote
 wrote callout cache domain record for remote:
   result=1 postmaster=0 random=0
-dbfn_write: key=qq@remote
+ dbfn_write: key=qq@remote
 wrote negative callout cache address record for qq@remote
-EXIM_DBCLOSE(0xAAAAAAAA)
-closed hints database and lockfile
+ EXIM_DBCLOSE(0xAAAAAAAA)
+ closed hints database and lockfile
 ----------- end verify ------------
 l_message: $acl_verify_message
 warn: condition test succeeded in ACL "rcpt"
 LOG: MAIN
   U=CALLER Warning: Sender verify failed: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<qq@remote>: 550 Unknown
-processing "accept"
+processing "accept" (TESTSUITE/test-config 24)
 check senders = qq@remote
 address match test: subject=qq@remote pattern=qq@remote
 remote in "remote"? yes (matched "remote")
@@ -175,7 +176,7 @@ SMTP>> 250 Accepted
 DSN: orcpt: NULL  flags: 0
 SMTP<< rcpt to:<xyz@local>
 using ACL "rcpt"
-processing "deny"
+processing "deny" (TESTSUITE/test-config 19)
 check senders = qq@remote
 address match test: subject=qq@remote pattern=qq@remote
 remote in "remote"? yes (matched "remote")
@@ -183,7 +184,7 @@ qq@remote in "qq@remote"? yes (matched "qq@remote")
 check !verify = sender
 using cached sender verify result
 deny: condition test failed in ACL "rcpt"
-processing "warn"
+processing "warn" (TESTSUITE/test-config 21)
 check senders = qq@remote
 address match test: subject=qq@remote pattern=qq@remote
 remote in "remote"? yes (matched "remote")
@@ -209,8 +210,8 @@ r2 router called for qq@remote
   domain = remote
 route_item = * 127.0.0.1
 remote in "*"? yes (matched "*")
-original list of hosts = "127.0.0.1" options = 
-expanded list of hosts = "127.0.0.1" options = 
+original list of hosts = '127.0.0.1' options = ''
+expanded list of hosts = '127.0.0.1' options = ''
 finding IP address for 127.0.0.1
 calling host_find_byname
 using host_fake_gethostbyname for 127.0.0.1 (IPv4)
@@ -229,24 +230,24 @@ routed by r2 router
   transport: t2
   host 127.0.0.1 [127.0.0.1]
 Attempting full verification using callout
-locking TESTSUITE/spool/db/callout.lockfile
-locked  TESTSUITE/spool/db/callout.lockfile
-EXIM_DBOPEN: file <TESTSUITE/spool/db/callout> dir <TESTSUITE/spool/db> flags=O_RDWR
-returned from EXIM_DBOPEN: 0xAAAAAAAA
-opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR
-dbfn_read: key=remote
+ locking TESTSUITE/spool/db/callout.lockfile
+ locked  TESTSUITE/spool/db/callout.lockfile
+ EXIM_DBOPEN: file <TESTSUITE/spool/db/callout> dir <TESTSUITE/spool/db> flags=O_RDWR
+ returned from EXIM_DBOPEN: 0xAAAAAAAA
+ opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR
+ dbfn_read: key=remote
 callout cache: found domain record for remote
-dbfn_read: key=qq@remote
+ dbfn_read: key=qq@remote
 callout cache: found address record for qq@remote
 callout cache: address record is negative
-EXIM_DBCLOSE(0xAAAAAAAA)
-closed hints database and lockfile
+ EXIM_DBCLOSE(0xAAAAAAAA)
+ closed hints database and lockfile
 ----------- end verify ------------
 l_message: $acl_verify_message
 warn: condition test succeeded in ACL "rcpt"
 LOG: MAIN
   U=CALLER Warning: Sender verify failed
-processing "accept"
+processing "accept" (TESTSUITE/test-config 24)
 check senders = qq@remote
 address match test: subject=qq@remote pattern=qq@remote
 remote in "remote"? yes (matched "remote")
Jeremy Harris' staging directory