git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix logging of drop-after-EHLO-reject.
[exim.git]
/
test
/
stderr
/
0489
diff --git
a/test/stderr/0489
b/test/stderr/0489
index ffcf33dec4b0e2ab7e7b2d6ec89ff85ffd7137f9..d0caddc8ed81da1863084da9101ce156afa5bf21 100644
(file)
--- a/
test/stderr/0489
+++ b/
test/stderr/0489
@@
-4,16
+4,19
@@
trusted user
admin user
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name="Phil Q. Hazel"
sender address = CALLER@myhost.test.ex
admin user
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name="Phil Q. Hazel"
sender address = CALLER@myhost.test.ex
+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
Sender: CALLER@myhost.test.ex
Recipients:
X
>>Headers received:
>>Headers after rewriting and local additions:
Sender: CALLER@myhost.test.ex
Recipients:
X
>>Headers received:
>>Headers after rewriting and local additions:
- Date: Tue, 2 Mar 1999 09:44:33 +0000
I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
F From: "Phil Q. Hazel" <CALLER@myhost.test.ex>
I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
F From: "Phil Q. Hazel" <CALLER@myhost.test.ex>
+ Date: Tue, 2 Mar 1999 09:44:33 +0000
+Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D
Data file written for message 10HmaX-0005vi-00
>>Generated Received: header line
P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Data file written for message 10HmaX-0005vi-00
>>Generated Received: header line
P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
@@
-22,7
+25,8
@@
P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
calling local_scan(); timeout=300
local_scan() returned 0 NULL
for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
calling local_scan(); timeout=300
local_scan() returned 0 NULL
-Writing spool header file
+Writing spool header file: TESTSUITE/spool//input//hdr.pppp
+Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
Size of headers = sss
LOG: MAIN
<= CALLER@myhost.test.ex U=CALLER P=local S=sss
Size of headers = sss
LOG: MAIN
<= CALLER@myhost.test.ex U=CALLER P=local S=sss
@@
-34,16
+38,19
@@
trusted user
admin user
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=John "Jack" Smith
sender address = CALLER@myhost.test.ex
admin user
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=John "Jack" Smith
sender address = CALLER@myhost.test.ex
+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
Sender: CALLER@myhost.test.ex
Recipients:
X
>>Headers received:
>>Headers after rewriting and local additions:
Sender: CALLER@myhost.test.ex
Recipients:
X
>>Headers received:
>>Headers after rewriting and local additions:
- Date: Tue, 2 Mar 1999 09:44:33 +0000
I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
F From: John "Jack" Smith <CALLER@myhost.test.ex>
I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
F From: John "Jack" Smith <CALLER@myhost.test.ex>
+ Date: Tue, 2 Mar 1999 09:44:33 +0000
+Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D
Data file written for message 10HmaY-0005vi-00
>>Generated Received: header line
P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Data file written for message 10HmaY-0005vi-00
>>Generated Received: header line
P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
@@
-52,7
+59,8
@@
P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
calling local_scan(); timeout=300
local_scan() returned 0 NULL
for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
calling local_scan(); timeout=300
local_scan() returned 0 NULL
-Writing spool header file
+Writing spool header file: TESTSUITE/spool//input//hdr.pppp
+Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H
Size of headers = sss
LOG: MAIN
<= CALLER@myhost.test.ex U=CALLER P=local S=sss
Size of headers = sss
LOG: MAIN
<= CALLER@myhost.test.ex U=CALLER P=local S=sss
@@
-63,16
+71,19
@@
trusted user
admin user
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=John "Jack" "Q." Smith
sender address = CALLER@myhost.test.ex
admin user
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=John "Jack" "Q." Smith
sender address = CALLER@myhost.test.ex
+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
Sender: CALLER@myhost.test.ex
Recipients:
X
>>Headers received:
>>Headers after rewriting and local additions:
Sender: CALLER@myhost.test.ex
Recipients:
X
>>Headers received:
>>Headers after rewriting and local additions:
- Date: Tue, 2 Mar 1999 09:44:33 +0000
I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
F From: John "Jack" "Q." Smith <CALLER@myhost.test.ex>
I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
F From: John "Jack" "Q." Smith <CALLER@myhost.test.ex>
+ Date: Tue, 2 Mar 1999 09:44:33 +0000
+Data file name: TESTSUITE/spool//input//10HmaZ-0005vi-00-D
Data file written for message 10HmaZ-0005vi-00
>>Generated Received: header line
P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Data file written for message 10HmaZ-0005vi-00
>>Generated Received: header line
P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
@@
-81,7
+92,8
@@
P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
calling local_scan(); timeout=300
local_scan() returned 0 NULL
for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
calling local_scan(); timeout=300
local_scan() returned 0 NULL
-Writing spool header file
+Writing spool header file: TESTSUITE/spool//input//hdr.pppp
+Renaming spool header file: TESTSUITE/spool//input//10HmaZ-0005vi-00-H
Size of headers = sss
LOG: MAIN
<= CALLER@myhost.test.ex U=CALLER P=local S=sss
Size of headers = sss
LOG: MAIN
<= CALLER@myhost.test.ex U=CALLER P=local S=sss
@@
-92,16
+104,19
@@
trusted user
admin user
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name="John (Jack) Q. Smith"
sender address = CALLER@myhost.test.ex
admin user
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name="John (Jack) Q. Smith"
sender address = CALLER@myhost.test.ex
+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
Sender: CALLER@myhost.test.ex
Recipients:
X
>>Headers received:
>>Headers after rewriting and local additions:
Sender: CALLER@myhost.test.ex
Recipients:
X
>>Headers received:
>>Headers after rewriting and local additions:
- Date: Tue, 2 Mar 1999 09:44:33 +0000
I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
F From: "John (Jack) Q. Smith" <CALLER@myhost.test.ex>
I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
F From: "John (Jack) Q. Smith" <CALLER@myhost.test.ex>
+ Date: Tue, 2 Mar 1999 09:44:33 +0000
+Data file name: TESTSUITE/spool//input//10HmbA-0005vi-00-D
Data file written for message 10HmbA-0005vi-00
>>Generated Received: header line
P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Data file written for message 10HmbA-0005vi-00
>>Generated Received: header line
P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
@@
-110,7
+125,8
@@
P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
calling local_scan(); timeout=300
local_scan() returned 0 NULL
for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
calling local_scan(); timeout=300
local_scan() returned 0 NULL
-Writing spool header file
+Writing spool header file: TESTSUITE/spool//input//hdr.pppp
+Renaming spool header file: TESTSUITE/spool//input//10HmbA-0005vi-00-H
Size of headers = sss
LOG: MAIN
<= CALLER@myhost.test.ex U=CALLER P=local S=sss
Size of headers = sss
LOG: MAIN
<= CALLER@myhost.test.ex U=CALLER P=local S=sss
@@
-121,16
+137,19
@@
trusted user
admin user
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=John ("Jack") "Q." Smith
sender address = CALLER@myhost.test.ex
admin user
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=John ("Jack") "Q." Smith
sender address = CALLER@myhost.test.ex
+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
Sender: CALLER@myhost.test.ex
Recipients:
X
>>Headers received:
>>Headers after rewriting and local additions:
Sender: CALLER@myhost.test.ex
Recipients:
X
>>Headers received:
>>Headers after rewriting and local additions:
- Date: Tue, 2 Mar 1999 09:44:33 +0000
I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
F From: John ("Jack") "Q." Smith <CALLER@myhost.test.ex>
I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
F From: John ("Jack") "Q." Smith <CALLER@myhost.test.ex>
+ Date: Tue, 2 Mar 1999 09:44:33 +0000
+Data file name: TESTSUITE/spool//input//10HmbB-0005vi-00-D
Data file written for message 10HmbB-0005vi-00
>>Generated Received: header line
P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Data file written for message 10HmbB-0005vi-00
>>Generated Received: header line
P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
@@
-139,7
+158,8
@@
P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
calling local_scan(); timeout=300
local_scan() returned 0 NULL
for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
calling local_scan(); timeout=300
local_scan() returned 0 NULL
-Writing spool header file
+Writing spool header file: TESTSUITE/spool//input//hdr.pppp
+Renaming spool header file: TESTSUITE/spool//input//10HmbB-0005vi-00-H
Size of headers = sss
LOG: MAIN
<= CALLER@myhost.test.ex U=CALLER P=local S=sss
Size of headers = sss
LOG: MAIN
<= CALLER@myhost.test.ex U=CALLER P=local S=sss
@@
-150,16
+170,19
@@
trusted user
admin user
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name="John (\"Jack\") Q. Smith"
sender address = CALLER@myhost.test.ex
admin user
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name="John (\"Jack\") Q. Smith"
sender address = CALLER@myhost.test.ex
+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
Sender: CALLER@myhost.test.ex
Recipients:
X
>>Headers received:
>>Headers after rewriting and local additions:
Sender: CALLER@myhost.test.ex
Recipients:
X
>>Headers received:
>>Headers after rewriting and local additions:
- Date: Tue, 2 Mar 1999 09:44:33 +0000
I Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
F From: "John (\"Jack\") Q. Smith" <CALLER@myhost.test.ex>
I Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
F From: "John (\"Jack\") Q. Smith" <CALLER@myhost.test.ex>
+ Date: Tue, 2 Mar 1999 09:44:33 +0000
+Data file name: TESTSUITE/spool//input//10HmbC-0005vi-00-D
Data file written for message 10HmbC-0005vi-00
>>Generated Received: header line
P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Data file written for message 10HmbC-0005vi-00
>>Generated Received: header line
P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
@@
-168,7
+191,8
@@
P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
calling local_scan(); timeout=300
local_scan() returned 0 NULL
for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
calling local_scan(); timeout=300
local_scan() returned 0 NULL
-Writing spool header file
+Writing spool header file: TESTSUITE/spool//input//hdr.pppp
+Renaming spool header file: TESTSUITE/spool//input//10HmbC-0005vi-00-H
Size of headers = sss
LOG: MAIN
<= CALLER@myhost.test.ex U=CALLER P=local S=sss
Size of headers = sss
LOG: MAIN
<= CALLER@myhost.test.ex U=CALLER P=local S=sss
@@
-179,16
+203,19
@@
trusted user
admin user
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name="Phil \"Q Hazel"
sender address = CALLER@myhost.test.ex
admin user
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name="Phil \"Q Hazel"
sender address = CALLER@myhost.test.ex
+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
Sender: CALLER@myhost.test.ex
Recipients:
X
>>Headers received:
>>Headers after rewriting and local additions:
Sender: CALLER@myhost.test.ex
Recipients:
X
>>Headers received:
>>Headers after rewriting and local additions:
- Date: Tue, 2 Mar 1999 09:44:33 +0000
I Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
F From: "Phil \"Q Hazel" <CALLER@myhost.test.ex>
I Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
F From: "Phil \"Q Hazel" <CALLER@myhost.test.ex>
+ Date: Tue, 2 Mar 1999 09:44:33 +0000
+Data file name: TESTSUITE/spool//input//10HmbD-0005vi-00-D
Data file written for message 10HmbD-0005vi-00
>>Generated Received: header line
P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Data file written for message 10HmbD-0005vi-00
>>Generated Received: header line
P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
@@
-197,7
+224,8
@@
P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
calling local_scan(); timeout=300
local_scan() returned 0 NULL
for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
calling local_scan(); timeout=300
local_scan() returned 0 NULL
-Writing spool header file
+Writing spool header file: TESTSUITE/spool//input//hdr.pppp
+Renaming spool header file: TESTSUITE/spool//input//10HmbD-0005vi-00-H
Size of headers = sss
LOG: MAIN
<= CALLER@myhost.test.ex U=CALLER P=local S=sss
Size of headers = sss
LOG: MAIN
<= CALLER@myhost.test.ex U=CALLER P=local S=sss
@@
-208,16
+236,19
@@
trusted user
admin user
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name="Phil \"Q" "X." Hazel
sender address = CALLER@myhost.test.ex
admin user
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name="Phil \"Q" "X." Hazel
sender address = CALLER@myhost.test.ex
+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
Sender: CALLER@myhost.test.ex
Recipients:
X
>>Headers received:
>>Headers after rewriting and local additions:
Sender: CALLER@myhost.test.ex
Recipients:
X
>>Headers received:
>>Headers after rewriting and local additions:
- Date: Tue, 2 Mar 1999 09:44:33 +0000
I Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
F From: "Phil \"Q" "X." Hazel <CALLER@myhost.test.ex>
I Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
F From: "Phil \"Q" "X." Hazel <CALLER@myhost.test.ex>
+ Date: Tue, 2 Mar 1999 09:44:33 +0000
+Data file name: TESTSUITE/spool//input//10HmbE-0005vi-00-D
Data file written for message 10HmbE-0005vi-00
>>Generated Received: header line
P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Data file written for message 10HmbE-0005vi-00
>>Generated Received: header line
P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
@@
-226,7
+257,8
@@
P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
calling local_scan(); timeout=300
local_scan() returned 0 NULL
for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
calling local_scan(); timeout=300
local_scan() returned 0 NULL
-Writing spool header file
+Writing spool header file: TESTSUITE/spool//input//hdr.pppp
+Renaming spool header file: TESTSUITE/spool//input//10HmbE-0005vi-00-H
Size of headers = sss
LOG: MAIN
<= CALLER@myhost.test.ex U=CALLER P=local S=sss
Size of headers = sss
LOG: MAIN
<= CALLER@myhost.test.ex U=CALLER P=local S=sss