diff options
Diffstat (limited to 'test/stderr')
| -rw-r--r-- | test/stderr/0143 | 2 | ||||
| -rw-r--r-- | test/stderr/0169 | 6 | ||||
| -rw-r--r-- | test/stderr/0370 | 2 | ||||
| -rw-r--r-- | test/stderr/0386 | 12 | ||||
| -rw-r--r-- | test/stderr/0393 | 16 | ||||
| -rw-r--r-- | test/stderr/0402 | 12 | ||||
| -rw-r--r-- | test/stderr/0404 | 8 | ||||
| -rw-r--r-- | test/stderr/0408 | 6 | ||||
| -rw-r--r-- | test/stderr/0476 | 2 | ||||
| -rw-r--r-- | test/stderr/0487 | 6 | ||||
| -rw-r--r-- | test/stderr/0512 | 4 | ||||
| -rw-r--r-- | test/stderr/2600 | 6 | ||||
| -rw-r--r-- | test/stderr/5004 | 2 | ||||
| -rw-r--r-- | test/stderr/5005 | 4 | ||||
| -rw-r--r-- | test/stderr/5006 | 2 | ||||
| -rw-r--r-- | test/stderr/5008 | 4 | ||||
| -rw-r--r-- | test/stderr/9100 | 12 | ||||
| -rw-r--r-- | test/stderr/9200 | 6 | ||||
| -rw-r--r-- | test/stderr/9400 | 12 | ||||
| -rw-r--r-- | test/stderr/9450 | 204 | ||||
| -rw-r--r-- | test/stderr/9901 | 2 |
21 files changed, 168 insertions, 162 deletions
diff --git a/test/stderr/0143 b/test/stderr/0143 index 5db549a53..06ddcd7cf 100644 --- a/test/stderr/0143 +++ b/test/stderr/0143 @@ -29,7 +29,7 @@ not using PIPELINING SMTP>> DATA SMTP<< 354 Send data SMTP>> writing message and terminating "." -writing data block fd=6 size=sss timeout=300 +writing data block fd=dddd size=sss timeout=300 SMTP<< 250 OK ok=1 send_quit=1 send_rset=0 continue_more=0 yield=0 first_address is NULL transport_check_waiting entered diff --git a/test/stderr/0169 b/test/stderr/0169 index 28cde3024..70f11bf4f 100644 --- a/test/stderr/0169 +++ b/test/stderr/0169 @@ -23,9 +23,9 @@ mailbox TESTSUITE/test-mail/userx is locked writing to file TESTSUITE/test-mail/userx Exim quota = 52428800 old size = sssss this message = sss (included) file count quota = 0 count = 0 -writing data block fd=6 size=sss timeout=0 -writing data block fd=6 size=sss timeout=0 -writing data block fd=6 size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 quota = 52428800 threshold = 21495808 old size = sssss message size = sss appendfile yields 0 with errno=dd more_errno=dd appendfile transport returned OK for userx@myhost.test.ex diff --git a/test/stderr/0370 b/test/stderr/0370 index b274e613d..1f00a3de1 100644 --- a/test/stderr/0370 +++ b/test/stderr/0370 @@ -22,7 +22,7 @@ t1 transport entered direct command: argv[0] = TESTSUITE/bin/iefbr14 Writing message to pipe -writing data block fd=8 size=sss timeout=3600 +writing data block fd=dddd size=sss timeout=3600 writing error 32: Broken pipe transport error EPIPE ignored t1 transport yielded 0 diff --git a/test/stderr/0386 b/test/stderr/0386 index 2679f5b74..8ff9bda89 100644 --- a/test/stderr/0386 +++ b/test/stderr/0386 @@ -279,9 +279,9 @@ hitch name: TESTSUITE/test-mail/2.lock.test.ex.dddddddd.pppppppp lock file created mailbox TESTSUITE/test-mail/2 is locked writing to file TESTSUITE/test-mail/2 -writing data block fd=10 size=sss timeout=0 -writing data block fd=10 size=sss timeout=0 -writing data block fd=10 size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 appendfile yields 0 with errno=dd more_errno=dd search_tidyup called journalling 2@b @@ -436,9 +436,9 @@ hitch name: TESTSUITE/test-mail/2.lock.test.ex.dddddddd.pppppppp lock file created mailbox TESTSUITE/test-mail/2 is locked writing to file TESTSUITE/test-mail/2 -writing data block fd=10 size=sss timeout=0 -writing data block fd=10 size=sss timeout=0 -writing data block fd=10 size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 appendfile yields 0 with errno=dd more_errno=dd search_tidyup called journalling 2@b diff --git a/test/stderr/0393 b/test/stderr/0393 index f156f788f..b45f77703 100644 --- a/test/stderr/0393 +++ b/test/stderr/0393 @@ -26,16 +26,16 @@ hitch name: TESTSUITE/test-mail/userx.lock.test.ex.dddddddd.pppppppp lock file created mailbox TESTSUITE/test-mail/userx is locked writing to file TESTSUITE/test-mail/userx -writing data block fd=6 size=sss timeout=0 -process pppp running as transport filter: write=9 read=10 -writing data block fd=9 size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 +process pppp running as transport filter: write=dddd read=dddd +writing data block fd=dddd size=sss timeout=0 process pppp writing to transport filter copying from the filter waiting for filter process waiting for writing process -writing data block fd=6 size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 end of filtering transport writing: yield=1 -writing data block fd=6 size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 appendfile yields 0 with errno=dd more_errno=dd t1 transport returned OK for userx@test.ex LOG: MAIN @@ -69,9 +69,9 @@ hitch name: TESTSUITE/test-mail/userx.lock.test.ex.dddddddd.pppppppp lock file created mailbox TESTSUITE/test-mail/userx is locked writing to file TESTSUITE/test-mail/userx -writing data block fd=6 size=sss timeout=0 -process pppp running as transport filter: write=9 read=10 -writing data block fd=9 size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 +process pppp running as transport filter: write=dddd read=dddd +writing data block fd=dddd size=sss timeout=0 writing error 32: Broken pipe process pppp writing to transport filter copying from the filter diff --git a/test/stderr/0402 b/test/stderr/0402 index 393aa4ea0..20c2e7b3f 100644 --- a/test/stderr/0402 +++ b/test/stderr/0402 @@ -372,9 +372,9 @@ expanding: From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbo result: From CALLER@test.ex Tue Mar 02 09:44:33 1999 -writing data block fd=6 size=sss timeout=0 -writing data block fd=6 size=sss timeout=0 -writing data block fd=6 size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 appendfile yields 0 with errno=dd more_errno=dd search_tidyup called journalling TESTSUITE/test-mail/junk:rd+usery@test.ex @@ -420,9 +420,9 @@ expanding: From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbo result: From CALLER@test.ex Tue Mar 02 09:44:33 1999 -writing data block fd=7 size=sss timeout=0 -writing data block fd=7 size=sss timeout=0 -writing data block fd=7 size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 appendfile yields 0 with errno=dd more_errno=dd search_tidyup called journalling TESTSUITE/test-mail/junk:rd+CALLER@test.ex diff --git a/test/stderr/0404 b/test/stderr/0404 index 6a53a9d06..d37788c05 100644 --- a/test/stderr/0404 +++ b/test/stderr/0404 @@ -15543,10 +15543,10 @@ hitch name: TESTSUITE/test-mail/sender.lock.test.ex.dddddddd.pppppppp lock file created mailbox TESTSUITE/test-mail/sender is locked writing to file TESTSUITE/test-mail/sender -writing data block fd=6 size=sss timeout=0 -writing data block fd=6 size=sss timeout=0 -writing data block fd=6 size=sss timeout=0 -writing data block fd=6 size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 appendfile yields 0 with errno=dd more_errno=dd search_tidyup called journalling sender@test.ex diff --git a/test/stderr/0408 b/test/stderr/0408 index 8ba1fe4eb..8eeab810c 100644 --- a/test/stderr/0408 +++ b/test/stderr/0408 @@ -145,9 +145,9 @@ hitch name: TESTSUITE/test-mail/userx.lock.test.ex.dddddddd.pppppppp lock file created mailbox TESTSUITE/test-mail/userx is locked writing to file TESTSUITE/test-mail/userx -writing data block fd=6 size=sss timeout=0 -writing data block fd=6 size=sss timeout=0 -writing data block fd=6 size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 appendfile yields 0 with errno=dd more_errno=dd search_tidyup called journalling userx@test.ex diff --git a/test/stderr/0476 b/test/stderr/0476 index c70ad2461..d01306485 100644 --- a/test/stderr/0476 +++ b/test/stderr/0476 @@ -43,7 +43,7 @@ set_process_info: pppp delivering 10HmaX-0005vi-00 LOG: MAIN ** userx@test.ex R=r1 T=t1: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 -writing data block fd=9 size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user diff --git a/test/stderr/0487 b/test/stderr/0487 index fdade23da..584672a7e 100644 --- a/test/stderr/0487 +++ b/test/stderr/0487 @@ -141,11 +141,11 @@ hitch name: TESTSUITE/test-mail/userx.lock.test.ex.dddddddd.pppppppp lock file created mailbox TESTSUITE/test-mail/userx is locked writing to file TESTSUITE/test-mail/userx -writing data block fd=6 size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 rewrite_one_header: type=F: From: unqualified -writing data block fd=6 size=sss timeout=0 -writing data block fd=6 size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 appendfile yields 0 with errno=dd more_errno=dd search_tidyup called journalling userx@test.ex diff --git a/test/stderr/0512 b/test/stderr/0512 index fbb9121b9..6307ddafb 100644 --- a/test/stderr/0512 +++ b/test/stderr/0512 @@ -57,7 +57,7 @@ LOG: MAIN == userx@myhost.test.ex R=r1 T=t1 defer (dd): Connection refused LOG: MAIN ** userx@myhost.test.ex: retry timeout exceeded -writing data block fd=9 size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -118,7 +118,7 @@ LOG: MAIN == userx@myhost.test.ex R=r1 T=t1 defer (dd): Connection refused LOG: MAIN ** userx@myhost.test.ex: retry timeout exceeded -writing data block fd=9 size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user diff --git a/test/stderr/2600 b/test/stderr/2600 index 1c0fb042a..64b3133b1 100644 --- a/test/stderr/2600 +++ b/test/stderr/2600 @@ -412,9 +412,9 @@ hitch name: TESTSUITE/test-mail/userx.lock.test.ex.dddddddd.pppppppp lock file created mailbox TESTSUITE/test-mail/userx is locked writing to file TESTSUITE/test-mail/userx -writing data block fd=8 size=sss timeout=0 -writing data block fd=8 size=sss timeout=0 -writing data block fd=8 size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 appendfile yields 0 with errno=dd more_errno=dd search_tidyup called journalling userx@myhost.test.ex diff --git a/test/stderr/5004 b/test/stderr/5004 index 1143fdb3b..4d6968f19 100644 --- a/test/stderr/5004 +++ b/test/stderr/5004 @@ -142,7 +142,7 @@ created directory TESTSUITE/test-mail/new created directory TESTSUITE/test-mail/cur delivering in maildir format in TESTSUITE/test-mail writing to tmp/MAILDIR.mail.test.ex -writing data block fd=6 size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 renaming temporary file renamed tmp/MAILDIR.mail.test.ex as new/MAILDIR.mail.test.ex appendfile yields 0 with errno=dd more_errno=dd diff --git a/test/stderr/5005 b/test/stderr/5005 index 4e2a84b59..4a28a686f 100644 --- a/test/stderr/5005 +++ b/test/stderr/5005 @@ -136,7 +136,7 @@ delivering in maildir format in TESTSUITE/test-mail/nofile writing to tmp/MAILDIR.myhost.test.ex Exim quota = 500 old size = sssss this message = sss (included) file count quota = 0 count = 0 -writing data block fd=8 size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 added 'ddd 1' to maildirsize file renaming temporary file renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex @@ -304,7 +304,7 @@ delivering in maildir format in TESTSUITE/test-mail/userx writing to tmp/MAILDIR.myhost.test.ex Exim quota = 500 old size = sssss this message = sss (included) file count quota = 0 count = 0 -writing data block fd=8 size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 added 'ddd 1' to maildirsize file renaming temporary file renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex diff --git a/test/stderr/5006 b/test/stderr/5006 index 695bbd866..1dd6dc9ce 100644 --- a/test/stderr/5006 +++ b/test/stderr/5006 @@ -134,7 +134,7 @@ maildir_compute_size (timestamp_only): ddddddd returning maildir size=sss filecount=0 delivering in maildir format in TESTSUITE/test-mail/userx writing to tmp/MAILDIR.myhost.test.ex -writing data block fd=8 size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 added 'ddd 1' to maildirsize file renaming temporary file renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex diff --git a/test/stderr/5008 b/test/stderr/5008 index 5c2b23f8a..fd4ae87ec 100644 --- a/test/stderr/5008 +++ b/test/stderr/5008 @@ -25,7 +25,7 @@ delivering in maildir format in TESTSUITE/test-mail/userx writing to tmp/MAILDIR.myhost.test.ex Exim quota = 1048576 old size = sssss this message = sss (included) file count quota = 0 count = -1 -writing data block fd=6 size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 renaming temporary file renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex appendfile yields 0 with errno=dd more_errno=dd @@ -64,7 +64,7 @@ delivering in maildir format in TESTSUITE/test-mail/userx writing to tmp/MAILDIR.myhost.test.ex Exim quota = 1048576 old size = sssss this message = sss (included) file count quota = 20 count = 4 -writing data block fd=6 size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 renaming temporary file renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex appendfile yields 0 with errno=dd more_errno=dd diff --git a/test/stderr/9100 b/test/stderr/9100 index 5070be21c..984484f1f 100644 --- a/test/stderr/9100 +++ b/test/stderr/9100 @@ -124,6 +124,8 @@ configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed uid=EXIM_UID gid=EXIM_GID pid=pppp +seeking password data for user "CALLER": cache not available +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex sender_fullhost = [10.0.0.0] @@ -185,6 +187,8 @@ configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed uid=EXIM_UID gid=EXIM_GID pid=pppp +seeking password data for user "CALLER": cache not available +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@myhost.test.ex> @@ -224,6 +228,8 @@ configuration file is TESTSUITE/test-config trusted user admin user skipping ACL configuration - not needed +seeking password data for user "CALLER": cache not available +getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaX-0005vi-00 reading spool file 10HmaX-0005vi-00-H @@ -317,9 +323,9 @@ hitch name: TESTSUITE/test-mail/CALLER.lock.test.ex.dddddddd.pppppppp lock file created mailbox TESTSUITE/test-mail/CALLER is locked writing to file TESTSUITE/test-mail/CALLER -writing data block fd=8 size=sss timeout=0 -writing data block fd=8 size=sss timeout=0 -writing data block fd=8 size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 appendfile yields 0 with errno=dd more_errno=dd search_tidyup called close MYSQL connection: localhost/test/root diff --git a/test/stderr/9200 b/test/stderr/9200 index 7ed29ddb8..55143b46c 100644 --- a/test/stderr/9200 +++ b/test/stderr/9200 @@ -347,9 +347,9 @@ hitch name: TESTSUITE/test-mail/CALLER.lock.test.ex.dddddddd.pppppppp lock file created mailbox TESTSUITE/test-mail/CALLER is locked writing to file TESTSUITE/test-mail/CALLER -writing data block fd=8 size=sss timeout=0 -writing data block fd=8 size=sss timeout=0 -writing data block fd=8 size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 +writing data block fd=dddd size=sss timeout=0 appendfile yields 0 with errno=dd more_errno=dd search_tidyup called close PGSQL connection: localhost/test/CALLER diff --git a/test/stderr/9400 b/test/stderr/9400 index 3762d44f5..6bffc0aec 100644 --- a/test/stderr/9400 +++ b/test/stderr/9400 @@ -18,14 +18,14 @@ originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = NULL LOG: smtp_connection MAIN SMTP connection from CALLER -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from:<test-local-scan@y> -SMTP>> 250 OK
+SMTP>> 250 OK SMTP<< rcpt to:<userx@test.ex> -SMTP>> 250 Accepted
+SMTP>> 250 Accepted SMTP<< data -SMTP>> 354 Enter message, ending with "." on a line by itself
+SMTP>> 354 Enter message, ending with "." on a line by itself >>Headers received: >>Headers after rewriting and local additions: @@ -46,7 +46,7 @@ Writing spool header file Size of headers = sss LOG: MAIN <= test-local-scan@y U=CALLER P=local-smtp S=sss -SMTP>> 250 OK id=10HmbX-0005vi-00
+SMTP>> 250 OK id=10HmbX-0005vi-00 Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -59,7 +59,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> smtp_setup_msg entered SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection
+SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/9450 b/test/stderr/9450 index f8e344b27..bd11e343e 100644 --- a/test/stderr/9450 +++ b/test/stderr/9450 @@ -7,26 +7,26 @@ Exim version x.yz .... ---1 Get 40 ---1 Get 8 ---1 Get 16 ---Malloc 236 8200 16799 +--Malloc 236 8200 16874 configuration file is TESTSUITE/test-config admin user ---1 Get 248 ---1 Get 8 ---1 Get 16 ----1 Get 128 +---1 Get 136 ---1 Get 80 ---1 Get 248 ---1 Get 8 ---1 Get 16 ----1 Get 128 +---1 Get 136 ---1 Get 16 ---1 Get 24 ---1 Get 8 ---1 Get 24 ---Malloc 8200 16400 16799 +--Malloc 8200 16400 16874 ---0 Get 8 ---0 Get 16 ---Malloc 47 16400 16846 +--Malloc 47 16400 16921 ----Free ---0 Get 16 ---0 Get 16 @@ -48,7 +48,7 @@ admin user ---0 Rst ** 16400 ---0 Get 112 ---0 Rst ** 16400 ---Malloc 8200 24600 16846 +--Malloc 8200 24600 16921 ---2 Get 0 ---2 Get 64 ---2 Get 24 @@ -96,65 +96,65 @@ admin user ---2 Ext 5124 ---2 Ext 6148 ---2 Ext 7172 ---Malloc 8208 32808 16846 +--Malloc 8208 32808 16921 ---2 Get 8200 ---Malloc 9232 42040 16846 +--Malloc 9232 42040 16921 ---2 Get 9224 -Release 33832 ---Malloc 10256 44088 16846 +--Malloc 10256 44088 16921 ---2 Get 10248 -Release 34856 ---Malloc 11280 46136 16846 +--Malloc 11280 46136 16921 ---2 Get 11272 -Release 35880 ---Malloc 12304 48184 16846 +--Malloc 12304 48184 16921 ---2 Get 12296 -Release 36904 ---Malloc 13328 50232 16846 +--Malloc 13328 50232 16921 ---2 Get 13320 -Release 37928 ---Malloc 14352 52280 16846 +--Malloc 14352 52280 16921 ---2 Get 14344 -Release 38952 ---Malloc 15376 54328 16846 +--Malloc 15376 54328 16921 ---2 Get 15368 -Release 39976 ---Malloc 16400 56376 16846 +--Malloc 16400 56376 16921 ---2 Get 16392 -Release 41000 ---Malloc 17424 58424 16846 +--Malloc 17424 58424 16921 ---2 Get 17416 -Release 42024 ---Malloc 18448 60472 16846 +--Malloc 18448 60472 16921 ---2 Get 18440 -Release 43048 ---Malloc 19472 62520 16846 +--Malloc 19472 62520 16921 ---2 Get 19464 -Release 44072 ---Malloc 20496 64568 16846 +--Malloc 20496 64568 16921 ---2 Get 20488 -Release 45096 ---Malloc 21520 66616 16846 +--Malloc 21520 66616 16921 ---2 Get 21512 -Release 46120 ---Malloc 22544 68664 16846 +--Malloc 22544 68664 16921 ---2 Get 22536 -Release 47144 ---Malloc 23568 70712 16846 +--Malloc 23568 70712 16921 ---2 Get 23560 -Release 48168 ---Malloc 24592 72760 16846 +--Malloc 24592 72760 16921 ---2 Get 24584 -Release 49192 ---2 Rst ** 49192 ---2 Get 24 ---Malloc 24296 73488 16846 +--Malloc 24296 73488 16921 ---0 Get 24288 ---Malloc 24352 97840 16846 +--Malloc 24352 97840 16921 ---0 Get 24344 ---0 Rst ** 97840 ---0 Get 24 ---Malloc 8200 106040 16846 +--Malloc 8200 106040 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -275,7 +275,7 @@ admin user ---0 Get 24 ---0 Get 24 ---0 Get 24 ---Malloc 8200 114240 16846 +--Malloc 8200 114240 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -396,7 +396,7 @@ admin user ---0 Get 24 ---0 Get 24 ---0 Get 24 ---Malloc 8200 122440 16846 +--Malloc 8200 122440 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -517,7 +517,7 @@ admin user ---0 Get 24 ---0 Get 24 ---0 Get 24 ---Malloc 8200 130640 16846 +--Malloc 8200 130640 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -638,7 +638,7 @@ admin user ---0 Get 24 ---0 Get 24 ---0 Get 24 ---Malloc 8200 138840 16846 +--Malloc 8200 138840 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -759,7 +759,7 @@ admin user ---0 Get 24 ---0 Get 24 ---0 Get 24 ---Malloc 8200 147040 16846 +--Malloc 8200 147040 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -880,7 +880,7 @@ admin user ---0 Get 24 ---0 Get 24 ---0 Get 24 ---Malloc 8200 155240 16846 +--Malloc 8200 155240 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -1001,7 +1001,7 @@ admin user ---0 Get 24 ---0 Get 24 ---0 Get 24 ---Malloc 8200 163440 16846 +--Malloc 8200 163440 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -1122,7 +1122,7 @@ admin user ---0 Get 24 ---0 Get 24 ---0 Get 24 ---Malloc 8200 171640 16846 +--Malloc 8200 171640 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -1243,7 +1243,7 @@ admin user ---0 Get 24 ---0 Get 24 ---0 Get 24 ---Malloc 8200 179840 16846 +--Malloc 8200 179840 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -1364,7 +1364,7 @@ admin user ---0 Get 24 ---0 Get 24 ---0 Get 24 ---Malloc 8200 188040 16846 +--Malloc 8200 188040 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -1485,7 +1485,7 @@ admin user ---0 Get 24 ---0 Get 24 ---0 Get 24 ---Malloc 8200 196240 16846 +--Malloc 8200 196240 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -1606,7 +1606,7 @@ admin user ---0 Get 24 ---0 Get 24 ---0 Get 24 ---Malloc 8200 204440 16846 +--Malloc 8200 204440 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -1727,7 +1727,7 @@ admin user ---0 Get 24 ---0 Get 24 ---0 Get 24 ---Malloc 8200 212640 16846 +--Malloc 8200 212640 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -1848,7 +1848,7 @@ admin user ---0 Get 24 ---0 Get 24 ---0 Get 24 ---Malloc 8200 220840 16846 +--Malloc 8200 220840 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -1969,7 +1969,7 @@ admin user ---0 Get 24 ---0 Get 24 ---0 Get 24 ---Malloc 8200 229040 16846 +--Malloc 8200 229040 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -2090,7 +2090,7 @@ admin user ---0 Get 24 ---0 Get 24 ---0 Get 24 ---Malloc 8200 237240 16846 +--Malloc 8200 237240 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -2211,7 +2211,7 @@ admin user ---0 Get 24 ---0 Get 24 ---0 Get 24 ---Malloc 8200 245440 16846 +--Malloc 8200 245440 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -2332,7 +2332,7 @@ admin user ---0 Get 24 ---0 Get 24 ---0 Get 24 ---Malloc 8200 253640 16846 +--Malloc 8200 253640 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -2453,7 +2453,7 @@ admin user ---0 Get 24 ---0 Get 24 ---0 Get 24 ---Malloc 8200 261840 16846 +--Malloc 8200 261840 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -2574,7 +2574,7 @@ admin user ---0 Get 24 ---0 Get 24 ---0 Get 24 ---Malloc 8200 270040 16846 +--Malloc 8200 270040 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -2695,7 +2695,7 @@ admin user ---0 Get 24 ---0 Get 24 ---0 Get 24 ---Malloc 8200 278240 16846 +--Malloc 8200 278240 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -2816,7 +2816,7 @@ admin user ---0 Get 24 ---0 Get 24 ---0 Get 24 ---Malloc 8200 286440 16846 +--Malloc 8200 286440 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -2937,7 +2937,7 @@ admin user ---0 Get 24 ---0 Get 24 ---0 Get 24 ---Malloc 8200 294640 16846 +--Malloc 8200 294640 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -3058,7 +3058,7 @@ admin user ---0 Get 24 ---0 Get 24 ---0 Get 24 ---Malloc 8200 302840 16846 +--Malloc 8200 302840 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -3179,7 +3179,7 @@ admin user ---0 Get 24 ---0 Get 24 ---0 Get 24 ---Malloc 8200 311040 16846 +--Malloc 8200 311040 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -3300,7 +3300,7 @@ admin user ---0 Get 24 ---0 Get 24 ---0 Get 24 ---Malloc 8200 319240 16846 +--Malloc 8200 319240 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -3421,7 +3421,7 @@ admin user ---0 Get 24 ---0 Get 24 ---0 Get 24 ---Malloc 8200 327440 16846 +--Malloc 8200 327440 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -3542,7 +3542,7 @@ admin user ---0 Get 24 ---0 Get 24 ---0 Get 24 ---Malloc 8200 335640 16846 +--Malloc 8200 335640 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -3663,7 +3663,7 @@ admin user ---0 Get 24 ---0 Get 24 ---0 Get 24 ---Malloc 8200 343840 16846 +--Malloc 8200 343840 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -3784,7 +3784,7 @@ admin user ---0 Get 24 ---0 Get 24 ---0 Get 24 ---Malloc 8200 352040 16846 +--Malloc 8200 352040 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -3905,7 +3905,7 @@ admin user ---0 Get 24 ---0 Get 24 ---0 Get 24 ---Malloc 8200 360240 16846 +--Malloc 8200 360240 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -4026,7 +4026,7 @@ admin user ---0 Get 24 ---0 Get 24 ---0 Get 24 ---Malloc 8200 368440 16846 +--Malloc 8200 368440 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -4147,7 +4147,7 @@ admin user ---0 Get 24 ---0 Get 24 ---0 Get 24 ---Malloc 8200 376640 16846 +--Malloc 8200 376640 16921 ---0 Get 200 ---0 Get 24 ---0 Get 24 @@ -4395,7 +4395,7 @@ admin user ---0 Get 16 ---0 Get 56 ---0 Get 144 ---Malloc 8200 384840 16846 +--Malloc 8200 384840 16921 ---0 Get 136 ---0 Rst ** 384840 ---0 Get 104 @@ -5040,7 +5040,7 @@ admin user ---0 Get 16 ---0 Get 56 ---0 Get 144 ---Malloc 8200 393040 16846 +--Malloc 8200 393040 16921 ---0 Get 136 ---0 Rst ** 393040 ---0 Get 104 @@ -5055,7 +5055,7 @@ admin user ---0 Get 16 ---0 Get 16 ---0 Get 56 ---Malloc 8200 393040 16846 +--Malloc 8200 393040 16921 ---0 Get 144 ---0 Get 136 ---0 Rst ** 393040 @@ -5687,7 +5687,7 @@ admin user ---0 Get 16 ---0 Get 56 ---0 Get 144 ---Malloc 8200 401240 16846 +--Malloc 8200 401240 16921 ---0 Get 136 ---0 Rst ** 401240 ---0 Get 104 @@ -5702,7 +5702,7 @@ admin user ---0 Get 16 ---0 Get 16 ---0 Get 56 ---Malloc 8200 401240 16846 +--Malloc 8200 401240 16921 ---0 Get 144 ---0 Get 136 ---0 Rst ** 401240 @@ -6334,7 +6334,7 @@ admin user ---0 Get 16 ---0 Get 56 ---0 Get 144 ---Malloc 8200 409440 16846 +--Malloc 8200 409440 16921 ---0 Get 136 ---0 Rst ** 409440 ---0 Get 104 @@ -6349,7 +6349,7 @@ admin user ---0 Get 16 ---0 Get 16 ---0 Get 56 ---Malloc 8200 409440 16846 +--Malloc 8200 409440 16921 ---0 Get 144 ---0 Get 136 ---0 Rst ** 409440 @@ -6981,7 +6981,7 @@ admin user ---0 Get 16 ---0 Get 56 ---0 Get 144 ---Malloc 8200 417640 16846 +--Malloc 8200 417640 16921 ---0 Get 136 ---0 Rst ** 417640 ---0 Get 104 @@ -6996,7 +6996,7 @@ admin user ---0 Get 16 ---0 Get 16 ---0 Get 56 ---Malloc 8200 417640 16846 +--Malloc 8200 417640 16921 ---0 Get 144 ---0 Get 136 ---0 Rst ** 417640 @@ -7628,7 +7628,7 @@ admin user ---0 Get 16 ---0 Get 56 ---0 Get 144 ---Malloc 8200 425840 16846 +--Malloc 8200 425840 16921 ---0 Get 136 ---0 Rst ** 425840 ---0 Get 104 @@ -7643,7 +7643,7 @@ admin user ---0 Get 16 ---0 Get 16 ---0 Get 56 ---Malloc 8200 425840 16846 +--Malloc 8200 425840 16921 ---0 Get 144 ---0 Get 136 ---0 Rst ** 425840 @@ -8275,7 +8275,7 @@ admin user ---0 Get 16 ---0 Get 56 ---0 Get 144 ---Malloc 8200 434040 16846 +--Malloc 8200 434040 16921 ---0 Get 136 ---0 Rst ** 434040 ---0 Get 104 @@ -8290,7 +8290,7 @@ admin user ---0 Get 16 ---0 Get 16 ---0 Get 56 ---Malloc 8200 434040 16846 +--Malloc 8200 434040 16921 ---0 Get 144 ---0 Get 136 ---0 Rst ** 434040 @@ -8922,7 +8922,7 @@ admin user ---0 Get 16 ---0 Get 56 ---0 Get 144 ---Malloc 8200 442240 16846 +--Malloc 8200 442240 16921 ---0 Get 136 ---0 Rst ** 442240 ---0 Get 104 @@ -8937,7 +8937,7 @@ admin user ---0 Get 16 ---0 Get 16 ---0 Get 56 ---Malloc 8200 442240 16846 +--Malloc 8200 442240 16921 ---0 Get 144 ---0 Get 136 ---0 Rst ** 442240 @@ -9569,7 +9569,7 @@ admin user ---0 Get 16 ---0 Get 56 ---0 Get 144 ---Malloc 8200 450440 16846 +--Malloc 8200 450440 16921 ---0 Get 136 ---0 Rst ** 450440 ---0 Get 104 @@ -9584,7 +9584,7 @@ admin user ---0 Get 16 ---0 Get 16 ---0 Get 56 ---Malloc 8200 450440 16846 +--Malloc 8200 450440 16921 ---0 Get 144 ---0 Get 136 ---0 Rst ** 450440 @@ -10216,7 +10216,7 @@ admin user ---0 Get 16 ---0 Get 56 ---0 Get 144 ---Malloc 8200 458640 16846 +--Malloc 8200 458640 16921 ---0 Get 136 ---0 Rst ** 458640 ---0 Get 104 @@ -10231,7 +10231,7 @@ admin user ---0 Get 16 ---0 Get 16 ---0 Get 56 ---Malloc 8200 458640 16846 +--Malloc 8200 458640 16921 ---0 Get 144 ---0 Get 136 ---0 Rst ** 458640 @@ -10863,7 +10863,7 @@ admin user ---0 Get 16 ---0 Get 56 ---0 Get 144 ---Malloc 8200 466840 16846 +--Malloc 8200 466840 16921 ---0 Get 136 ---0 Rst ** 466840 ---0 Get 104 @@ -10878,7 +10878,7 @@ admin user ---0 Get 16 ---0 Get 16 ---0 Get 56 ---Malloc 8200 466840 16846 +--Malloc 8200 466840 16921 ---0 Get 144 ---0 Get 136 ---0 Rst ** 466840 @@ -11510,7 +11510,7 @@ admin user ---0 Get 16 ---0 Get 56 ---0 Get 144 ---Malloc 8200 475040 16846 +--Malloc 8200 475040 16921 ---0 Get 136 ---0 Rst ** 475040 ---0 Get 104 @@ -11525,7 +11525,7 @@ admin user ---0 Get 16 ---0 Get 16 ---0 Get 56 ---Malloc 8200 475040 16846 +--Malloc 8200 475040 16921 ---0 Get 144 ---0 Get 136 ---0 Rst ** 475040 @@ -12157,7 +12157,7 @@ admin user ---0 Get 16 ---0 Get 56 ---0 Get 144 ---Malloc 8200 483240 16846 +--Malloc 8200 483240 16921 ---0 Get 136 ---0 Rst ** 483240 ---0 Get 104 @@ -12172,7 +12172,7 @@ admin user ---0 Get 16 ---0 Get 16 ---0 Get 56 ---Malloc 8200 483240 16846 +--Malloc 8200 483240 16921 ---0 Get 144 ---0 Get 136 ---0 Rst ** 483240 @@ -12804,7 +12804,7 @@ admin user ---0 Get 16 ---0 Get 56 ---0 Get 144 ---Malloc 8200 491440 16846 +--Malloc 8200 491440 16921 ---0 Get 136 ---0 Rst ** 491440 ---0 Get 104 @@ -12819,7 +12819,7 @@ admin user ---0 Get 16 ---0 Get 16 ---0 Get 56 ---Malloc 8200 491440 16846 +--Malloc 8200 491440 16921 ---0 Get 144 ---0 Get 136 ---0 Rst ** 491440 @@ -13451,7 +13451,7 @@ admin user ---0 Get 16 ---0 Get 56 ---0 Get 144 ---Malloc 8200 499640 16846 +--Malloc 8200 499640 16921 ---0 Get 136 ---0 Rst ** 499640 ---0 Get 104 @@ -13466,7 +13466,7 @@ admin user ---0 Get 16 ---0 Get 16 ---0 Get 56 ---Malloc 8200 499640 16846 +--Malloc 8200 499640 16921 ---0 Get 144 ---0 Get 136 ---0 Rst ** 499640 @@ -14098,7 +14098,7 @@ admin user ---0 Get 16 ---0 Get 56 ---0 Get 144 ---Malloc 8200 507840 16846 +--Malloc 8200 507840 16921 ---0 Get 136 ---0 Rst ** 507840 ---0 Get 104 @@ -14113,7 +14113,7 @@ admin user ---0 Get 16 ---0 Get 16 ---0 Get 56 ---Malloc 8200 507840 16846 +--Malloc 8200 507840 16921 ---0 Get 144 ---0 Get 136 ---0 Rst ** 507840 @@ -14745,7 +14745,7 @@ admin user ---0 Get 16 ---0 Get 56 ---0 Get 144 ---Malloc 8200 516040 16846 +--Malloc 8200 516040 16921 ---0 Get 136 ---0 Rst ** 516040 ---0 Get 104 @@ -14760,7 +14760,7 @@ admin user ---0 Get 16 ---0 Get 16 ---0 Get 56 ---Malloc 8200 516040 16846 +--Malloc 8200 516040 16921 ---0 Get 144 ---0 Get 136 ---0 Rst ** 516040 @@ -15392,7 +15392,7 @@ admin user ---0 Get 16 ---0 Get 56 ---0 Get 144 ---Malloc 8200 524240 16846 +--Malloc 8200 524240 16921 ---0 Get 136 ---0 Rst ** 524240 ---0 Get 104 @@ -15407,7 +15407,7 @@ admin user ---0 Get 16 ---0 Get 16 ---0 Get 56 ---Malloc 8200 524240 16846 +--Malloc 8200 524240 16921 ---0 Get 144 ---0 Get 136 ---0 Rst ** 524240 @@ -16039,7 +16039,7 @@ admin user ---0 Get 16 ---0 Get 56 ---0 Get 144 ---Malloc 8200 532440 16846 +--Malloc 8200 532440 16921 ---0 Get 136 ---0 Rst ** 532440 ---0 Get 104 @@ -16054,7 +16054,7 @@ admin user ---0 Get 16 ---0 Get 16 ---0 Get 56 ---Malloc 8200 532440 16846 +--Malloc 8200 532440 16921 ---0 Get 144 ---0 Get 136 ---0 Rst ** 532440 @@ -16686,7 +16686,7 @@ admin user ---0 Get 16 ---0 Get 56 ---0 Get 144 ---Malloc 8200 540640 16846 +--Malloc 8200 540640 16921 ---0 Get 136 ---0 Rst ** 540640 ---0 Get 104 @@ -16701,7 +16701,7 @@ admin user ---0 Get 16 ---0 Get 16 ---0 Get 56 ---Malloc 8200 540640 16846 +--Malloc 8200 540640 16921 ---0 Get 144 ---0 Get 136 ---0 Rst ** 540640 @@ -17333,7 +17333,7 @@ admin user ---0 Get 16 ---0 Get 56 ---0 Get 144 ---Malloc 8200 548840 16846 +--Malloc 8200 548840 16921 ---0 Get 136 ---0 Rst ** 548840 ---0 Get 104 @@ -17348,7 +17348,7 @@ admin user ---0 Get 16 ---0 Get 16 ---0 Get 56 ---Malloc 8200 548840 16846 +--Malloc 8200 548840 16921 ---0 Get 144 ---0 Get 136 ---0 Rst ** 548840 @@ -17980,7 +17980,7 @@ admin user ---0 Get 16 ---0 Get 56 ---0 Get 144 ---Malloc 8200 557040 16846 +--Malloc 8200 557040 16921 ---0 Get 136 ---0 Rst ** 557040 ---0 Get 104 @@ -17995,7 +17995,7 @@ admin user ---0 Get 16 ---0 Get 16 ---0 Get 56 ---Malloc 8200 557040 16846 +--Malloc 8200 557040 16921 ---0 Get 144 ---0 Get 136 ---0 Rst ** 557040 diff --git a/test/stderr/9901 b/test/stderr/9901 index 4e9f6115e..53fe15d6a 100644 --- a/test/stderr/9901 +++ b/test/stderr/9901 @@ -98,7 +98,7 @@ After routing: locking TESTSUITE/spool/db/retry.lockfile locking TESTSUITE/spool/db/wait-t1.lockfile LOG: MAIN - == ok@no.delay R=r1 T=t1 defer (0): SMTP error from remote mail server after MAIL FROM:<CALLER@test.ex> SIZE=ssss: host 127.0.0.1 [127.0.0.1]: 421 myhost.test.ex: SMTP command timeout - closing connection + == ok@no.delay R=r1 T=t1 defer (-45): SMTP error from remote mail server after MAIL FROM:<CALLER@test.ex> SIZE=ssss: host 127.0.0.1 [127.0.0.1]: 421 myhost.test.ex: SMTP command timeout - closing connection locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> locking TESTSUITE/spool/db/retry.lockfile |