From: Jeremy Harris Date: Sun, 19 Aug 2018 13:53:40 +0000 (+0100) Subject: Debug: indent builtin-DB operations X-Git-Tag: exim-4.92-RC1~132 X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=966e829c812abf574896810d3313247348a6532c;p=exim.git Debug: indent builtin-DB operations --- diff --git a/src/src/dbfn.c b/src/src/dbfn.c index 5f39af220..ec87eaeeb 100644 --- a/src/src/dbfn.c +++ b/src/src/dbfn.c @@ -93,6 +93,8 @@ BOOL created = FALSE; flock_t lock_data; uschar dirname[256], filename[256]; +DEBUG(D_hints_lookup) acl_level++; + /* The first thing to do is to open a separate file on which to lock. This ensures that Exim has exclusive use of the database before it even tries to open it. Early versions tried to lock on the open database itself, but that @@ -121,6 +123,7 @@ if (dbblock->lockfd < 0) log_write(0, LOG_MAIN, "%s", string_open_failed(errno, "database lock file %s", filename)); errno = 0; /* Indicates locking failure */ + DEBUG(D_hints_lookup) acl_level--; return NULL; } @@ -131,7 +134,7 @@ lock_data.l_type = read_only? F_RDLCK : F_WRLCK; lock_data.l_whence = lock_data.l_start = lock_data.l_len = 0; DEBUG(D_hints_lookup|D_retry|D_route|D_deliver) - debug_printf("locking %s\n", filename); + debug_printf_indent("locking %s\n", filename); sigalrm_seen = FALSE; alarm(EXIMDB_LOCK_TIMEOUT); @@ -146,10 +149,11 @@ if (rc < 0) errno == ETIMEDOUT ? "timed out" : strerror(errno)); (void)close(dbblock->lockfd); errno = 0; /* Indicates locking failure */ + DEBUG(D_hints_lookup) acl_level--; return NULL; } -DEBUG(D_hints_lookup) debug_printf("locked %s\n", filename); +DEBUG(D_hints_lookup) debug_printf_indent("locked %s\n", filename); /* At this point we have an opened and locked separate lock file, that is, exclusive access to the database, so we can go ahead and open it. If we are @@ -166,7 +170,7 @@ EXIM_DBOPEN(filename, dirname, flags, EXIMDB_MODE, &(dbblock->dbptr)); if (!dbblock->dbptr && errno == ENOENT && flags == O_RDWR) { DEBUG(D_hints_lookup) - debug_printf("%s appears not to exist: trying to create\n", filename); + debug_printf_indent("%s appears not to exist: trying to create\n", filename); created = TRUE; EXIM_DBOPEN(filename, dirname, flags|O_CREAT, EXIMDB_MODE, &(dbblock->dbptr)); } @@ -204,9 +208,9 @@ if (created && geteuid() == root_uid) Ustrcpy(lastname, ent->d_name); if (Ustat(filename, &statbuf) >= 0 && statbuf.st_uid != exim_uid) { - DEBUG(D_hints_lookup) debug_printf("ensuring %s is owned by exim\n", filename); + DEBUG(D_hints_lookup) debug_printf_indent("ensuring %s is owned by exim\n", filename); if (Uchown(filename, exim_uid, exim_gid)) - DEBUG(D_hints_lookup) debug_printf("failed setting %s to owned by exim\n", filename); + DEBUG(D_hints_lookup) debug_printf_indent("failed setting %s to owned by exim\n", filename); } } @@ -224,15 +228,16 @@ if (!dbblock->dbptr) filename)); else DEBUG(D_hints_lookup) - debug_printf("%s\n", CS string_open_failed(save_errno, "DB file %s", + debug_printf_indent("%s\n", CS string_open_failed(save_errno, "DB file %s", filename)); (void)close(dbblock->lockfd); errno = save_errno; + DEBUG(D_hints_lookup) acl_level--; return NULL; } DEBUG(D_hints_lookup) - debug_printf("opened hints database %s: flags=%s\n", filename, + debug_printf_indent("opened hints database %s: flags=%s\n", filename, flags == O_RDONLY ? "O_RDONLY" : flags == O_RDWR ? "O_RDWR" : flags == (O_RDWR|O_CREAT) ? "O_RDWR|O_CREAT" @@ -263,7 +268,8 @@ dbfn_close(open_db *dbblock) { EXIM_DBCLOSE(dbblock->dbptr); (void)close(dbblock->lockfd); -DEBUG(D_hints_lookup) debug_printf("closed hints database and lockfile\n"); +DEBUG(D_hints_lookup) + { debug_printf_indent("closed hints database and lockfile\n"); acl_level--; } } @@ -300,7 +306,7 @@ uschar * key_copy = store_get(klen); memcpy(key_copy, key, klen); -DEBUG(D_hints_lookup) debug_printf("dbfn_read: key=%s\n", key); +DEBUG(D_hints_lookup) debug_printf_indent("dbfn_read: key=%s\n", key); EXIM_DATUM_INIT(key_datum); /* Some DBM libraries require the datum */ EXIM_DATUM_INIT(result_datum); /* to be cleared before use. */ @@ -345,7 +351,7 @@ uschar * key_copy = store_get(klen); memcpy(key_copy, key, klen); gptr->time_stamp = time(NULL); -DEBUG(D_hints_lookup) debug_printf("dbfn_write: key=%s\n", key); +DEBUG(D_hints_lookup) debug_printf_indent("dbfn_write: key=%s\n", key); EXIM_DATUM_INIT(key_datum); /* Some DBM libraries require the datum */ EXIM_DATUM_INIT(value_datum); /* to be cleared before use. */ diff --git a/src/src/dbstuff.h b/src/src/dbstuff.h index 7adbd4501..afb84f912 100644 --- a/src/src/dbstuff.h +++ b/src/src/dbstuff.h @@ -636,18 +636,18 @@ after reading data. */ # define EXIM_DBOPEN(name, dirname, flags, mode, dbpp) \ do { \ DEBUG(D_hints_lookup) \ - debug_printf("EXIM_DBOPEN: file <%s> dir <%s> flags=%s\n", \ + debug_printf_indent("EXIM_DBOPEN: file <%s> dir <%s> flags=%s\n", \ (name), (dirname), \ (flags) == O_RDONLY ? "O_RDONLY" \ : (flags) == O_RDWR ? "O_RDWR" \ : (flags) == (O_RDWR|O_CREAT) ? "O_RDWR|O_CREAT" \ : "??"); \ EXIM_DBOPEN__(name, dirname, flags, mode, dbpp); \ - DEBUG(D_hints_lookup) debug_printf("returned from EXIM_DBOPEN: %p\n", *dbpp); \ + DEBUG(D_hints_lookup) debug_printf_indent("returned from EXIM_DBOPEN: %p\n", *dbpp); \ } while(0) # define EXIM_DBCLOSE(db) \ do { \ - DEBUG(D_hints_lookup) debug_printf("EXIM_DBCLOSE(%p)\n", db); \ + DEBUG(D_hints_lookup) debug_printf_indent("EXIM_DBCLOSE(%p)\n", db); \ EXIM_DBCLOSE__(db); \ } while(0) diff --git a/test/runtest b/test/runtest index a38f112af..7a7f661ba 100755 --- a/test/runtest +++ b/test/runtest @@ -1147,8 +1147,8 @@ RESET_AFTER_EXTRA_LINE_READ: next if /^(ppppp )?setsockopt FASTOPEN: Protocol not available$/; # Specific pointer values reported for DB operations change from run to run - s/^(returned from EXIM_DBOPEN: )(0x)?[0-9a-f]+/${1}0xAAAAAAAA/; - s/^(EXIM_DBCLOSE.)(0x)?[0-9a-f]+/${1}0xAAAAAAAA/; + s/^(\s*returned from EXIM_DBOPEN: )(0x)?[0-9a-f]+/${1}0xAAAAAAAA/; + s/^(\s*EXIM_DBCLOSE.)(0x)?[0-9a-f]+/${1}0xAAAAAAAA/; # Platform-dependent output during MySQL startup next if /PerconaFT file system space/; diff --git a/test/stderr/0275 b/test/stderr/0275 index 2d3a46be5..e062b3eef 100644 --- a/test/stderr/0275 +++ b/test/stderr/0275 @@ -167,12 +167,12 @@ body_linecount=0 message_linecount=7 DSN: set orcpt: flags: 0 Delivery address list: userx@test.ex -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim -failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim + failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex @@ -277,11 +277,11 @@ After routing: search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> userx@test.ex <-------- -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available search_tidyup called changed uid/gid: local delivery to userx transport=t1 diff --git a/test/stderr/0278 b/test/stderr/0278 index 1d3628ce3..530518303 100644 --- a/test/stderr/0278 +++ b/test/stderr/0278 @@ -126,12 +126,12 @@ body_linecount=0 message_linecount=7 DSN: set orcpt: flags: 0 Delivery address list: CALLER@test.ex -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim -failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim + failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: CALLER@test.ex @@ -191,11 +191,11 @@ After routing: search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> CALLER@test.ex <-------- -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available search_tidyup called changed uid/gid: local delivery to CALLER transport=t1 diff --git a/test/stderr/0361 b/test/stderr/0361 index 9b2f26537..6956094f5 100644 --- a/test/stderr/0361 +++ b/test/stderr/0361 @@ -74,11 +74,11 @@ body_linecount=0 message_linecount=7 DSN: set orcpt: flags: 0 Delivery address list: kilos@recurse.test.ex -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: kilos@recurse.test.ex @@ -111,11 +111,11 @@ rewriting header lines rewrite_one_header: type=F: From: CALLER_NAME re-routed to kilos@recurse.test.ex.test.ex -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: kilos@recurse.test.ex.test.ex @@ -151,11 +151,11 @@ r3 router generated kilos@recurse.test.ex.test.ex routed by r3 router envelope to: kilos@recurse.test.ex.test.ex transport: -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: kilos@recurse.test.ex.test.ex @@ -200,11 +200,11 @@ After routing: search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> kilos@recurse.test.ex.test.ex <-------- -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available search_tidyup called changed uid/gid: local delivery to kilos transport=t2 diff --git a/test/stderr/0386 b/test/stderr/0386 index 8b08794a7..cfba1b452 100644 --- a/test/stderr/0386 +++ b/test/stderr/0386 @@ -245,12 +245,12 @@ body_linecount=1 message_linecount=7 DSN: set orcpt: flags: 0 Delivery address list: 2@b -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim -failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim + failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: 2@b @@ -283,11 +283,11 @@ After routing: search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> 2@b <-------- -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available search_tidyup called changed uid/gid: local delivery to 2 <2@b> transport=t1 @@ -426,11 +426,11 @@ body_linecount=1 message_linecount=7 DSN: set orcpt: flags: 0 Delivery address list: 2@b -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: 2@b @@ -463,11 +463,11 @@ After routing: search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> 2@b <-------- -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available search_tidyup called changed uid/gid: local delivery to 2 <2@b> transport=t1 diff --git a/test/stderr/0388 b/test/stderr/0388 index 6e21601ae..d3fd7ddad 100644 --- a/test/stderr/0388 +++ b/test/stderr/0388 @@ -5,12 +5,12 @@ configuration file is TESTSUITE/test-config admin user set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaX-0005vi-00 -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim -failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim + failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: x@y @@ -73,11 +73,11 @@ changed uid/gid: remote delivery to x@y with transport=smtp uid=EXIM_UID gid=EXIM_GID pid=pppp set_process_info: pppp delivering 10HmaX-0005vi-00 using smtp checking status of 127.0.0.1 -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available 127.0.0.1 in serialize_hosts? no (option unset) set_process_info: pppp delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (x@y) @@ -105,11 +105,11 @@ address match test: subject=*@127.0.0.1 pattern=* 127.0.0.1 in "*"? yes (matched "*") *@127.0.0.1 in "*"? yes (matched "*") checking status of V4NET.0.0.0 -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available V4NET.0.0.0 in serialize_hosts? no (option unset) set_process_info: pppp delivering 10HmaX-0005vi-00 to V4NET.0.0.0 [V4NET.0.0.0] (x@y) @@ -136,37 +136,37 @@ Succeeded addresses: Failed addresses: Deferred addresses: x@y -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDWR -returned from EXIM_DBOPEN: 0xAAAAAAAA -opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDWR + returned from EXIM_DBOPEN: 0xAAAAAAAA + opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR address match test: subject=x@y pattern=* y in "*"? yes (matched "*") x@y in "*"? yes (matched "*") retry for R:x@y = * 0 0 -dbfn_read: key=R:x@y + dbfn_read: key=R:x@y failing_interval=ttt message_age=ttt Writing retry data for R:x@y first failed=dddd last try=dddd next try=+1 expired=1 errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 451 Temporary error -dbfn_write: key=R:x@y + dbfn_write: key=R:x@y address match test: subject=*@V4NET.0.0.0 pattern=* V4NET.0.0.0 in "*"? yes (matched "*") *@V4NET.0.0.0 in "*"? yes (matched "*") retry for T:V4NET.0.0.0:V4NET.0.0.0:1224 (y) = * 0 0 -dbfn_read: key=T:V4NET.0.0.0:V4NET.0.0.0:1224 + dbfn_read: key=T:V4NET.0.0.0:V4NET.0.0.0:1224 failing_interval=ttt message_age=ttt on queue longer than maximum retry Writing retry data for T:V4NET.0.0.0:V4NET.0.0.0:1224 first failed=dddd last try=dddd next try=+0 expired=0 errno=dd more_errno=dd,A Network Error -dbfn_write: key=T:V4NET.0.0.0:V4NET.0.0.0:1224 + dbfn_write: key=T:V4NET.0.0.0:V4NET.0.0.0:1224 timed out: all retries expired LOG: MAIN ** x@y: retry timeout exceeded -EXIM_DBCLOSE(0xAAAAAAAA) -closed hints database and lockfile + EXIM_DBCLOSE(0xAAAAAAAA) + closed hints database and lockfile end of retry processing exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xebb95ced -odi -odi -t -oem -oi -f <> -E10HmaX-0005vi-00 Exim version x.yz .... @@ -230,22 +230,22 @@ trusted user admin user set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaY-0005vi-00 -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: 0xAAAAAAAA -opened hints database TESTSUITE/spool/db/retry: flags=O_RDONLY + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: 0xAAAAAAAA + opened hints database TESTSUITE/spool/db/retry: flags=O_RDONLY >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: CALLER@myhost.test.ex unique = CALLER@myhost.test.ex -dbfn_read: key=R:myhost.test.ex -dbfn_read: key=R:CALLER@myhost.test.ex -dbfn_read: key=R:CALLER@myhost.test.ex:<> + dbfn_read: key=R:myhost.test.ex + dbfn_read: key=R:CALLER@myhost.test.ex + dbfn_read: key=R:CALLER@myhost.test.ex:<> no domain retry record no address retry record CALLER@myhost.test.ex: queued for routing -EXIM_DBCLOSE(0xAAAAAAAA) -closed hints database and lockfile + EXIM_DBCLOSE(0xAAAAAAAA) + closed hints database and lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> routing CALLER@myhost.test.ex --------> r0 router <-------- diff --git a/test/stderr/0398 b/test/stderr/0398 index 9bec2572c..03b126df8 100644 --- a/test/stderr/0398 +++ b/test/stderr/0398 @@ -116,17 +116,17 @@ routed by r2 router transport: t2 host 127.0.0.1 [127.0.0.1] Attempting full verification using callout -locking TESTSUITE/spool/db/callout.lockfile -locked TESTSUITE/spool/db/callout.lockfile -EXIM_DBOPEN: file dir flags=O_RDWR -returned from EXIM_DBOPEN: 0xAAAAAAAA -opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR -dbfn_read: key=remote + locking TESTSUITE/spool/db/callout.lockfile + locked TESTSUITE/spool/db/callout.lockfile + EXIM_DBOPEN: file dir flags=O_RDWR + returned from EXIM_DBOPEN: 0xAAAAAAAA + opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR + dbfn_read: key=remote callout cache: found domain record for remote -dbfn_read: key=qq@remote + dbfn_read: key=qq@remote callout cache: no address record found for qq@remote -EXIM_DBCLOSE(0xAAAAAAAA) -closed hints database and lockfile + EXIM_DBCLOSE(0xAAAAAAAA) + closed hints database and lockfile interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready @@ -148,18 +148,18 @@ sync_responses expect rcpt cmd buf flush ddd bytes SMTP<< 250 OK SMTP(close)>> -locking TESTSUITE/spool/db/callout.lockfile -locked TESTSUITE/spool/db/callout.lockfile -EXIM_DBOPEN: file dir flags=O_RDWR|O_CREAT -returned from EXIM_DBOPEN: 0xAAAAAAAA -opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR|O_CREAT -dbfn_write: key=remote + locking TESTSUITE/spool/db/callout.lockfile + locked TESTSUITE/spool/db/callout.lockfile + EXIM_DBOPEN: file dir flags=O_RDWR|O_CREAT + returned from EXIM_DBOPEN: 0xAAAAAAAA + opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR|O_CREAT + dbfn_write: key=remote wrote callout cache domain record for remote: result=1 postmaster=0 random=0 -dbfn_write: key=qq@remote + dbfn_write: key=qq@remote wrote negative callout cache address record for qq@remote -EXIM_DBCLOSE(0xAAAAAAAA) -closed hints database and lockfile + EXIM_DBCLOSE(0xAAAAAAAA) + closed hints database and lockfile ----------- end verify ------------ l_message: $acl_verify_message warn: condition test succeeded in ACL "rcpt" @@ -230,18 +230,18 @@ routed by r2 router transport: t2 host 127.0.0.1 [127.0.0.1] Attempting full verification using callout -locking TESTSUITE/spool/db/callout.lockfile -locked TESTSUITE/spool/db/callout.lockfile -EXIM_DBOPEN: file dir flags=O_RDWR -returned from EXIM_DBOPEN: 0xAAAAAAAA -opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR -dbfn_read: key=remote + locking TESTSUITE/spool/db/callout.lockfile + locked TESTSUITE/spool/db/callout.lockfile + EXIM_DBOPEN: file dir flags=O_RDWR + returned from EXIM_DBOPEN: 0xAAAAAAAA + opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR + dbfn_read: key=remote callout cache: found domain record for remote -dbfn_read: key=qq@remote + dbfn_read: key=qq@remote callout cache: found address record for qq@remote callout cache: address record is negative -EXIM_DBCLOSE(0xAAAAAAAA) -closed hints database and lockfile + EXIM_DBCLOSE(0xAAAAAAAA) + closed hints database and lockfile ----------- end verify ------------ l_message: $acl_verify_message warn: condition test succeeded in ACL "rcpt" diff --git a/test/stderr/0402 b/test/stderr/0402 index d308540bb..8c0c7eddc 100644 --- a/test/stderr/0402 +++ b/test/stderr/0402 @@ -195,12 +195,12 @@ Delivery address list: userz@test.ex rd+CALLER@test.ex rd+usery@test.ex -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim -failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim + failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: CALLER@test.ex @@ -391,11 +391,11 @@ domain = test.ex routed by r1 router envelope to: CALLER@test.ex transport: t1 -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: TESTSUITE/test-mail/junk @@ -419,11 +419,11 @@ After routing: search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> TESTSUITE/test-mail/junk <-------- -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available ┌considering: /non-exist/$local_part ├──expanding: /non-exist/$local_part @@ -479,11 +479,11 @@ rd+usery@test.ex: children all complete LOG: MAIN => TESTSUITE/test-mail/junk R=r5 T=ft1 --------> TESTSUITE/test-mail/junk <-------- -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available search_tidyup called changed uid/gid: local delivery to TESTSUITE/test-mail/junk transport=ft1 @@ -536,11 +536,11 @@ rd+CALLER@test.ex: children all complete LOG: MAIN => TESTSUITE/test-mail/junk R=r4 T=ft1 --------> CALLER@test.ex <-------- -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available search_tidyup called changed uid/gid: local delivery to CALLER transport=t1 @@ -562,11 +562,11 @@ CALLER@test.ex delivered LOG: MAIN => CALLER R=r1 T=t1 --------> usery@test.ex <-------- -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available ┌considering: /non-exist/$local_part ├──expanding: /non-exist/$local_part @@ -591,11 +591,11 @@ usery@test.ex delivered LOG: MAIN => usery R=r2 T=t1 --------> userz@test.ex <-------- -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available ┌considering: /$local_part ├──expanding: /$local_part diff --git a/test/stderr/0403 b/test/stderr/0403 index 70e0b884c..ecb56e6d2 100644 --- a/test/stderr/0403 +++ b/test/stderr/0403 @@ -68,12 +68,12 @@ body_linecount=0 message_linecount=7 DSN: set orcpt: flags: 0 Delivery address list: userx@test.ex -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim -failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim + failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex @@ -132,11 +132,11 @@ r1 router generated TESTSUITE/test-mail/junk routed by r1 router envelope to: userx@test.ex transport: -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: TESTSUITE/test-mail/junk @@ -152,11 +152,11 @@ After routing: search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> TESTSUITE/test-mail/junk <-------- -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available search_tidyup called changed uid/gid: local delivery to TESTSUITE/test-mail/junk transport=t1 diff --git a/test/stderr/0404 b/test/stderr/0404 index 7febce102..0c2623555 100644 --- a/test/stderr/0404 +++ b/test/stderr/0404 @@ -169,12 +169,12 @@ body_linecount=0 message_linecount=159 DSN: set orcpt: flags: 0 Delivery address list: userx@test.ex -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim -failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim + failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex @@ -213,11 +213,11 @@ r2 router generated >sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex routed by r2 router envelope to: userx@test.ex transport: -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: >sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex, ... @@ -233,11 +233,11 @@ After routing: search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> >sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex, ... <-------- -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available search_tidyup called changed uid/gid: local delivery to >sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex, ... <>sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex, ...> transport=t1 @@ -3364,11 +3364,11 @@ Delivery address list: sender@test.ex sender@test.ex sender@test.ex -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: sender@test.ex @@ -17971,11 +17971,11 @@ sender@test.ex is a duplicate address: discarded sender@test.ex is a duplicate address: discarded >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> sender@test.ex <-------- -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available search_tidyup called changed uid/gid: local delivery to sender transport=t2 diff --git a/test/stderr/0408 b/test/stderr/0408 index c70be3489..f6fea53e0 100644 --- a/test/stderr/0408 +++ b/test/stderr/0408 @@ -68,12 +68,12 @@ body_linecount=0 message_linecount=7 DSN: set orcpt: flags: 0 Delivery address list: userx@test.ex -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim -failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim + failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex @@ -133,11 +133,11 @@ After routing: search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> userx@test.ex <-------- -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available search_tidyup called changed uid/gid: local delivery to userx transport=t1 diff --git a/test/stderr/0432 b/test/stderr/0432 index f8a9f8879..774a53b92 100644 --- a/test/stderr/0432 +++ b/test/stderr/0432 @@ -78,17 +78,17 @@ MUNGED: ::1 will be omitted in what follows get[host|ipnode]byname[2] looked up these IP addresses: name=127.0.0.1 address=127.0.0.1 Attempting full verification using callout -locking TESTSUITE/spool/db/callout.lockfile -locked TESTSUITE/spool/db/callout.lockfile -EXIM_DBOPEN: file dir flags=O_RDWR -returned from EXIM_DBOPEN: 0xAAAAAAAA -opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR -dbfn_read: key=y + locking TESTSUITE/spool/db/callout.lockfile + locked TESTSUITE/spool/db/callout.lockfile + EXIM_DBOPEN: file dir flags=O_RDWR + returned from EXIM_DBOPEN: 0xAAAAAAAA + opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR + dbfn_read: key=y callout cache: no domain record found for y -dbfn_read: key=x@y + dbfn_read: key=x@y callout cache: no address record found for x@y -EXIM_DBCLOSE(0xAAAAAAAA) -closed hints database and lockfile + EXIM_DBCLOSE(0xAAAAAAAA) + closed hints database and lockfile interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 server ready @@ -110,18 +110,18 @@ sync_responses expect rcpt cmd buf flush ddd bytes SMTP<< 220 OK SMTP(close)>> -locking TESTSUITE/spool/db/callout.lockfile -locked TESTSUITE/spool/db/callout.lockfile -EXIM_DBOPEN: file dir flags=O_RDWR|O_CREAT -returned from EXIM_DBOPEN: 0xAAAAAAAA -opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR|O_CREAT -dbfn_write: key=y + locking TESTSUITE/spool/db/callout.lockfile + locked TESTSUITE/spool/db/callout.lockfile + EXIM_DBOPEN: file dir flags=O_RDWR|O_CREAT + returned from EXIM_DBOPEN: 0xAAAAAAAA + opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR|O_CREAT + dbfn_write: key=y wrote callout cache domain record for y: result=1 postmaster=0 random=0 -dbfn_write: key=x@y + dbfn_write: key=x@y wrote positive callout cache address record for x@y -EXIM_DBCLOSE(0xAAAAAAAA) -closed hints database and lockfile + EXIM_DBCLOSE(0xAAAAAAAA) + closed hints database and lockfile ----------- end verify ------------ sender x@y verified ok accept: condition test succeeded in ACL "mail" @@ -188,18 +188,18 @@ MUNGED: ::1 will be omitted in what follows get[host|ipnode]byname[2] looked up these IP addresses: name=127.0.0.1 address=127.0.0.1 Attempting full verification using callout -locking TESTSUITE/spool/db/callout.lockfile -locked TESTSUITE/spool/db/callout.lockfile -EXIM_DBOPEN: file dir flags=O_RDWR -returned from EXIM_DBOPEN: 0xAAAAAAAA -opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR -dbfn_read: key=y + locking TESTSUITE/spool/db/callout.lockfile + locked TESTSUITE/spool/db/callout.lockfile + EXIM_DBOPEN: file dir flags=O_RDWR + returned from EXIM_DBOPEN: 0xAAAAAAAA + opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR + dbfn_read: key=y callout cache: found domain record for y -dbfn_read: key=x@y + dbfn_read: key=x@y callout cache: found address record for x@y callout cache: address record is positive -EXIM_DBCLOSE(0xAAAAAAAA) -closed hints database and lockfile + EXIM_DBCLOSE(0xAAAAAAAA) + closed hints database and lockfile ----------- end verify ------------ sender x@y verified ok accept: condition test succeeded in ACL "mail" diff --git a/test/stderr/0487 b/test/stderr/0487 index 9064bef64..16326d107 100644 --- a/test/stderr/0487 +++ b/test/stderr/0487 @@ -97,12 +97,12 @@ body_linecount=1 message_linecount=8 DSN: set orcpt: flags: 0 Delivery address list: userx@test.ex -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim -failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim + failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex @@ -135,11 +135,11 @@ After routing: search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> userx@test.ex <-------- -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available search_tidyup called changed uid/gid: local delivery to userx transport=t1 diff --git a/test/stderr/2600 b/test/stderr/2600 index 47ee39a4a..f9e106586 100644 --- a/test/stderr/2600 +++ b/test/stderr/2600 @@ -354,12 +354,12 @@ body_linecount=1 message_linecount=7 DSN: set orcpt: flags: 0 Delivery address list: userx@myhost.test.ex -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim -failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim + failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@myhost.test.ex @@ -402,11 +402,11 @@ After routing: search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> userx@myhost.test.ex <-------- -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available search_tidyup called changed uid/gid: local delivery to userx transport=t1 diff --git a/test/stderr/2610 b/test/stderr/2610 index 58b508f3c..8074317cd 100644 --- a/test/stderr/2610 +++ b/test/stderr/2610 @@ -347,12 +347,12 @@ body_linecount=1 message_linecount=7 DSN: set orcpt: flags: 0 Delivery address list: ph10@myhost.test.ex -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim -failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim + failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: ph10@myhost.test.ex @@ -397,11 +397,11 @@ search_tidyup called close MYSQL connection: 127.0.0.1:1223/test/root >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> ph10@myhost.test.ex <-------- -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available search_tidyup called changed uid/gid: local delivery to ph10 transport=t1 diff --git a/test/stderr/2620 b/test/stderr/2620 index 29a4f629c..a8fd3ff98 100644 --- a/test/stderr/2620 +++ b/test/stderr/2620 @@ -365,12 +365,12 @@ body_linecount=1 message_linecount=7 DSN: set orcpt: flags: 0 Delivery address list: CALLER@myhost.test.ex -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim -failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim + failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: CALLER@myhost.test.ex @@ -415,11 +415,11 @@ search_tidyup called close PGSQL connection: localhost:1223/test/CALLER >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> CALLER@myhost.test.ex <-------- -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available search_tidyup called changed uid/gid: local delivery to CALLER transport=t1 diff --git a/test/stderr/5004 b/test/stderr/5004 index 21fad61cc..2c6190c34 100644 --- a/test/stderr/5004 +++ b/test/stderr/5004 @@ -72,12 +72,12 @@ body_linecount=1 message_linecount=7 DSN: set orcpt: flags: 0 Delivery address list: userx@test.ex -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim -failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim + failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex @@ -111,11 +111,11 @@ r1 router generated TESTSUITE/test-mail routed by r1 router envelope to: userx@test.ex transport: -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: TESTSUITE/test-mail @@ -131,11 +131,11 @@ After routing: search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> TESTSUITE/test-mail <-------- -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available search_tidyup called changed uid/gid: local delivery to TESTSUITE/test-mail transport=t1 diff --git a/test/stderr/5005 b/test/stderr/5005 index 76d2851dd..c03ad1cea 100644 --- a/test/stderr/5005 +++ b/test/stderr/5005 @@ -68,12 +68,12 @@ body_linecount=1 message_linecount=7 DSN: set orcpt: flags: 0 Delivery address list: nofile@test.ex -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim -failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim + failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: nofile@test.ex @@ -106,11 +106,11 @@ After routing: search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> nofile@test.ex <-------- -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available search_tidyup called changed uid/gid: local delivery to nofile transport=t1 @@ -255,11 +255,11 @@ body_linecount=1 message_linecount=7 DSN: set orcpt: flags: 0 Delivery address list: userx@test.ex -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex @@ -292,11 +292,11 @@ After routing: search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> userx@test.ex <-------- -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available search_tidyup called changed uid/gid: local delivery to userx transport=t1 @@ -443,11 +443,11 @@ body_linecount=1 message_linecount=7 DSN: set orcpt: flags: 0 Delivery address list: userx@test.ex -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex @@ -480,11 +480,11 @@ After routing: search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> userx@test.ex <-------- -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available search_tidyup called changed uid/gid: local delivery to userx transport=t1 @@ -539,23 +539,23 @@ Succeeded addresses: Failed addresses: Deferred addresses: userx@test.ex -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDWR -returned from EXIM_DBOPEN: 0xAAAAAAAA -opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDWR + returned from EXIM_DBOPEN: 0xAAAAAAAA + opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR address match test: subject=userx@test.ex pattern=* test.ex in "*"? yes (matched "*") userx@test.ex in "*"? yes (matched "*") retry for T:userx@test.ex = * 0 0 -dbfn_read: key=T:userx@test.ex + dbfn_read: key=T:userx@test.ex failing_interval=ttt message_age=ttt Writing retry data for T:userx@test.ex first failed=dddd last try=dddd next try=+86400 expired=0 errno=-22 more_errno=dd mailbox is full (MTA-imposed quota exceeded while writing to tmp/MAILDIR.myhost.test.ex) -dbfn_write: key=T:userx@test.ex -EXIM_DBCLOSE(0xAAAAAAAA) -closed hints database and lockfile + dbfn_write: key=T:userx@test.ex + EXIM_DBCLOSE(0xAAAAAAAA) + closed hints database and lockfile end of retry processing delivery deferred: update_spool=1 header_rewritten=0 Writing spool header file: TESTSUITE/spool//input//hdr.pppp @@ -640,22 +640,22 @@ body_linecount=1 message_linecount=7 DSN: set orcpt: flags: 0 Delivery address list: userx@test.ex -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: 0xAAAAAAAA -opened hints database TESTSUITE/spool/db/retry: flags=O_RDONLY + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: 0xAAAAAAAA + opened hints database TESTSUITE/spool/db/retry: flags=O_RDONLY >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex unique = userx@test.ex -dbfn_read: key=R:test.ex -dbfn_read: key=R:userx@test.ex -dbfn_read: key=R:userx@test.ex: + dbfn_read: key=R:test.ex + dbfn_read: key=R:userx@test.ex + dbfn_read: key=R:userx@test.ex: no domain retry record no address retry record userx@test.ex: queued for routing -EXIM_DBCLOSE(0xAAAAAAAA) -closed hints database and lockfile + EXIM_DBCLOSE(0xAAAAAAAA) + closed hints database and lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> routing userx@test.ex --------> r1 router <-------- @@ -681,16 +681,16 @@ After routing: search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> userx@test.ex <-------- -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: 0xAAAAAAAA -opened hints database TESTSUITE/spool/db/retry: flags=O_RDONLY -dbfn_read: key=T:userx@test.ex + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: 0xAAAAAAAA + opened hints database TESTSUITE/spool/db/retry: flags=O_RDONLY + dbfn_read: key=T:userx@test.ex retry record exists: age=ttt (max 1w) time to retry = tttt expired = 0 -EXIM_DBCLOSE(0xAAAAAAAA) -closed hints database and lockfile + EXIM_DBCLOSE(0xAAAAAAAA) + closed hints database and lockfile search_tidyup called changed uid/gid: local delivery to userx transport=t1 uid=CALLER_UID gid=CALLER_GID pid=pppp @@ -731,23 +731,23 @@ Succeeded addresses: Failed addresses: Deferred addresses: userx@test.ex -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDWR -returned from EXIM_DBOPEN: 0xAAAAAAAA -opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDWR + returned from EXIM_DBOPEN: 0xAAAAAAAA + opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR address match test: subject=userx@test.ex pattern=* test.ex in "*"? yes (matched "*") userx@test.ex in "*"? yes (matched "*") retry for T:userx@test.ex = * 0 0 -dbfn_read: key=T:userx@test.ex + dbfn_read: key=T:userx@test.ex failing_interval=ttt message_age=ttt Writing retry data for T:userx@test.ex first failed=dddd last try=dddd next try=+86400 expired=0 errno=-22 more_errno=dd mailbox is full (MTA-imposed quota exceeded while writing to tmp/MAILDIR.myhost.test.ex) -dbfn_write: key=T:userx@test.ex -EXIM_DBCLOSE(0xAAAAAAAA) -closed hints database and lockfile + dbfn_write: key=T:userx@test.ex + EXIM_DBCLOSE(0xAAAAAAAA) + closed hints database and lockfile end of retry processing delivery deferred: update_spool=1 header_rewritten=0 Writing spool header file: TESTSUITE/spool//input//hdr.pppp diff --git a/test/stderr/5006 b/test/stderr/5006 index 8e120f627..55e52d4c9 100644 --- a/test/stderr/5006 +++ b/test/stderr/5006 @@ -68,12 +68,12 @@ body_linecount=1 message_linecount=7 DSN: set orcpt: flags: 0 Delivery address list: userx@test.ex -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim -failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim + failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex @@ -106,11 +106,11 @@ After routing: search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> userx@test.ex <-------- -locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile -EXIM_DBOPEN: file dir flags=O_RDONLY -returned from EXIM_DBOPEN: (nil) -failed to open DB file TESTSUITE/spool/db/retry: No such file or directory + locking TESTSUITE/spool/db/retry.lockfile + locked TESTSUITE/spool/db/retry.lockfile + EXIM_DBOPEN: file dir flags=O_RDONLY + returned from EXIM_DBOPEN: (nil) + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available search_tidyup called changed uid/gid: local delivery to userx transport=t1