X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/ccec2d82e2fda6d764f6cd1a9dd21c4f6285b614..09a2523a0d7d31ce2ed7c6e24732919258c43fab:/test/stderr/2600?ds=sidebyside
diff --git a/test/stderr/2600 b/test/stderr/2600
index 93bb7fa1b..c53a5ef8a 100644
--- a/test/stderr/2600
+++ b/test/stderr/2600
@@ -161,6 +161,12 @@ host in helo_try_verify_hosts? no (option unset)
host in helo_accept_junk_hosts? no (option unset)
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [10.0.0.0]
+sender_rcvhost = [10.0.0.0] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [10.0.0.0]
+SMTP>> 250 myhost.test.ex Hello test [10.0.0.0]
SMTP<< mail from:
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
@@ -193,7 +199,7 @@ deny: condition test succeeded in ACL "check_recipient"
end of ACL "check_recipient": DENY
SMTP>> 550 relay not permitted
LOG: MAIN REJECT
- H=[10.0.0.0] F= rejected RCPT : relay not permitted
+ H=(test) [10.0.0.0] F= rejected RCPT : relay not permitted
SMTP<< rcpt to:
using ACL "check_recipient"
processing "accept" (TESTSUITE/test-config 32)
@@ -223,11 +229,11 @@ deny: condition test succeeded in ACL "check_recipient"
end of ACL "check_recipient": DENY
SMTP>> 550 relay not permitted
LOG: MAIN REJECT
- H=[10.0.0.0] F= rejected RCPT : relay not permitted
+ H=(test) [10.0.0.0] F= rejected RCPT : relay not permitted
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
- SMTP connection from [10.0.0.0] closed by QUIT
+ SMTP connection from (test) [10.0.0.0] closed by QUIT
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
@@ -256,6 +262,12 @@ host in helo_try_verify_hosts? no (option unset)
host in helo_accept_junk_hosts? no (option unset)
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [10.0.0.0]
+sender_rcvhost = [10.0.0.0] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [10.0.0.0]
+SMTP>> 250 myhost.test.ex Hello test [10.0.0.0]
SMTP<< mail from:
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
@@ -288,7 +300,7 @@ deny: condition test succeeded in ACL "check_recipient"
end of ACL "check_recipient": DENY
SMTP>> 550 relay not permitted
LOG: MAIN REJECT
- H=[10.0.0.0] F= rejected RCPT : relay not permitted
+ H=(test) [10.0.0.0] F= rejected RCPT : relay not permitted
SMTP<< rcpt to:
using ACL "check_recipient"
processing "accept" (TESTSUITE/test-config 32)
@@ -318,11 +330,11 @@ deny: condition test succeeded in ACL "check_recipient"
end of ACL "check_recipient": DENY
SMTP>> 550 relay not permitted
LOG: MAIN REJECT
- H=[10.0.0.0] F= rejected RCPT : relay not permitted
+ H=(test) [10.0.0.0] F= rejected RCPT : relay not permitted
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
- SMTP connection from [10.0.0.0] closed by QUIT
+ SMTP connection from (test) [10.0.0.0] closed by QUIT
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
@@ -351,6 +363,12 @@ host in helo_try_verify_hosts? no (option unset)
host in helo_accept_junk_hosts? no (option unset)
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [10.10.10.10]
+sender_rcvhost = [10.10.10.10] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [10.10.10.10]
+SMTP>> 250 myhost.test.ex Hello test [10.10.10.10]
SMTP<< mail from:
spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
@@ -406,7 +424,7 @@ SMTP>> 250 Accepted
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
- SMTP connection from [10.10.10.10] closed by QUIT
+ SMTP connection from (test) [10.10.10.10] closed by QUIT
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
@@ -443,7 +461,8 @@ Data file written for message 10HmaX-0005vi-00
P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
(envelope-from )
id 10HmaX-0005vi-00
- for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+ for userx@myhost.test.ex;
+ Tue, 2 Mar 1999 09:44:33 +0000
Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0
Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
@@ -469,11 +488,11 @@ reading spool file 10HmaX-0005vi-00-H
user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@myhost.test.ex
sender_local=1 ident=CALLER
Non-recipients:
-Empty Tree
+ Empty Tree
---- End of tree ----
recipients_count=1
**** SPOOL_IN - No additional fields
-body_linecount=1 message_linecount=7
+body_linecount=1 message_linecount=8
DSN: set orcpt: flags: 0x0
Delivery address list:
userx@myhost.test.ex
@@ -481,8 +500,7 @@ Delivery address list:
locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN: file dir flags=O_RDONLY
returned from EXIM_DBOPEN: (nil)
- ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim
- failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory
+ failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: userx@myhost.test.ex