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 checking for -D option use
[exim.git]
/
test
/
stderr
/
0487
diff --git
a/test/stderr/0487
b/test/stderr/0487
index e3217abe25e868555dc32c50ff376e442aee47d8..25c8b556835499ccc66f339eee8a4c5773309580 100644
(file)
--- a/
test/stderr/0487
+++ b/
test/stderr/0487
@@
-22,12
+22,15
@@
smtp_setup_msg entered
SMTP<< ehlo x.y
in dsn_advertise_hosts? no (option unset)
in pipelining_advertise_hosts? yes (matched "*")
SMTP<< ehlo x.y
in dsn_advertise_hosts? no (option unset)
in pipelining_advertise_hosts? yes (matched "*")
+ in chunking_advertise_hosts? no (end of list)
SMTP>> 250-myhost.test.ex Hello CALLER at x.y
250-SIZE 52428800
250-8BITMIME
250-PIPELINING
250 HELP
SMTP<< mail from:<x@y>
SMTP>> 250-myhost.test.ex Hello CALLER at x.y
250-SIZE 52428800
250-8BITMIME
250-PIPELINING
250 HELP
SMTP<< mail from:<x@y>
+spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
+log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
SMTP>> 250 OK
SMTP<< rcpt to:<userx@test.ex>
processing "accept"
SMTP>> 250 OK
SMTP<< rcpt to:<userx@test.ex>
processing "accept"
@@
-38,6
+41,7
@@
DSN: orcpt: NULL flags: 0
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
search_tidyup called
SMTP<< data
SMTP>> 354 Enter message, ending with "." on a line by itself
search_tidyup called
+PDKIM >> Body data for hash, canonicalized >>>>>>>>>>>>>>>>>>>>>>
>>Headers received:
From: unqualified
>>Headers received:
From: unqualified
@@
-49,6
+53,7
@@
F From: unqualified
I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000
I Message-Id: <E10HmaX-0005vi-00@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 (helo=x.y)
Data file written for message 10HmaX-0005vi-00
>>Generated Received: header line
P Received: from CALLER (helo=x.y)
@@
-58,11
+63,12
@@
P Received: from CALLER (helo=x.y)
for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
calling local_scan(); timeout=300
local_scan() returned 0 NULL
for userx@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
DSN: Write SPOOL :-dsn_envid NULL
DSN: Write SPOOL :-dsn_ret 0
DSN: Flags :0
DSN: **** SPOOL_OUT - address: |userx@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
DSN: Write SPOOL :-dsn_envid NULL
DSN: Write SPOOL :-dsn_ret 0
DSN: Flags :0
DSN: **** SPOOL_OUT - address: |userx@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
Size of headers = sss
LOG: MAIN
<= x@y U=CALLER P=local-esmtp S=sss
Size of headers = sss
LOG: MAIN
<= x@y U=CALLER P=local-esmtp S=sss
@@
-83,6
+89,7
@@
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
set_process_info: pppp delivering 10HmaX-0005vi-00
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
set_process_info: pppp delivering 10HmaX-0005vi-00
+Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D
reading spool file 10HmaX-0005vi-00-H
user=CALLER uid=CALLER_UID gid=CALLER_GID sender=x@y
sender_local=0 ident=CALLER
reading spool file 10HmaX-0005vi-00-H
user=CALLER uid=CALLER_UID gid=CALLER_GID sender=x@y
sender_local=0 ident=CALLER
@@
-96,7
+103,7
@@
DSN: set orcpt: NULL flags: 0
Delivery address list:
userx@test.ex
locking TESTSUITE/spool/db/retry.lockfile
Delivery address list:
userx@test.ex
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked
TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim
@@
-133,7
+140,7
@@
search_tidyup called
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> userx@test.ex <--------
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> userx@test.ex <--------
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked
TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
@@
-173,7
+180,7
@@
changed uid/gid: post-delivery tidying
set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00
Processing retry items
Succeeded addresses:
set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00
Processing retry items
Succeeded addresses:
-userx@test.ex: no retry items
+
userx@test.ex: no retry items
Failed addresses:
Deferred addresses:
end of retry processing
Failed addresses:
Deferred addresses:
end of retry processing
@@
-184,7
+191,7
@@
DSN: orcpt: NULL flags: 0
DSN: envid: NULL ret: 0
DSN: Final recipient: userx@test.ex
DSN: Remote SMTP server supports DSN: 0
DSN: envid: NULL ret: 0
DSN: Final recipient: userx@test.ex
DSN: Remote SMTP server supports DSN: 0
-DSN:
*** NOT SENDING DSN SUCCESS Message ***
+DSN:
not sending DSN success message
LOG: MAIN
Completed
end delivery of 10HmaX-0005vi-00
LOG: MAIN
Completed
end delivery of 10HmaX-0005vi-00
git://git.exim.org / exim.git / blobdiff