ph10 2006/07/26 15:39:14 BST
Modified files:
exim-src ACKNOWLEDGMENTS
exim-test README runtest
exim-test/confs 0176 0272 9100
exim-test/log 9901
exim-test/scripts/9900-testing 9900
exim-test/stderr 0143 0169 0370 0386 0393 0402 0404 0408
0476 0487 0512 2600 5004 5005 5006 5008
9100 9200 9400 9450 9901
exim-test/stdout 9900 9901
Added files:
exim-test/log 9900
Log:
Fixed a number of test suite problems as reported (and partly patched)
by Martin Mrazik.
Revision Changes Path
1.54 +2 -1 exim/exim-src/ACKNOWLEDGMENTS
1.4 +47 -40 exim/exim-test/README
1.2 +1 -1 exim/exim-test/confs/0176
1.2 +2 -2 exim/exim-test/confs/0272
1.2 +1 -1 exim/exim-test/confs/9100
1.1 +32 -0 exim/exim-test/log/9900 (new)
1.2 +1 -1 exim/exim-test/log/9901
1.13 +12 -5 exim/exim-test/runtest
1.2 +1 -0 exim/exim-test/scripts/9900-testing/9900
1.2 +1 -1 exim/exim-test/stderr/0143
1.2 +3 -3 exim/exim-test/stderr/0169
1.2 +1 -1 exim/exim-test/stderr/0370
1.4 +6 -6 exim/exim-test/stderr/0386
1.2 +8 -8 exim/exim-test/stderr/0393
1.3 +6 -6 exim/exim-test/stderr/0402
1.5 +4 -4 exim/exim-test/stderr/0404
1.3 +3 -3 exim/exim-test/stderr/0408
1.6 +1 -1 exim/exim-test/stderr/0476
1.4 +3 -3 exim/exim-test/stderr/0487
1.3 +2 -2 exim/exim-test/stderr/0512
1.4 +3 -3 exim/exim-test/stderr/2600
1.3 +1 -1 exim/exim-test/stderr/5004
1.5 +2 -2 exim/exim-test/stderr/5005
1.3 +1 -1 exim/exim-test/stderr/5006
1.2 +2 -2 exim/exim-test/stderr/5008
1.3 +9 -3 exim/exim-test/stderr/9100
1.5 +3 -3 exim/exim-test/stderr/9200
1.2 +6 -6 exim/exim-test/stderr/9400
1.2 +102 -102 exim/exim-test/stderr/9450
1.2 +1 -1 exim/exim-test/stderr/9901
1.2 +62 -2 exim/exim-test/stdout/9900
1.2 +1 -1 exim/exim-test/stdout/9901
Index: ACKNOWLEDGMENTS
===================================================================
RCS file: /home/cvs/exim/exim-src/ACKNOWLEDGMENTS,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- ACKNOWLEDGMENTS 17 Jul 2006 09:18:09 -0000 1.53
+++ ACKNOWLEDGMENTS 26 Jul 2006 14:39:13 -0000 1.54
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.53 2006/07/17 09:18:09 ph10 Exp $
+$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.54 2006/07/26 14:39:13 ph10 Exp $
EXIM ACKNOWLEDGEMENTS
@@ -20,7 +20,7 @@
Philip Hazel
Lists created: 20 November 2002
-Last updated: 17 July 2006
+Last updated: 25 July 2006
THE OLD LIST
@@ -203,6 +203,7 @@
Patch for LDAP_RES_SEARCH_REFERENCE handling
Support for the DrWeb content scanner
Arkadiusz Miskiewicz Patch to add timeout to reads in malware.c
+Martin Mrazik Patches for problems in the test suite
Andreas Mueller Patch for logging uncompleted SMTP transactions
Pete Naylor Patch for LDAP TCP connect timeout setting
Alexander Newmann Diagnosing and patching obscure and subtle socket bug
Index: README
===================================================================
RCS file: /home/cvs/exim/exim-test/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- README 25 Apr 2006 14:02:30 -0000 1.3
+++ README 26 Jul 2006 14:39:13 -0000 1.4
@@ -1,12 +1,12 @@
-$Cambridge: exim/exim-test/README,v 1.3 2006/04/25 14:02:30 ph10 Exp $
+$Cambridge: exim/exim-test/README,v 1.4 2006/07/26 14:39:13 ph10 Exp $
EXPORTABLE EXIM TEST SUITE
--------------------------
This document last updated for:
-Test Suite Version: 4.61
-Date: 06 February 2006
+Test Suite Version: 4.63
+Date: 25 July 2006
BACKGROUND
@@ -26,16 +26,11 @@
enabled.
This README describes a new test suite that is intended to be exportable and to
-run in a number of different environments. The current status of this project
-is "experimental and incomplete". I am releasing it in this state in order to
-get feedback on how well it succeeds and of course to iron out any bugs. The
-original test suite contains over 600 tests; it will be some time before they
-are all re-implemented in the new world.
-
-The tests themselves are in no particular order; they accumulated over the
-years as Exim was extended and modified. They vary greatly in size and
-complexity. Some were specifically constructed to test new features; others
-were made to demonstrate that a bug had been fixed.
+run in a number of different environments. The tests themselves are in no
+particular order; they accumulated over the years as Exim was extended and
+modified. They vary greatly in size and complexity. Some were specifically
+constructed to test new features; others were made to demonstrate that a bug
+had been fixed.
A few of the original tests have had to be omitted from this more general
suite because differences in operating system behaviour make it impossible to
@@ -45,21 +40,18 @@
of Exim, because it can revert to the caller's uid. In FreeBSD this is not the
case.
-This is early documentation; it too may be buggy... :-) It is certainly
-incomplete, because there are features yet to be added to the test suite.
-
REQUIREMENTS
------------
In order to run this test suite, the following requirements must be met:
-(1) You should run the tests on the latest version of Exim, because the suite
+(1) You should run the tests on a matching version of Exim, because the suite
is continuously updated to test the latest features and bug fixes. The
version you test does not, however, have to be installed as the live
- version. You can of course run the tests on an older Exim, but some may
- fail. In particular, the test suite will fall apart horrible with versions
- of Exim prior to 4.54.
+ version. You can of course try the tests on any version of Exim, but some
+ may fail. In particular, the test suite will fall apart horrible with
+ versions of Exim prior to 4.54.
(2) You can use any non-root login to run the tests, but there must be access
via "sudo" to root from this login. Privilege is required to override
@@ -79,17 +71,15 @@
(3) The login under which you run the tests must be in the exim group so that
it has access to logs, spool files, etc. The login should not be one of the
names "userx", "usery", "userz", or a few other simple ones such as "abcd"
- and "xyz" and single letters that are used in the tests. (The original
- tests use my login a lot; I'm weeding this out as I convert, and I'll try
- to get rid of common names as well.) The test suite expects the login to
- have a gecos name; I think it will now run if the gecos field is empty but
- there may be anomalies.
+ and "xyz" and single letters that are used in the tests. The test suite
+ expects the login to have a gecos name; I think it will now run if the
+ gecos field is empty but there may be anomalies.
(4) The directory into which you unpack the test suite must be accessible by
- the Exim user, so that code which is running as exim can access the files
- therein. A world-readable directory is fine. However, there may be problems
- if the path name of the directory is excessively long. This is because it
- sometimes appears in logs lines or debug output, and if it is truncated, it
+ the Exim user, so that code running as exim can access the files therein. A
+ world-readable directory is fine. However, there may be problems if the
+ path name of the directory is excessively long. This is because it
+ sometimes appears in log lines or debug output, and if it is truncated, it
is no longer recognized.
(5) Exim must be built with its user and group specified at build time, and
@@ -202,17 +192,20 @@
following example:
$ ls -F /source/exim
- exim-4.50/ exim-4.52/ exim-testsuite-0.00/
+ exim-4.60/ exim-4.62/ exim-testsuite-x.xx/
-A simple ./runtest from within the test suite will use a 4.52 binary if it
-finds one, otherwise a 4.50 binary. If a binary cannot be found, the script
+A simple ./runtest from within the test suite will use a 4.62 binary if it
+finds one, otherwise a 4.60 binary. If a binary cannot be found, the script
prompts for one. Alternatively, you can supply the binary on the command line:
./runtest /usr/exim/bin/exim
-The test suite also uses some of the Exim utilities (such as exim_dbmbuild),
-and it expects to find them in the same directory as Exim itself. If they are
-not found, the tests that use them are omitted. A suitable comment is output.
+A matching test suite is released with each Exim release; if you use a test
+suite that does not match the binary, some tests may fail.
+
+The test suite uses some of the Exim utilities (such as exim_dbmbuild), and it
+expects to find them in the same directory as Exim itself. If they are not
+found, the tests that use them are omitted. A suitable comment is output.
On the ./runtest command line, following the name of the binary, if present,
there may be a number of options and then one or two numbers. The full syntax
@@ -328,8 +321,9 @@
If a test fails, you are shown the output of the text comparison that failed,
and prompted as to what to do next. The output is shown using the "less"
-command, or "more" if "less" is not available. By default, the output is from
-the "cf" program, and might look like this:
+command, or "more" if "less" is not available. The options for "less" are set
+to that it automatically exits if there is less that a screenful of output. By
+default, the output is from the "cf" program, and might look like this:
DBM/1300 DBM files and exim_dbmbuild
===============
@@ -392,6 +386,19 @@
the saved output to fail. Such errors can be ignored.
+OTHER ISSUES
+------------
+
+. Some of the tests are time-sensitive (e.g. when testing timeouts, as in test
+ 461). These may fail if run on a host that is also running a lot of other
+ processes.
+
+. Some versions of "ls" use a different format for times and dates. This can
+ cause test 345 to fail.
+
+. Test 0142 tests open file descriptors; on some hosts the output may vary.
+
+
OTHER SCRIPTS AND PROGRAMS
--------------------------
@@ -445,6 +452,7 @@
here:
CALLER is replaced by the login name of the user running the tests
+ CALLERGROUP is replaced by the caller's group id
CALLER_GID is replaced by the caller's group id
CALLER_UID is replaced by the caller's user id
DIR is replaced by the name of the test-suite directory
@@ -473,7 +481,7 @@
If the host has more than one IPv4 or IPv6 address, the first one that
"ifconfig" lists is used. If the only available address is 127.0.0.1 (or ::1
-for IPv6) it is used, but another value is prefered if available.
+for IPv6) it is used, but another value is preferred if available.
In situations where a specific test is not being run (for example, when setting
up dynamic data files), TESTNUM is replaced by an empty string, but should not
@@ -586,8 +594,7 @@
several lines by using \ as a continuation character. This does *not* apply to
data lines.
-Here follows a [currently incomplete] list of supported commands. They can be
-divided into two groups:
+Here follows a list of supported commands. They can be divided into two groups:
Commands with no input
@@ -721,7 +728,7 @@
catwrite <file name> [nxm[=start-of-line-text]]*
This command operates like the "write" command, which is described below,
-except that the out it generates is copied to the end of the test-stdout file
+except that the data it generates is copied to the end of the test-stdout file
as well as to the named file.
Index: runtest
===================================================================
RCS file: /home/cvs/exim/exim-test/runtest,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- runtest 4 Jul 2006 09:07:20 -0000 1.12
+++ runtest 26 Jul 2006 14:39:13 -0000 1.13
@@ -1,6 +1,6 @@
#! /usr/bin/perl -w
-# $Cambridge: exim/exim-test/runtest,v 1.12 2006/07/04 09:07:20 ph10 Exp $
+# $Cambridge: exim/exim-test/runtest,v 1.13 2006/07/26 14:39:13 ph10 Exp $
###############################################################################
# This is the controlling script for the "new" test suite for Exim. It should #
@@ -23,7 +23,7 @@
# Start by initializing some global variables
-$testversion = "4.62 (20-Apr-06)";
+$testversion = "4.63 (24-Jul-06)";
$cf = "bin/cf";
$cr = "\r";
@@ -98,6 +98,7 @@
sub do_substitute{
s?\bCALLER\b?$parm_caller?g;
+s?\bCALLERGROUP\b?$parm_caller_group?g;
s?\bCALLER_UID\b?$parm_caller_uid?g;
s?\bCALLER_GID\b?$parm_caller_gid?g;
s?\bCLAMSOCKET\b?$parm_clamsocket?g;
@@ -358,6 +359,10 @@
# Random local part in callout cache testing
s/myhost.test.ex-\d+-testing/myhost.test.ex-dddddddd-testing/;
+ # File descriptor numbers may vary
+ s/^writing data block fd=\d+/writing data block fd=dddd/;
+ s/running as transport filter: write=\d+ read=\d+/running as transport filter: write=dddd read=dddd/;
+
# ======== Dumpdb output ========
# This must be before the general date/date munging.
@@ -585,7 +590,7 @@
# ======== Values in spool space failure message ========
- s/space=\d+ inodes=\d+/space=xxxxx inodes=xxxxx/;
+ s/space=\d+ inodes=[+-]?\d+/space=xxxxx inodes=xxxxx/;
# ======== Filter sizes ========
@@ -1686,9 +1691,11 @@
# Before running the command, convert the -bd option into -bdf so that an
# Exim daemon doesn't double fork. This means that when we wait close
- # DAEMONCMD, it waits for the correct process.
+ # DAEMONCMD, it waits for the correct process. Also, ensure that the pid
+ # file is written to the spool directory, in case the Exim binary was
+ # built with PID_FILE_PATH pointing somewhere else.
- $cmd =~ s/\s-bd\s/ -bdf /;
+ $cmd =~ s!\s-bd\s! -bdf -oP $parm_cwd/spool/exim-daemon.pid !;
print ">> |${cmd}-server\n" if ($debug);
open DAEMONCMD, "|${cmd}-server" || tests_exit(-1, "Failed to run $cmd");
DAEMONCMD->autoflush(1);
@@ -2412,7 +2419,7 @@
$parm_ipv4r = ($parm_ipv4 !~ /^\d/)? "" :
join(".", reverse(split /\./, $parm_ipv4));
-$parm_ipv6r = "";
+$parm_ipv6r = $parm_ipv6; # Appropriate if not in use
if ($parm_ipv6 =~ /^[\da-f]/)
{
my(@comps) = split /:/, $parm_ipv6;
Index: 0176
===================================================================
RCS file: /home/cvs/exim/exim-test/confs/0176,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0176 7 Feb 2006 10:34:25 -0000 1.1
+++ 0176 26 Jul 2006 14:39:14 -0000 1.2
@@ -11,7 +11,7 @@
# ----- Main settings -----
qualify_domain = test.ex
-admin_groups = CALLER
+admin_groups = CALLERGROUP
trusted_users = CALLER
Index: 0272
===================================================================
RCS file: /home/cvs/exim/exim-test/confs/0272,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0272 7 Feb 2006 10:34:25 -0000 1.1
+++ 0272 26 Jul 2006 14:39:14 -0000 1.2
@@ -83,7 +83,7 @@
domains = r9
allow_fail
file = DIR/aux-var/TESTNUM.exim
- owngroups = CALLER : EXIMGROUP
+ owngroups = CALLERGROUP : EXIMGROUP
r10:
driver = redirect
@@ -95,7 +95,7 @@
driver = redirect
domains = r11
file = DIR/aux-var/TESTNUM.exim
- owngroups = CALLER : EXIMGROUP
+ owngroups = CALLERGROUP : EXIMGROUP
modemask = 007
# End
Index: 9100
===================================================================
RCS file: /home/cvs/exim/exim-test/confs/9100,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 9100 7 Feb 2006 10:34:26 -0000 1.1
+++ 9100 26 Jul 2006 14:39:14 -0000 1.2
@@ -16,7 +16,7 @@
acl_smtp_rcpt = check_recipient
-mysql_servers = localhost/test/root/password
+mysql_servers = localhost/test/root/
# ----- ACL -----
Index: 9900
====================================================================
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmaX-0005vi-00 46c.test.ex [V6NET:ffff:836f:a00:a:800:200a:c033] Network Error
1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@??? R=lookuphost T=smtp H=46d.test.ex [ip4.ip4.ip4.ip4]
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmaY-0005vi-00 46c.test.ex [V6NET:ffff:836f:a00:a:800:200a:c033] Network Error
1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@??? R=lookuphost T=smtp H=46d.test.ex [ip4.ip4.ip4.ip4]
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmaZ-0005vi-00 46d.test.ex [ip4.ip4.ip4.ip4] Connection refused
1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@??? R=lookuphost T=smtp defer (dd): Connection refused
1999-03-02 09:44:33 Start queue run: pid=pppp
1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@??? R=lookuphost T=smtp defer (-53): retry time not reached for any host
1999-03-02 09:44:33 End queue run: pid=pppp
1999-03-02 09:44:33 Start queue run: pid=pppp
1999-03-02 09:44:33 10HmaZ-0005vi-00 46c.test.ex [V6NET:ffff:836f:a00:a:800:200a:c033] Network Error
1999-03-02 09:44:33 10HmaZ-0005vi-00 46d.test.ex [ip4.ip4.ip4.ip4] Connection refused
1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@??? R=lookuphost T=smtp defer (dd): Connection refused
1999-03-02 09:44:33 End queue run: pid=pppp
1999-03-02 09:44:33 Start queue run: pid=pppp
1999-03-02 09:44:33 10HmaZ-0005vi-00 46c.test.ex [V6NET:ffff:836f:a00:a:800:200a:c033] Network Error
1999-03-02 09:44:33 10HmaZ-0005vi-00 46d.test.ex [ip4.ip4.ip4.ip4] Connection refused
1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@??? R=lookuphost T=smtp defer (dd): Connection refused
1999-03-02 09:44:33 End queue run: pid=pppp
1999-03-02 09:44:33 Start queue run: pid=pppp
1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@??? R=lookuphost T=smtp defer (-53): retry time not reached for any host
1999-03-02 09:44:33 End queue run: pid=pppp
1999-03-02 09:44:33 Start queue run: pid=pppp
1999-03-02 09:44:33 10HmaZ-0005vi-00 46c.test.ex [V6NET:ffff:836f:a00:a:800:200a:c033] Network Error
1999-03-02 09:44:33 10HmaZ-0005vi-00 46d.test.ex [ip4.ip4.ip4.ip4] Connection refused
1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@??? R=lookuphost T=smtp defer (dd): Connection refused
1999-03-02 09:44:33 End queue run: pid=pppp
Index: 9901
===================================================================
RCS file: /home/cvs/exim/exim-test/log/9901,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 9901 7 Feb 2006 10:34:46 -0000 1.1
+++ 9901 26 Jul 2006 14:39:14 -0000 1.2
@@ -7,7 +7,7 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 => ok@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 10HmaY-0005vi-00 == delay@??? R=r2 defer (-1): host lookup did not complete
-1999-03-02 09:44:33 10HmaY-0005vi-00 == ok@??? R=r1 T=t1 defer (0): SMTP error from remote mail server after MAIL FROM:<CALLER@???> SIZE=1325: host 127.0.0.1 [127.0.0.1]: 421 myhost.test.ex: SMTP command timeout - closing connection
+1999-03-02 09:44:33 10HmaY-0005vi-00 == ok@??? R=r1 T=t1 defer (-45): SMTP error from remote mail server after MAIL FROM:<CALLER@???> SIZE=1325: host 127.0.0.1 [127.0.0.1]: 421 myhost.test.ex: SMTP command timeout - closing connection
1999-03-02 09:44:33 10HmaY-0005vi-00 == delay@??? routing defer (-51): retry time not reached
1999-03-02 09:44:33 10HmaY-0005vi-00 == ok@??? R=r1 T=t1 defer (-53): retry time not reached for any host
1999-03-02 09:44:33 End queue run: pid=pppp
Index: 9900
===================================================================
RCS file: /home/cvs/exim/exim-test/scripts/9900-testing/9900,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 9900 7 Feb 2006 10:54:51 -0000 1.1
+++ 9900 26 Jul 2006 14:39:14 -0000 1.2
@@ -62,3 +62,4 @@
****
exim -q
****
+no_msglog_check
Index: 0143
===================================================================
RCS file: /home/cvs/exim/exim-test/stderr/0143,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0143 7 Feb 2006 10:47:31 -0000 1.1
+++ 0143 26 Jul 2006 14:39:14 -0000 1.2
@@ -29,7 +29,7 @@
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
Index: 0169
===================================================================
RCS file: /home/cvs/exim/exim-test/stderr/0169,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0169 7 Feb 2006 10:47:31 -0000 1.1
+++ 0169 26 Jul 2006 14:39:14 -0000 1.2
@@ -23,9 +23,9 @@
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@???
Index: 0370
===================================================================
RCS file: /home/cvs/exim/exim-test/stderr/0370,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0370 7 Feb 2006 10:47:31 -0000 1.1
+++ 0370 26 Jul 2006 14:39:14 -0000 1.2
@@ -22,7 +22,7 @@
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
Index: 0386
===================================================================
RCS file: /home/cvs/exim/exim-test/stderr/0386,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0386 14 Jul 2006 14:00:16 -0000 1.3
+++ 0386 26 Jul 2006 14:39:14 -0000 1.4
@@ -279,9 +279,9 @@
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 @@
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
Index: 0393
===================================================================
RCS file: /home/cvs/exim/exim-test/stderr/0393,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0393 7 Feb 2006 10:47:31 -0000 1.1
+++ 0393 26 Jul 2006 14:39:14 -0000 1.2
@@ -26,16 +26,16 @@
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@???
LOG: MAIN
@@ -69,9 +69,9 @@
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
Index: 0402
===================================================================
RCS file: /home/cvs/exim/exim-test/stderr/0402,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0402 14 Jul 2006 14:00:16 -0000 1.2
+++ 0402 26 Jul 2006 14:39:14 -0000 1.3
@@ -372,9 +372,9 @@
result: From CALLER@??? 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@???
@@ -420,9 +420,9 @@
result: From CALLER@??? 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@???
Index: 0404
===================================================================
RCS file: /home/cvs/exim/exim-test/stderr/0404,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 0404 14 Jul 2006 14:00:16 -0000 1.4
+++ 0404 26 Jul 2006 14:39:14 -0000 1.5
@@ -15543,10 +15543,10 @@
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@???
Index: 0408
===================================================================
RCS file: /home/cvs/exim/exim-test/stderr/0408,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0408 14 Jul 2006 14:00:16 -0000 1.2
+++ 0408 26 Jul 2006 14:39:14 -0000 1.3
@@ -145,9 +145,9 @@
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@???
Index: 0476
===================================================================
RCS file: /home/cvs/exim/exim-test/stderr/0476,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 0476 4 Jul 2006 09:07:20 -0000 1.5
+++ 0476 26 Jul 2006 14:39:14 -0000 1.6
@@ -43,7 +43,7 @@
LOG: MAIN
** userx@??? R=r1 T=t1: SMTP error from remote mail server after RCPT TO:<userx@???>: 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
Index: 0487
===================================================================
RCS file: /home/cvs/exim/exim-test/stderr/0487,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0487 14 Jul 2006 14:00:16 -0000 1.3
+++ 0487 26 Jul 2006 14:39:14 -0000 1.4
@@ -141,11 +141,11 @@
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@???
Index: 0512
===================================================================
RCS file: /home/cvs/exim/exim-test/stderr/0512,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0512 16 Feb 2006 10:05:34 -0000 1.2
+++ 0512 26 Jul 2006 14:39:14 -0000 1.3
@@ -57,7 +57,7 @@
== userx@??? R=r1 T=t1 defer (dd): Connection refused
LOG: MAIN
** userx@???: 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 @@
== userx@??? R=r1 T=t1 defer (dd): Connection refused
LOG: MAIN
** userx@???: 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
Index: 2600
===================================================================
RCS file: /home/cvs/exim/exim-test/stderr/2600,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 2600 14 Jul 2006 14:00:16 -0000 1.3
+++ 2600 26 Jul 2006 14:39:14 -0000 1.4
@@ -412,9 +412,9 @@
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@???
Index: 5004
===================================================================
RCS file: /home/cvs/exim/exim-test/stderr/5004,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 5004 14 Jul 2006 14:00:16 -0000 1.2
+++ 5004 26 Jul 2006 14:39:14 -0000 1.3
@@ -142,7 +142,7 @@
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
Index: 5005
===================================================================
RCS file: /home/cvs/exim/exim-test/stderr/5005,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 5005 14 Jul 2006 14:00:16 -0000 1.4
+++ 5005 26 Jul 2006 14:39:14 -0000 1.5
@@ -136,7 +136,7 @@
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 @@
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
Index: 5006
===================================================================
RCS file: /home/cvs/exim/exim-test/stderr/5006,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 5006 14 Jul 2006 14:00:16 -0000 1.2
+++ 5006 26 Jul 2006 14:39:14 -0000 1.3
@@ -134,7 +134,7 @@
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
Index: 5008
===================================================================
RCS file: /home/cvs/exim/exim-test/stderr/5008,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 5008 1 Mar 2006 11:24:04 -0000 1.1
+++ 5008 26 Jul 2006 14:39:14 -0000 1.2
@@ -25,7 +25,7 @@
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 @@
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
Index: 9100
===================================================================
RCS file: /home/cvs/exim/exim-test/stderr/9100,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 9100 18 Apr 2006 15:53:58 -0000 1.2
+++ 9100 26 Jul 2006 14:39:14 -0000 1.3
@@ -124,6 +124,8 @@
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@???
sender_fullhost = [10.0.0.0]
@@ -185,6 +187,8 @@
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@???
set_process_info: pppp accepting a local non-SMTP message from <CALLER@???>
@@ -224,6 +228,8 @@
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 @@
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
Index: 9200
===================================================================
RCS file: /home/cvs/exim/exim-test/stderr/9200,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 9200 14 Jul 2006 14:21:28 -0000 1.4
+++ 9200 26 Jul 2006 14:39:14 -0000 1.5
@@ -347,9 +347,9 @@
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
Index: 9400
===================================================================
RCS file: /home/cvs/exim/exim-test/stderr/9400,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 9400 7 Feb 2006 10:47:31 -0000 1.1
+++ 9400 26 Jul 2006 14:39:14 -0000 1.2
@@ -18,14 +18,14 @@
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@???>
-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 @@
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 @@
>>>>>>>>>>>>>>>> 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 >>>>>>>>>>>>>>>>
Index: 9450
===================================================================
RCS file: /home/cvs/exim/exim-test/stderr/9450,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 9450 7 Feb 2006 10:47:31 -0000 1.1
+++ 9450 26 Jul 2006 14:39:14 -0000 1.2
@@ -7,26 +7,26 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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 @@
---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
Index: 9901
===================================================================
RCS file: /home/cvs/exim/exim-test/stderr/9901,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 9901 7 Feb 2006 10:47:31 -0000 1.1
+++ 9901 26 Jul 2006 14:39:14 -0000 1.2
@@ -98,7 +98,7 @@
locking TESTSUITE/spool/db/retry.lockfile
locking TESTSUITE/spool/db/wait-t1.lockfile
LOG: MAIN
- == ok@??? R=r1 T=t1 defer (0): SMTP error from remote mail server after MAIL FROM:<CALLER@???> SIZE=ssss: host 127.0.0.1 [127.0.0.1]: 421 myhost.test.ex: SMTP command timeout - closing connection
+ == ok@??? R=r1 T=t1 defer (-45): SMTP error from remote mail server after MAIL FROM:<CALLER@???> 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
Index: 9900
===================================================================
RCS file: /home/cvs/exim/exim-test/stdout/9900,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 9900 7 Feb 2006 10:47:37 -0000 1.1
+++ 9900 26 Jul 2006 14:39:14 -0000 1.2
@@ -1,2 +1,62 @@
-userx@??? cannot be resolved at this time:
- lookup of host "eximtesthost.ipv6.test.ex" failed in lookuphost router
++++++++++++++++++++++++++++
+ T:46c.test.ex:V6NET:ffff:836f:a00:a:800:200a:c033:1224 101 77 Network Error
+first failed = time last try = time2 next try = time2 + 1 *
++++++++++++++++++++++++++++
+ T:46c.test.ex:V6NET:ffff:836f:a00:a:800:200a:c033:1224 101 77 Network Error
+first failed = time last try = time2 next try = time2 + 1 *
+ T:46d.test.ex:ip4.ip4.ip4.ip4:1224 111 77 Connection refused
+first failed = time last try = time2 next try = time2 + 1
+
+******** SERVER ********
+Listening on port 1224 ...
+Connection request from [ip4.ip4.ip4.ip4]
+220 ESMTP
+EHLO myhost.text.ex
+250-OK
+250 HELP
+MAIL FROM:<CALLER@???>
+250 Sender OK
+RCPT TO:<userx@???>
+250 Recipient OK
+DATA
+350 Send message
+Received: from CALLER by myhost.text.ex with local (Exim x.yz)
+ (envelope-from <CALLER@???>)
+ id 10HmaX-0005vi-00
+ for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@???>
+From: CALLER_NAME <CALLER@???>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+First message
+.
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ...
+Connection request from [ip4.ip4.ip4.ip4]
+220 ESMTP
+EHLO myhost.text.ex
+250-OK
+250 HELP
+MAIL FROM:<CALLER@???>
+250 Sender OK
+RCPT TO:<userx@???>
+250 Recipient OK
+DATA
+350 Send message
+Received: from CALLER by myhost.text.ex with local (Exim x.yz)
+ (envelope-from <CALLER@???>)
+ id 10HmaY-0005vi-00
+ for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@???>
+From: CALLER_NAME <CALLER@???>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Second message
+.
+250 OK
+QUIT
+250 OK
+End of script
Index: 9901
===================================================================
RCS file: /home/cvs/exim/exim-test/stdout/9901,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 9901 7 Feb 2006 10:47:37 -0000 1.1
+++ 9901 26 Jul 2006 14:39:14 -0000 1.2
@@ -1,6 +1,6 @@
Message 10HmaY-0005vi-00 has been modified
+++++++++++++++++++++++++++
- T:127.0.0.1:127.0.0.1:1225:10HmaY-0005vi-00 0 65 SMTP error from remote mail server after MAIL FROM:<CALLER@???> SIZE=ssss: host 127.0.0.1 [127.0.0.1]: 421 myhost.test.ex: SMTP command timeout - cl
+ T:127.0.0.1:127.0.0.1:1225:10HmaY-0005vi-00 -45 5441 SMTP error from remote mail server after MAIL FROM:<CALLER@???> SIZE=ssss: host 127.0.0.1 [127.0.0.1]: 421 myhost.test.ex: SMTP command timeout - cl
first failed = time last try = time2 next try = time2 + 600
R:2.test.again.dns -1 0 host lookup did not complete
first failed = time last try = time2 next try = time2 + 600
