From 799253d6a75db70c631716a190736c285a97155c Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Thu, 6 Jun 2024 14:47:28 +0100 Subject: [PATCH] Hintsdb: USE_SQLITE build option --- doc/doc-docbook/spec.xfpt | 11 +- doc/doc-txt/NewStuff | 4 + src/src/EDITME | 7 +- src/src/config.h.defaults | 1 + src/src/dbfn.c | 16 ++- src/src/exim.c | 21 +-- src/src/exim.h | 1 + src/src/exim_dbutil.c | 2 +- src/src/hintsdb.h | 273 +++++++++++++++++++++++++++++++++++++- src/src/lookups/sqlite.c | 2 +- test/runtest | 9 +- test/stderr/0002 | 7 + test/stderr/0021 | 3 + test/stderr/0022 | 3 + test/stderr/0037 | 2 + test/stderr/0044 | 2 + test/stderr/0078 | 4 + test/stderr/0084 | 1 + test/stderr/0085 | 2 + test/stderr/0092 | 1 + test/stderr/0094 | 1 + test/stderr/0117 | 3 + test/stderr/0123 | 1 + test/stderr/0143 | 2 + test/stderr/0149 | 1 + test/stderr/0161 | 6 + test/stderr/0169 | 2 + test/stderr/0183 | 5 + test/stderr/0218 | 7 + test/stderr/0249 | 1 + test/stderr/0264 | 2 + test/stderr/0275 | 4 + test/stderr/0277 | 5 + test/stderr/0278 | 4 + test/stderr/0279 | 2 + test/stderr/0283 | 6 + test/stderr/0294 | 4 + test/stderr/0297 | 2 + test/stderr/0303 | 2 + test/stderr/0315 | 4 + test/stderr/0317 | 2 + test/stderr/0332 | 2 + test/stderr/0333 | 2 + test/stderr/0357 | 5 + test/stderr/0358 | 3 + test/stderr/0360 | 3 + test/stderr/0361 | 2 + test/stderr/0362 | 1 + test/stderr/0364 | 1 + test/stderr/0368 | 1 + test/stderr/0370 | 2 + test/stderr/0371 | 1 + test/stderr/0374 | 4 + test/stderr/0375 | 6 + test/stderr/0376 | 28 ++++ test/stderr/0377 | 4 + test/stderr/0378 | 5 + test/stderr/0379 | 3 + test/stderr/0380 | 2 + test/stderr/0381 | 1 + test/stderr/0382 | 5 + test/stderr/0386 | 4 + test/stderr/0387 | 1 + test/stderr/0388 | 12 +- test/stderr/0391 | 1 + test/stderr/0393 | 6 + test/stderr/0396 | 1 + test/stderr/0398 | 9 +- test/stderr/0399 | 1 + test/stderr/0402 | 2 + test/stderr/0403 | 4 + test/stderr/0404 | 4 + test/stderr/0408 | 2 + test/stderr/0414 | 1 + test/stderr/0419 | 1 + test/stderr/0426 | 4 + test/stderr/0432 | 10 +- test/stderr/0433 | 6 + test/stderr/0435 | 1 + test/stderr/0437 | 1 + test/stderr/0438 | 3 + test/stderr/0450 | 3 + test/stderr/0462 | 3 + test/stderr/0463 | 1 + test/stderr/0464 | 1 + test/stderr/0465 | 3 + test/stderr/0469 | 1 + test/stderr/0471 | 6 + test/stderr/0473 | 2 + test/stderr/0476 | 3 + test/stderr/0479 | 1 + test/stderr/0483 | 1 + test/stderr/0484 | 1 + test/stderr/0487 | 2 + test/stderr/0489 | 8 ++ test/stderr/0499 | 1 + test/stderr/0512 | 6 + test/stderr/0514 | 1 + test/stderr/0529 | 3 + test/stderr/0543 | 1 + test/stderr/0544 | 3 + test/stderr/0545 | 2 + test/stderr/0554 | 2 + test/stderr/0563 | 1 + test/stderr/0575 | 1 + test/stderr/0578 | 28 ++++ test/stderr/0609 | 1 + test/stderr/0620 | 2 + test/stderr/0623 | 6 + test/stderr/0628 | 1 + test/stderr/0632 | 1 + test/stderr/0909 | 10 ++ test/stderr/1006 | 2 + test/stderr/1007 | 8 ++ test/stderr/1157 | 9 ++ test/stderr/2035 | 2 + test/stderr/2135 | 2 + test/stderr/2200 | 2 + test/stderr/2201 | 3 + test/stderr/2202 | 2 + test/stderr/2600 | 10 ++ test/stderr/2610 | 4 + test/stderr/2620 | 5 + test/stderr/3000 | 1 + test/stderr/3201 | 2 + test/stderr/3210 | 1 + test/stderr/3212 | 1 + test/stderr/3400 | 1 + test/stderr/4052 | 2 + test/stderr/4510 | 2 + test/stderr/4530 | 2 + test/stderr/4802 | 2 + test/stderr/4803 | 2 + test/stderr/5000 | 2 + test/stderr/5004 | 2 + test/stderr/5005 | 18 ++- test/stderr/5006 | 2 + test/stderr/5008 | 4 + test/stderr/5204 | 9 ++ test/stderr/5410 | 3 + test/stderr/5420 | 3 + 141 files changed, 777 insertions(+), 30 deletions(-) diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index ef0270540..202c27659 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -1805,6 +1805,11 @@ suited to Exim's usage model. Yet another DBM library, called &'tdb'&, is available from &url(https://sourceforge.net/projects/tdb/files/). It has its own interface, and also operates on a single file. +.next +.new +It is possible to use sqlite3 (&url(https://www.sqlite.org/index.html)) +for the DBM library. +.wen .endlist .cindex "USE_DB" @@ -1816,8 +1821,9 @@ USE_DB in an appropriate configuration file (typically .code USE_DB=yes .endd -Similarly, for gdbm you set USE_GDBM, and for tdb you set USE_TDB. An -error is diagnosed if you set more than one of these. +Similarly, for gdbm you set USE_GDBM, for tdb you set USE_TDB, +and for sqlite3 you set USE_SQLITE. +An error is diagnosed if you set more than one of these. You can set USE_NDBM if needed to override an operating system default. At the lowest level, the build-time configuration sets none of these options, @@ -1833,6 +1839,7 @@ in one of these lines: .code DBMLIB = -ldb DBMLIB = -ltdb +DBMLIB = -lsqlite3 DBMLIB = -lgdbm -lgdbm_compat .endd The last of those was for a Linux having GDBM provide emulated NDBM facilities. diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff index 3253b90aa..778c3259e 100644 --- a/doc/doc-txt/NewStuff +++ b/doc/doc-txt/NewStuff @@ -28,6 +28,10 @@ Version 4.98 9. Add SMTP WELLKNOWN extension. + 10. Sqlite3 can be used for the hints databases (vs. DBD, NDB, GBDM, TDB). + Add "USE_SQLITE = y" and "DBMLIB = -lsqlite3" in Local/Makefile, to override + the settings done in the OS/Makefile- file. + Version 4.97 ------------ diff --git a/src/src/EDITME b/src/src/EDITME index 1440b4b44..426c1da3c 100644 --- a/src/src/EDITME +++ b/src/src/EDITME @@ -47,7 +47,8 @@ # compile the Exim monitor utility. Exim itself does not use X11. # Another area of variability between systems is the type and location of the -# DBM library package. Exim has support for ndbm, gdbm, tdb, and Berkeley DB. +# DBM library package. Exim has support for ndbm, gdbm, tdb, Berkeley DB and +# sqlite3. # By default the code assumes ndbm; this often works with gdbm or DB, provided # they are correctly installed, via their compatibility interfaces. However, # Exim can also be configured to use the native calls for Berkeley DB (obsolete @@ -676,6 +677,10 @@ DISABLE_MAL_MKS=yes # USE_DB = yes # DBMLIB = -ldb +# sqlite +# USE_SQLITE = yes +# DBMLIB = -lsqlite3 + #------------------------------------------------------------------------------ # Although Exim is normally a setuid program, owned by root, it refuses to run diff --git a/src/src/config.h.defaults b/src/src/config.h.defaults index 22749b174..0425279db 100644 --- a/src/src/config.h.defaults +++ b/src/src/config.h.defaults @@ -188,6 +188,7 @@ Do not put spaces between # and the 'define'. #define USE_OPENSSL #define USE_READLINE #define USE_TCP_WRAPPERS +#define USE_SQLITE #define USE_TDB #define WHITELIST_D_MACROS diff --git a/src/src/dbfn.c b/src/src/dbfn.c index 37ff7f504..069c885f0 100644 --- a/src/src/dbfn.c +++ b/src/src/dbfn.c @@ -274,7 +274,11 @@ exim_datum_init(&result_datum); /* to be cleared before use. */ exim_datum_data_set(&key_datum, key_copy); exim_datum_size_set(&key_datum, klen); -if (!exim_dbget(dbblock->dbptr, &key_datum, &result_datum)) return NULL; +if (!exim_dbget(dbblock->dbptr, &key_datum, &result_datum)) + { + DEBUG(D_hints_lookup) debug_printf_indent("dbfn_read: null return\n"); + return NULL; + } /* Assume the data store could have been tainted. Properly, we should store the taint status with the data. */ @@ -282,6 +286,7 @@ store the taint status with the data. */ dlen = exim_datum_size_get(&result_datum); yield = store_get(dlen, GET_TAINTED); memcpy(yield, exim_datum_data_get(&result_datum), dlen); +DEBUG(D_hints_lookup) debug_printf_indent("dbfn_read: size %u return\n", dlen); if (length) *length = dlen; exim_datum_free(&result_datum); /* Some DBM libs require freeing */ @@ -344,7 +349,8 @@ uschar * key_copy = store_get(klen, key); memcpy(key_copy, key, klen); gptr->time_stamp = time(NULL); -DEBUG(D_hints_lookup) debug_printf_indent("dbfn_write: key=%s\n", key); +DEBUG(D_hints_lookup) + debug_printf_indent("dbfn_write: key=%s datalen %d\n", key, length); exim_datum_init(&key_datum); /* Some DBM libraries require the datum */ exim_datum_init(&value_datum); /* to be cleared before use. */ @@ -387,6 +393,11 @@ return exim_dbdel(dbblock->dbptr, &key_datum); +#ifdef notdef +/* XXX This appears to be unused. There's a separate implementation +in dbutils.c for dumpdb and fixdb, using the same underlying support. +*/ + /************************************************* * Scan the keys of a database file * *************************************************/ @@ -426,6 +437,7 @@ yield = exim_dbscan(dbblock->dbptr, &key_datum, &value_datum, start, *cursor) if (!yield) exim_dbdelete_cursor(*cursor); return yield; } +#endif diff --git a/src/src/exim.c b/src/src/exim.c index b78839b57..1e5643713 100644 --- a/src/src/exim.c +++ b/src/src/exim.c @@ -997,32 +997,35 @@ if (s) static gstring * show_db_version(gstring * g) { +g = string_cat(g, US"Hints DB:\n"); #ifdef DB_VERSION_STRING DEBUG(D_any) { - g = string_fmt_append(g, "Library version: BDB: Compile: %s\n", DB_VERSION_STRING); - g = string_fmt_append(g, " Runtime: %s\n", + g = string_fmt_append(g, " Library version: BDB: Compile: %s\n", DB_VERSION_STRING); + g = string_fmt_append(g, " Runtime: %s\n", db_version(NULL, NULL, NULL)); } else - g = string_fmt_append(g, "Berkeley DB: %s\n", DB_VERSION_STRING); + g = string_fmt_append(g, " Berkeley DB: %s\n", DB_VERSION_STRING); #elif defined(BTREEVERSION) && defined(HASHVERSION) # ifdef USE_DB - g = string_cat(g, US"Probably Berkeley DB version 1.8x (native mode)\n"); + g = string_cat(g, US" Probably Berkeley DB version 1.8x (native mode)\n"); # else - g = string_cat(g, US"Probably Berkeley DB version 1.8x (compatibility mode)\n"); + g = string_cat(g, US" Probably Berkeley DB version 1.8x (compatibility mode)\n"); # endif #elif defined(_DBM_RDONLY) || defined(dbm_dirfno) -g = string_cat(g, US"Probably ndbm\n"); +g = string_cat(g, US" Probably ndbm\n"); +#elif defined(USE_SQLITE) +g = string_cat(g, US" Using sqlite3\n"); #elif defined(USE_TDB) -g = string_cat(g, US"Using tdb\n"); +g = string_cat(g, US" Using tdb\n"); #else # ifdef USE_GDBM - g = string_cat(g, US"Probably GDBM (native mode)\n"); +g = string_cat(g, US" Probably GDBM (native mode)\n"); # else - g = string_cat(g, US"Probably GDBM (compatibility mode)\n"); +g = string_cat(g, US" Probably GDBM (compatibility mode)\n"); # endif #endif return g; diff --git a/src/src/exim.h b/src/src/exim.h index 6baf1fbb4..585416592 100644 --- a/src/src/exim.h +++ b/src/src/exim.h @@ -524,6 +524,7 @@ config.h, mytypes.h, and store.h, so we don't need to mention them explicitly. #include "local_scan.h" #include "path_max.h" #include "macros.h" +#include "blob.h" #include "hintsdb.h" #include "hintsdb_structs.h" #include "structs.h" diff --git a/src/src/exim_dbutil.c b/src/src/exim_dbutil.c index c868832b1..5d8846d93 100644 --- a/src/src/exim_dbutil.c +++ b/src/src/exim_dbutil.c @@ -520,7 +520,7 @@ Arguments: cursor a pointer to a pointer to a cursor anchor, for those dbm libraries that use the notion of a cursor -Returns: the next record from the file, or +Returns: the next *key* (nul-terminated) from the file, or NULL if there are no more */ diff --git a/src/src/hintsdb.h b/src/src/hintsdb.h index 3332f748c..545c83dbd 100644 --- a/src/src/hintsdb.h +++ b/src/src/hintsdb.h @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) The Exim Maintainers 2020 - 2022 */ +/* Copyright (c) The Exim Maintainers 2020 - 2024 */ /* Copyright (c) University of Cambridge 1995 - 2018 */ /* See the file NOTICE for conditions of use and distribution. */ /* SPDX-License-Identifier: GPL-2.0-or-later */ @@ -55,7 +55,272 @@ The users of this API are: #define HINTSDB_H -#if defined(USE_TDB) +#ifdef USE_SQLITE + +/* ********************* sqlite3 interface ************************ */ + +# include + +/* Basic DB type */ +# define EXIM_DB sqlite3 + +# define EXIM_CURSOR int + +# /* The datum type used for queries */ +# define EXIM_DATUM blob + +/* Some text for messages */ +# define EXIM_DBTYPE "sqlite3" + +# /* Access functions */ + +/* EXIM_DBOPEN - return pointer to an EXIM_DB, NULL if failed */ +static inline EXIM_DB * +exim_dbopen__(const uschar * name, const uschar * dirname, int flags, + unsigned mode) +{ +EXIM_DB * dbp; +int ret, sflags = flags & O_RDWR ? SQLITE_OPEN_READWRITE : SQLITE_OPEN_READONLY; +if (flags & O_CREAT) sflags |= SQLITE_OPEN_CREATE; +if ((ret = sqlite3_open_v2(CCS name, &dbp, sflags, NULL)) == SQLITE_OK) + { + sqlite3_busy_timeout(dbp, 5000); + if (flags & O_CREAT) + ret == sqlite3_exec(dbp, + "CREATE TABLE tbl (ky TEXT PRIMARY KEY, dat BLOB);", NULL, NULL, NULL); + } +//else +// fprintf(stderr, "sqlite3_open_v2: %s\n", sqlite3_errmsg(dbp)); +return ret == SQLITE_OK ? dbp : NULL; +} + +/* EXIM_DBGET - returns TRUE if successful, FALSE otherwise */ +/* note we alloc'n'copy - the caller need not do so */ +/* result has a NUL appended, but the length is as per the DB */ + +static inline BOOL +exim_dbget__(EXIM_DB * dbp, const uschar * s, EXIM_DATUM * res) +{ +sqlite3_stmt * statement; +int ret; + +res->len = (size_t) -1; +/* fprintf(stderr, "exim_dbget__(%s)\n", s); */ +if ((ret = sqlite3_prepare_v2(dbp, CCS s, -1, &statement, NULL)) != SQLITE_OK) + { +/* fprintf(stderr, "prepare fail: %s\n", sqlite3_errmsg(dbp)); */ + return FALSE; + } +if (sqlite3_step(statement) != SQLITE_ROW) + { +/* fprintf(stderr, "step fail: %s\n", sqlite3_errmsg(dbp)); */ + sqlite3_finalize(statement); + return FALSE; + } + +res->len = sqlite3_column_bytes(statement, 0); +res->data = store_get(res->len + 1, GET_TAINTED); +memcpy(res->data, sqlite3_column_blob(statement, 0), res->len); +res->data[res->len] = '\0'; +/* fprintf(stderr, "res %d bytes: '%.*s'\n", (int)res->len, (int)res->len, res->data); */ +sqlite3_finalize(statement); +return TRUE; +} + +static inline BOOL +exim_dbget(EXIM_DB * dbp, EXIM_DATUM * key, EXIM_DATUM * res) +{ +# define FMT "SELECT dat FROM tbl WHERE ky = '%.*s';" +uschar * qry; +int i; +BOOL ret; + +# ifdef COMPILE_UTILITY +/* fprintf(stderr, "exim_dbget(k len %d '%.*s')\n", (int)key->len, (int)key->len, key->data); */ +qry = malloc(i = snprintf(NULL, 0, FMT, (int) key->len, key->data)); +snprintf(CS qry, i, FMT, (int) key->len, key->data); +ret = exim_dbget__(dbp, qry, res); +free(qry); +# else +/* fprintf(stderr, "exim_dbget(k len %d '%.*s')\n", (int)key->len, (int)key->len, key->data); */ +qry = string_sprintf(FMT, (int) key->len, key->data); +ret = exim_dbget__(dbp, qry, res); +# endif + +return ret; +# undef FMT +} + +/**/ +# define EXIM_DBPUTB_OK 0 +# define EXIM_DBPUTB_DUP (-1) + +static inline int +exim_s_dbp(EXIM_DB * dbp, EXIM_DATUM * key, EXIM_DATUM * data, const uschar * alt) +{ +# define FMT "INSERT OR %s INTO tbl (ky,dat) VALUES ('%.*s', X'%.*s');" +uschar * hex = store_get(data->len * 2, data->data), * qry; +int res; + +for (const uschar * s = data->data, * t = s + data->len; s < t; s++) + sprintf(CS hex + 2 * (s - data->data), "%02X", *s); + +# ifdef COMPILE_UTILITY +res = snprintf(NULL, 0, FMT, + alt, (int) key->len, key->data, (int)data->len * 2, hex); +qry = malloc(res); +snprintf(CS qry, res, FMT, alt, (int) key->len, key->data, (int)data->len * 2, hex); +/* fprintf(stderr, "exim_s_dbp(%s)\n", qry); */ +res = sqlite3_exec(dbp, CS qry, NULL, NULL, NULL); +free(qry); +# else +qry = string_sprintf(FMT, alt, (int) key->len, key->data, (int)data->len * 2, hex); +/* fprintf(stderr, "exim_s_dbp(%s)\n", qry); */ +res = sqlite3_exec(dbp, CS qry, NULL, NULL, NULL); +/* fprintf(stderr, "exim_s_dbp res %d\n", res); */ +# endif + +if (res != SQLITE_OK) + fprintf(stderr, "sqlite3_exec: %s\n", sqlite3_errmsg(dbp)); + +return res == SQLITE_OK ? EXIM_DBPUTB_OK : EXIM_DBPUTB_DUP; +# undef FMT +} + +/* EXIM_DBPUT - returns nothing useful, assumes replace mode */ + +static inline int +exim_dbput(EXIM_DB * dbp, EXIM_DATUM * key, EXIM_DATUM * data) +{ +/* fprintf(stderr, "exim_dbput()\n"); */ +(void) exim_s_dbp(dbp, key, data, US"REPLACE"); +return 0; +} + +/* EXIM_DBPUTB - non-overwriting for use by dbmbuild */ + +/* Returns from EXIM_DBPUTB */ + +static inline int +exim_dbputb(EXIM_DB * dbp, EXIM_DATUM * key, EXIM_DATUM * data) +{ +return exim_s_dbp(dbp, key, data, US"ABORT"); +} + +/* EXIM_DBDEL */ +static inline int +exim_dbdel(EXIM_DB * dbp, EXIM_DATUM * key) +{ +# define FMT "DELETE FROM tbl WHERE ky = '%.*s';" +uschar * qry; +int res; + +# ifdef COMPILE_UTILITY +res = snprintf(NULL, 0, FMT, (int) key->len, key->data); +qry = malloc(res); +snprintf(CS qry, res, FMT, (int) key->len, key->data); +res = sqlite3_exec(dbp, CS qry, NULL, NULL, NULL); +free(qry); +# else +qry = string_sprintf(FMT, (int) key->len, key->data); +res = sqlite3_exec(dbp, CS qry, NULL, NULL, NULL); +# endif + +return res; +# undef FMT +} + + +/* EXIM_DBCREATE_CURSOR - initialize for scanning operation */ +/* Cursors are inefficiently emulated by repeating searches */ + +static inline EXIM_CURSOR * +exim_dbcreate_cursor(EXIM_DB * dbp) +{ +EXIM_CURSOR * c = store_malloc(sizeof(int)); +*c = 0; +return c; +} + +/* EXIM_DBSCAN */ +/* Note that we return the (next) key, not the record value */ +static inline BOOL +exim_dbscan(EXIM_DB * dbp, EXIM_DATUM * key, EXIM_DATUM * res, BOOL first, + EXIM_CURSOR * cursor) +{ +# define FMT "SELECT ky FROM tbl ORDER BY ky LIMIT 1 OFFSET %d;" +uschar * qry; +int i; +BOOL ret; + +# ifdef COMPILE_UTILITY +qry = malloc(i = snprintf(NULL, 0, FMT, *cursor)); +snprintf(CS qry, i, FMT, *cursor); +/* fprintf(stderr, "exim_dbscan(%s)\n", qry); */ +ret = exim_dbget__(dbp, qry, key); +free(qry); +/* fprintf(stderr, "exim_dbscan ret %c\n", ret ? 'T':'F'); */ +# else +qry = string_sprintf(FMT, *cursor); +/* fprintf(stderr, "exim_dbscan(%s)\n", qry); */ +ret = exim_dbget__(dbp, qry, key); +/* fprintf(stderr, "exim_dbscan ret %c\n", ret ? 'T':'F'); */ +# endif +if (ret) *cursor = *cursor + 1; +return ret; +# undef FMT +} + +/* EXIM_DBDELETE_CURSOR - terminate scanning operation. */ +static inline void +exim_dbdelete_cursor(EXIM_CURSOR * cursor) +{ store_free(cursor); } + + +/* EXIM_DBCLOSE */ +static void +exim_dbclose__(EXIM_DB * db) +{ sqlite3_close(db); } + + +/* Datum access */ + +static uschar * +exim_datum_data_get(EXIM_DATUM * dp) +{ return US dp->data; } +static void +exim_datum_data_set(EXIM_DATUM * dp, void * s) +{ dp->data = s; } + +static unsigned +exim_datum_size_get(EXIM_DATUM * dp) +{ return dp->len; } +static void +exim_datum_size_set(EXIM_DATUM * dp, unsigned n) +{ dp->len = n; } + + + +static inline void +exim_datum_init(EXIM_DATUM * dp) +{ dp->data = NULL; } /* compiler quietening */ + +/* No free needed for a datum */ + +static inline void +exim_datum_free(EXIM_DATUM * dp) +{ } + +/* size limit */ + +# define EXIM_DB_RLIMIT 150 + + + + + + +#elif defined(USE_TDB) # if defined(USE_DB) || defined(USE_GDBM) # error USE_TDB conflict with alternate definition @@ -161,7 +426,7 @@ exim_datum_data_set(EXIM_DATUM * dp, void * s) static inline unsigned exim_datum_size_get(EXIM_DATUM * dp) -{ return dp->dsize; } +{ return dp->len; } static inline void exim_datum_size_set(EXIM_DATUM * dp, unsigned n) { dp->dsize = n; } @@ -854,3 +1119,5 @@ exim_dbclose__(dbp); #endif /* whole file */ /* End of hintsdb.h */ +/* vi: aw ai sw=2 +*/ diff --git a/src/src/lookups/sqlite.c b/src/src/lookups/sqlite.c index 6c7af4225..fd7b3e033 100644 --- a/src/src/lookups/sqlite.c +++ b/src/src/lookups/sqlite.c @@ -34,7 +34,7 @@ if (!filename || *filename != '/') *errmsg = US"absolute file name expected for \"sqlite\" lookup"; else if ((ret = sqlite3_open(CCS filename, &db)) != 0) { - *errmsg = (void *)sqlite3_errmsg(db); + *errmsg = string_copy(US sqlite3_errmsg(db)); sqlite3_close(db); db = NULL; DEBUG(D_lookup) debug_printf_indent("Error opening database: %s\n", *errmsg); diff --git a/test/runtest b/test/runtest index 683dee2d1..406260a14 100755 --- a/test/runtest +++ b/test/runtest @@ -1132,9 +1132,9 @@ RESET_AFTER_EXTRA_LINE_READ: # because they will be different in different binaries. next if /^$time_pid? - (?: Berkeley\ DB:\s - | Probably\ (?:Berkeley\ DB|ndbm|GDBM) - | Using\ tdb + (?: .*\sBerkeley\ DB + | \sProbably\ (?:Berkeley\ DB|ndbm|GDBM) + | \sUsing\ (?:tdb|sqlite3) | Authenticators: | Lookups(?:\(built-in\))?: | Support\ for: @@ -1281,6 +1281,9 @@ RESET_AFTER_EXTRA_LINE_READ: # We invoke Exim with -D, so we hit this new message as of Exim 4.73: next if /^macros_trusted overridden to true by whitelisting/; + # Hints-db writes seem to have variable sizes for values + s/ dbfn_write: key=.+ datalen \K\d+$/NNN/; + # We have to omit the localhost ::1 address so that all is well in # the IPv4-only case. diff --git a/test/stderr/0002 b/test/stderr/0002 index 69640dad2..2b8eed427 100644 --- a/test/stderr/0002 +++ b/test/stderr/0002 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: environment after trimming: USER=CALLER configuration file is TESTSUITE/test-config @@ -160,6 +161,7 @@ LOG: MAIN PANIC ╰─────result: protected:░░ >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: environment after trimming: USER=CALLER configuration file is TESTSUITE/test-config @@ -313,6 +315,7 @@ LOG: MAIN PANIC \_____result: protected: >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: environment after trimming: USER=CALLER configuration file is TESTSUITE/test-config @@ -392,6 +395,7 @@ try option unknown_login >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> 1999-03-02 09:44:33 no host name found for IP address V4NET.11.12.13 Exim version x.yz .... +Hints DB: environment after trimming: USER=CALLER configuration file is TESTSUITE/test-config @@ -516,6 +520,7 @@ sender_rcvhost = ten-1.test.ex ([V4NET.0.0.1] ident=me) ╰──(tainted) >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1238 configuration file is TESTSUITE/test-config @@ -584,6 +589,7 @@ LOG: connection_reject MAIN REJECT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1239 configuration file is TESTSUITE/test-config @@ -783,6 +789,7 @@ LOG: 10HmbD-000000005vi-0000 Subject is: " here we go: a string that is going to >>> end of ACL "check_data": DENY LOG: 10HmbD-000000005vi-0000 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<> Exim version x.yz .... +Hints DB: changed uid/gid: -C, -D, -be or -bf forces real uid uid=CALLER_UID gid=CALLER_GID pid=p1240 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0021 b/test/stderr/0021 index 0799ce33f..2f1b9a215 100644 --- a/test/stderr/0021 +++ b/test/stderr/0021 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -157,6 +158,7 @@ LOG: smtp_connection MAIN >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> 1999-03-02 09:44:33 ACL "warn" with "message" setting found in a non-message (EHLO or HELO) ACL: cannot specify header lines here: message ignored Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -282,6 +284,7 @@ end of ACL "rcpt": ACCEPT LOG: MAIN <= ok@test3 H=[10.9.8.8] U=CALLER P=smtp S=sss Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/0022 b/test/stderr/0022 index 4592afa4d..b803208c5 100644 --- a/test/stderr/0022 +++ b/test/stderr/0022 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1236 configuration file is TESTSUITE/test-config @@ -79,6 +80,7 @@ LOG: smtp_connection MAIN search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1237 configuration file is TESTSUITE/test-config @@ -162,6 +164,7 @@ LOG: smtp_connection MAIN search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1238 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0037 b/test/stderr/0037 index 03b6c3474..361f1639b 100644 --- a/test/stderr/0037 +++ b/test/stderr/0037 @@ -1,10 +1,12 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/0044 b/test/stderr/0044 index 9fa3c568e..0365875be 100644 --- a/test/stderr/0044 +++ b/test/stderr/0044 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config @@ -220,6 +221,7 @@ search_tidyup called >>> host in ignore_fromline_hosts? no (option unset) LOG: 10HmaY-000000005vi-0000 <= myfriend@there.test.ex H=(exim.test.ex) [V4NET.11.12.13] P=esmtp S=sss Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0078 b/test/stderr/0078 index 75d9d9697..56cc9c81a 100644 --- a/test/stderr/0078 +++ b/test/stderr/0078 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -24,6 +25,7 @@ routed by lookuphost router host ten-1.test.ex [V4NET.0.0.1] MX=5 dnssec=no >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -64,6 +66,7 @@ routed by self router host myhost.test.ex [V4NET.10.10.10] >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -119,6 +122,7 @@ routed by self2 router host myhost.test.ex [V4NET.10.10.10] >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid diff --git a/test/stderr/0084 b/test/stderr/0084 index d805f7a61..c1db2a3e6 100644 --- a/test/stderr/0084 +++ b/test/stderr/0084 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> diff --git a/test/stderr/0085 b/test/stderr/0085 index e2c2407ae..6637329c8 100644 --- a/test/stderr/0085 +++ b/test/stderr/0085 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config @@ -261,6 +262,7 @@ no more routers search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0092 b/test/stderr/0092 index 5be8bc633..04e219a0e 100644 --- a/test/stderr/0092 +++ b/test/stderr/0092 @@ -48,6 +48,7 @@ LOG: SMTP command timeout on connection from [V4NET.0.0.1] D=qqs >>> end of ACL "check_recipient": ACCEPT LOG: SMTP data timeout (message abandoned) on connection from (test) [V4NET.0.0.1] F= D=qqs Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 environment after trimming: diff --git a/test/stderr/0094 b/test/stderr/0094 index 631070823..bd3bb1425 100644 --- a/test/stderr/0094 +++ b/test/stderr/0094 @@ -102,6 +102,7 @@ LOG: H=(test) [V4NET.11.12.13] F= rejected RCPT >> end of ACL "check_recipient": DENY LOG: H=ten-1.test.ex (test) [V4NET.0.0.1] F= rejected RCPT : relay not permitted Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0117 b/test/stderr/0117 index 090ad7be0..60bbef8c5 100644 --- a/test/stderr/0117 +++ b/test/stderr/0117 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -21,6 +22,7 @@ routed by lookuphost router host ten-3.test.ex [V4NET.0.0.3] MX=7 dnssec=no >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -43,6 +45,7 @@ routed by lookuphost router host ten-3.test.ex [V4NET.0.0.3] MX=7 dnssec=no >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> diff --git a/test/stderr/0123 b/test/stderr/0123 index d9f4557f5..a25f0e5e0 100644 --- a/test/stderr/0123 +++ b/test/stderr/0123 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0143 b/test/stderr/0143 index f8636e869..a28515dd0 100644 --- a/test/stderr/0143 +++ b/test/stderr/0143 @@ -1,10 +1,12 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/0149 b/test/stderr/0149 index 50d3de6ce..81bf94397 100644 --- a/test/stderr/0149 +++ b/test/stderr/0149 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> diff --git a/test/stderr/0161 b/test/stderr/0161 index fe30eb05e..75986186e 100644 --- a/test/stderr/0161 +++ b/test/stderr/0161 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -31,6 +32,7 @@ routed by lookuphost router host ten-1.test.ex [V4NET.0.0.1] MX=5 dnssec=no >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -85,6 +87,7 @@ routed by self router host myhost.test.ex [V4NET.10.10.10] >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -154,6 +157,7 @@ routed by self2 router host myhost.test.ex [V4NET.10.10.10] >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -180,6 +184,7 @@ lookuphost router declined for xx@not-exist.test.ex no more routers >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -199,6 +204,7 @@ lowest numbered MX record points to local host: mxt1.test.ex: address failed (se failuphost router forced address failure >>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid diff --git a/test/stderr/0169 b/test/stderr/0169 index 9295d32fd..668501930 100644 --- a/test/stderr/0169 +++ b/test/stderr/0169 @@ -1,9 +1,11 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/0183 b/test/stderr/0183 index 944aa53ae..3501e48a7 100644 --- a/test/stderr/0183 +++ b/test/stderr/0183 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config @@ -293,6 +294,7 @@ routed by lookuphost router search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config @@ -585,6 +587,7 @@ routed by lookuphost router search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1236 configuration file is TESTSUITE/test-config @@ -879,6 +882,7 @@ routed by lookuphost router search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1237 configuration file is TESTSUITE/test-config @@ -969,6 +973,7 @@ srv router: defer for srv@test.fail.dns search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1238 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0218 b/test/stderr/0218 index 523585d5b..a895fc601 100644 --- a/test/stderr/0218 +++ b/test/stderr/0218 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -49,6 +50,7 @@ LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=p1239 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -81,6 +83,7 @@ LOG: queue_run MAIN End queue run: pid=p1234 -qq >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -128,6 +131,7 @@ cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:550:503:503:QUIT+:250' LOG: MAIN ** a@test.ex F= R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined MAIL FROM:: 550 NO Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -153,6 +157,7 @@ LOG: queue_run MAIN End queue run: pid=p1235 -qq >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -203,6 +208,7 @@ cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:550:503:RSET:250' LOG: MAIN ** b@test.ex F= R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 550 Unknown Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -213,6 +219,7 @@ LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=p1250 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/0249 b/test/stderr/0249 index 1784b1bca..879ba7eeb 100644 --- a/test/stderr/0249 +++ b/test/stderr/0249 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user c.domain in "a.domain"? no (end of list) diff --git a/test/stderr/0264 b/test/stderr/0264 index 5b5770c83..ce7d530c0 100644 --- a/test/stderr/0264 +++ b/test/stderr/0264 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user Writing spool header file: TESTSUITE/spool//input//hdr.10HmbJ-000000005vi-0000 @@ -7,6 +8,7 @@ Renaming spool header file: TESTSUITE/spool//input//10HmbJ-000000005vi-0000-H LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/0275 b/test/stderr/0275 index 0c0ca3e65..6412f0e86 100644 --- a/test/stderr/0275 +++ b/test/stderr/0275 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config @@ -185,6 +186,7 @@ routed by r3 router search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config @@ -233,6 +235,7 @@ created log directory TESTSUITE/spool/log search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-000000005vi-0000 Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1236 configuration file is TESTSUITE/test-config @@ -509,6 +512,7 @@ search_tidyup called search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1238 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0277 b/test/stderr/0277 index cde3dcd1a..b92d4d832 100644 --- a/test/stderr/0277 +++ b/test/stderr/0277 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config @@ -51,6 +52,7 @@ LOG: smtp_connection MAIN search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config @@ -110,6 +112,7 @@ LOG: smtp_connection MAIN search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1236 configuration file is TESTSUITE/test-config @@ -180,6 +183,7 @@ LOG: smtp_connection MAIN search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1237 configuration file is TESTSUITE/test-config @@ -250,6 +254,7 @@ LOG: smtp_connection MAIN search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1238 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0278 b/test/stderr/0278 index 0f8466a00..6aac99c7d 100644 --- a/test/stderr/0278 +++ b/test/stderr/0278 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config @@ -90,6 +91,7 @@ routed by r3 router search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config @@ -138,6 +140,7 @@ created log directory TESTSUITE/spool/log search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-000000005vi-0000 Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1236 configuration file is TESTSUITE/test-config @@ -309,6 +312,7 @@ search_tidyup called search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1238 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0279 b/test/stderr/0279 index f716ff205..bbd876568 100644 --- a/test/stderr/0279 +++ b/test/stderr/0279 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 seeking password data for user "CALLER": cache not available @@ -108,6 +109,7 @@ routed by r3 router search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1235 seeking password data for user "CALLER": cache not available diff --git a/test/stderr/0283 b/test/stderr/0283 index a17ec26ef..aedfab70f 100644 --- a/test/stderr/0283 +++ b/test/stderr/0283 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 seeking password data for user "root": cache not available @@ -15,6 +16,7 @@ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1235 seeking password data for user "root": cache not available @@ -37,6 +39,7 @@ LOG: MAIN changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1235 Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1237 seeking password data for user "root": cache not available @@ -53,6 +56,7 @@ getpwnam() succeeded uid=uuuu gid=gggg LOG: MAIN <= <> R=10HmaY-000000005vi-0000 U=EXIMUSER P=local S=sss Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1238 seeking password data for user "root": cache not available @@ -81,6 +85,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1240 seeking password data for user "root": cache not available @@ -96,6 +101,7 @@ getpwnam() succeeded uid=uuuu gid=gggg LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1241 seeking password data for user "root": cache not available diff --git a/test/stderr/0294 b/test/stderr/0294 index 3ef48e0db..fb876330c 100644 --- a/test/stderr/0294 +++ b/test/stderr/0294 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -102,6 +103,7 @@ LOG: smtp_connection MAIN SMTP connection from CALLER D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -161,6 +163,7 @@ LOG: smtp_connection MAIN SMTP connection from (test) [1.2.3.4] D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -221,6 +224,7 @@ LOG: smtp_connection MAIN SMTP connection from (test) [V4NET.9.8.7] D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/0297 b/test/stderr/0297 index b902d1b1f..dc7e0c020 100644 --- a/test/stderr/0297 +++ b/test/stderr/0297 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -23,6 +24,7 @@ routed by r1 router transport: >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/0303 b/test/stderr/0303 index 8e735c327..72553dcd8 100644 --- a/test/stderr/0303 +++ b/test/stderr/0303 @@ -58,6 +58,7 @@ >>> list element: @[] >>> rhubarb.custard in helo_lookup_domains? no (end of list) Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 seeking password data for user "CALLER": cache not available @@ -145,6 +146,7 @@ LOG: smtp_connection MAIN search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1235 seeking password data for user "CALLER": cache not available diff --git a/test/stderr/0315 b/test/stderr/0315 index 052ccaa66..4105ca321 100644 --- a/test/stderr/0315 +++ b/test/stderr/0315 @@ -1,10 +1,12 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: MAIN <= CALLER@the.local.host.name U=CALLER P=local S=sss created log directory TESTSUITE/spool/log Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -59,11 +61,13 @@ LOG: MAIN >>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: MAIN <= CALLER@the.local.host.name U=CALLER P=local S=sss Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/0317 b/test/stderr/0317 index b736cd160..c3e17cacc 100644 --- a/test/stderr/0317 +++ b/test/stderr/0317 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -34,6 +35,7 @@ LOG: MAIN created log directory TESTSUITE/spool/log >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME diff --git a/test/stderr/0332 b/test/stderr/0332 index 8cff3bd21..0ffdc81c1 100644 --- a/test/stderr/0332 +++ b/test/stderr/0332 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -41,6 +42,7 @@ LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=p1235 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/0333 b/test/stderr/0333 index 0ddd349a3..d886f53ee 100644 --- a/test/stderr/0333 +++ b/test/stderr/0333 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -39,6 +40,7 @@ LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/0357 b/test/stderr/0357 index 0e16a6e37..8d4a2b459 100644 --- a/test/stderr/0357 +++ b/test/stderr/0357 @@ -1,10 +1,12 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -46,6 +48,7 @@ end of retry processing >>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -104,6 +107,7 @@ LOG: queue_run MAIN End queue run: pid=p1234 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -162,6 +166,7 @@ LOG: queue_run MAIN End queue run: pid=p1235 >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid diff --git a/test/stderr/0358 b/test/stderr/0358 index 8dbb1f66f..0f27af75d 100644 --- a/test/stderr/0358 +++ b/test/stderr/0358 @@ -1,10 +1,12 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -62,6 +64,7 @@ end of retry processing >>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid diff --git a/test/stderr/0360 b/test/stderr/0360 index c3e9a33b8..705be3484 100644 --- a/test/stderr/0360 +++ b/test/stderr/0360 @@ -1,10 +1,12 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -153,6 +155,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid diff --git a/test/stderr/0361 b/test/stderr/0361 index 40e9d5c8e..e68c3c7e5 100644 --- a/test/stderr/0361 +++ b/test/stderr/0361 @@ -6,6 +6,7 @@ LOG: MAIN LOG: MAIN Completed Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config @@ -53,6 +54,7 @@ LOG: MAIN search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -N -odi -Mc 10HmaY-000000005vi-0000 Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1235 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0362 b/test/stderr/0362 index 0a5dca36c..84d28eb82 100644 --- a/test/stderr/0362 +++ b/test/stderr/0362 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0364 b/test/stderr/0364 index da45f5edc..4a3328516 100644 --- a/test/stderr/0364 +++ b/test/stderr/0364 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid diff --git a/test/stderr/0368 b/test/stderr/0368 index 585510ef2..e67722e26 100644 --- a/test/stderr/0368 +++ b/test/stderr/0368 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid diff --git a/test/stderr/0370 b/test/stderr/0370 index c2de395fa..765c4d9a4 100644 --- a/test/stderr/0370 +++ b/test/stderr/0370 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config @@ -9,6 +10,7 @@ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1235 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0371 b/test/stderr/0371 index c1f96114f..6795f8dac 100644 --- a/test/stderr/0371 +++ b/test/stderr/0371 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0374 b/test/stderr/0374 index cc77313d0..6c6ffdb15 100644 --- a/test/stderr/0374 +++ b/test/stderr/0374 @@ -1,10 +1,12 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -399,12 +401,14 @@ LOG: MAIN ** d3@myhost.test.ex R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 550 hard error locking TESTSUITE/spool/db/retry.lockfile Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user LOG: MAIN <= <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/0375 b/test/stderr/0375 index c118cb04d..f8e3b9cf5 100644 --- a/test/stderr/0375 +++ b/test/stderr/0375 @@ -1,10 +1,12 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -921,12 +923,14 @@ LOG: MAIN f3@myhost.test.ex : error ignored log writing disabled Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user LOG: MAIN <= <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -1014,11 +1018,13 @@ log writing disabled >>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/0376 b/test/stderr/0376 index e781a5b0f..9ef0c67a3 100644 --- a/test/stderr/0376 +++ b/test/stderr/0376 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -41,6 +42,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -67,6 +69,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -92,6 +95,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -130,6 +134,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -152,6 +157,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -187,6 +193,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1239 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -208,6 +215,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1240 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -254,6 +262,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1241 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -276,6 +285,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1242 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -325,6 +335,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1243 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -352,6 +363,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1244 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -395,6 +407,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1245 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -422,6 +435,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1246 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -465,6 +479,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1247 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -492,6 +507,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1248 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -547,6 +563,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1249 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -575,6 +592,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1250 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -624,6 +642,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1251 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -667,6 +686,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1252 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -715,6 +735,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1253 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -758,6 +779,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1254 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -806,6 +828,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1255 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -846,6 +869,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1256 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -895,6 +919,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1257 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -942,6 +967,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1258 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -987,6 +1013,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1259 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -1038,6 +1065,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1260 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/0377 b/test/stderr/0377 index 6f85db524..560192970 100644 --- a/test/stderr/0377 +++ b/test/stderr/0377 @@ -1,10 +1,12 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -328,6 +330,7 @@ locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -592,6 +595,7 @@ LOG: queue_run MAIN End queue run: pid=p1234 -qf >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid diff --git a/test/stderr/0378 b/test/stderr/0378 index 3ee15ba8f..befab983d 100644 --- a/test/stderr/0378 +++ b/test/stderr/0378 @@ -1,10 +1,12 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -121,11 +123,13 @@ After routing: defer_aaaa@myhost.test.ex locking TESTSUITE/spool/db/retry.lockfile Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: MAIN <= <> R=10HmaX-000000005vi-0000 U=CALLER P=local S=sss Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -173,6 +177,7 @@ locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid diff --git a/test/stderr/0379 b/test/stderr/0379 index 0cd2aa433..46275ea5d 100644 --- a/test/stderr/0379 +++ b/test/stderr/0379 @@ -1,10 +1,12 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -140,6 +142,7 @@ locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid diff --git a/test/stderr/0380 b/test/stderr/0380 index 93397d546..efbad7565 100644 --- a/test/stderr/0380 +++ b/test/stderr/0380 @@ -1,10 +1,12 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/0381 b/test/stderr/0381 index 2c240677b..d35fb6261 100644 --- a/test/stderr/0381 +++ b/test/stderr/0381 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 seeking password data for user "CALLER": cache not available diff --git a/test/stderr/0382 b/test/stderr/0382 index eb418cfea..6da513f1f 100644 --- a/test/stderr/0382 +++ b/test/stderr/0382 @@ -1,10 +1,12 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -18,12 +20,14 @@ CALLER@test.ex in senders? yes (end of list) LOG: MAIN ** userx@test.ex R=r1: forced fail Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user LOG: MAIN <= <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -43,6 +47,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid diff --git a/test/stderr/0386 b/test/stderr/0386 index 52f542fa5..e2721b8c4 100644 --- a/test/stderr/0386 +++ b/test/stderr/0386 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 seeking password data for user "CALLER": cache not available @@ -167,6 +168,7 @@ LOG: smtp_connection MAIN search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1235 seeking password data for user "CALLER": cache not available @@ -282,6 +284,7 @@ SMTP>> 250 OK id=10HmaX-000000005vi-0000 search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-000000005vi-0000 Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1236 seeking password data for user "CALLER": cache not available @@ -479,6 +482,7 @@ SMTP>> 250 OK id=10HmaY-000000005vi-0000 search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaY-000000005vi-0000 Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1238 seeking password data for user "CALLER": cache not available diff --git a/test/stderr/0387 b/test/stderr/0387 index 2b78fcea4..901d53d55 100644 --- a/test/stderr/0387 +++ b/test/stderr/0387 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/0388 b/test/stderr/0388 index 3422fe1ea..a84d5b163 100644 --- a/test/stderr/0388 +++ b/test/stderr/0388 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config @@ -167,11 +168,12 @@ Deferred addresses: x@y in "*"? yes (matched "*") retry for R:x@y = * 0 0 dbfn_read: key=R:x@y + dbfn_read: null return 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 datalen NNN *@V4NET.0.0.0 in "*"? list element: * address match test: subject=*@V4NET.0.0.0 pattern=* @@ -181,12 +183,13 @@ Writing retry data for R:x@y *@V4NET.0.0.0 in "*"? yes (matched "*") retry for T:[V4NET.0.0.0]:V4NET.0.0.0:PORT_S (y) = * 0 0 dbfn_read: key=T:[V4NET.0.0.0]:V4NET.0.0.0:PORT_S + dbfn_read: null return 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:PORT_S 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:PORT_S + dbfn_write: key=T:[V4NET.0.0.0]:V4NET.0.0.0:PORT_S datalen NNN timed out: all retries expired LOG: MAIN ** x@y: retry timeout exceeded @@ -195,6 +198,7 @@ LOG: MAIN end of retry processing exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -MCd bounce-message -odi -odi -t -oem -oi -f <> -E10HmaX-000000005vi-0000 Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1236 configuration file is TESTSUITE/test-config @@ -254,6 +258,7 @@ LOG: MAIN search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -MCd local-accept-delivery -odi -Mc 10HmaY-000000005vi-0000 Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1237 configuration file is TESTSUITE/test-config @@ -271,8 +276,11 @@ set_process_info: pppp delivering 10HmaY-000000005vi-0000 Considering: CALLER@myhost.test.ex unique = CALLER@myhost.test.ex dbfn_read: key=R:myhost.test.ex + dbfn_read: null return dbfn_read: key=R:CALLER@myhost.test.ex + dbfn_read: null return dbfn_read: key=R:CALLER@myhost.test.ex:<> + dbfn_read: null return no domain retry record no address retry record CALLER@myhost.test.ex: queued for routing diff --git a/test/stderr/0391 b/test/stderr/0391 index b7873266f..884ffd32a 100644 --- a/test/stderr/0391 +++ b/test/stderr/0391 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0393 b/test/stderr/0393 index 0a279503d..dfd8a44da 100644 --- a/test/stderr/0393 +++ b/test/stderr/0393 @@ -1,10 +1,12 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -49,11 +51,13 @@ LOG: MAIN >>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -88,11 +92,13 @@ LOG: MAIN >>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/0396 b/test/stderr/0396 index 75b64878a..e2f6cf70b 100644 --- a/test/stderr/0396 +++ b/test/stderr/0396 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0398 b/test/stderr/0398 index 9fcec221e..00ce934bd 100644 --- a/test/stderr/0398 +++ b/test/stderr/0398 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config @@ -144,8 +145,10 @@ Attempting full verification using callout returned from EXIM_DBOPEN: 0xAAAAAAAA opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR dbfn_read: key=remote + dbfn_read: size 40 return callout cache: found domain record for remote dbfn_read: key=qq@remote + dbfn_read: null return callout cache: no address record found for qq@remote EXIM_DBCLOSE(0xAAAAAAAA) closed hints database and lockfile @@ -179,10 +182,10 @@ cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:QUIT:250' 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 + dbfn_write: key=remote datalen NNN wrote callout cache domain record for remote: result=1 postmaster=0 random=0 - dbfn_write: key=qq@remote + dbfn_write: key=qq@remote datalen NNN wrote negative callout cache address record for qq@remote EXIM_DBCLOSE(0xAAAAAAAA) closed hints database and lockfile @@ -279,8 +282,10 @@ Attempting full verification using callout returned from EXIM_DBOPEN: 0xAAAAAAAA opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR dbfn_read: key=remote + dbfn_read: size 40 return callout cache: found domain record for remote dbfn_read: key=qq@remote + dbfn_read: size 16 return callout cache: found address record for qq@remote callout cache: address record is negative EXIM_DBCLOSE(0xAAAAAAAA) diff --git a/test/stderr/0399 b/test/stderr/0399 index a3b583e11..cbcfb336b 100644 --- a/test/stderr/0399 +++ b/test/stderr/0399 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0402 b/test/stderr/0402 index cec473fb0..29b3eae63 100644 --- a/test/stderr/0402 +++ b/test/stderr/0402 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 environment after trimming: @@ -403,6 +404,7 @@ created log directory TESTSUITE/spool/log search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715dfd -MCd local-accept-delivery -odi -Mc 10HmaX-000000005vi-0000 Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1235 environment after trimming: diff --git a/test/stderr/0403 b/test/stderr/0403 index de5ffabc7..0f9775285 100644 --- a/test/stderr/0403 +++ b/test/stderr/0403 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config @@ -47,6 +48,7 @@ created log directory TESTSUITE/spool/log search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -N -odi -Mc 10HmaX-000000005vi-0000 Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1235 configuration file is TESTSUITE/test-config @@ -241,6 +243,7 @@ search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> ### _data from a multi-step expansion Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1237 configuration file is TESTSUITE/test-config @@ -288,6 +291,7 @@ LOG: MAIN search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -N -odi -Mc 10HmaY-000000005vi-0000 Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1238 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0404 b/test/stderr/0404 index 257cd0c1d..25b74291c 100644 --- a/test/stderr/0404 +++ b/test/stderr/0404 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config @@ -146,6 +147,7 @@ created log directory TESTSUITE/spool/log search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-000000005vi-0000 Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1235 configuration file is TESTSUITE/test-config @@ -252,6 +254,7 @@ t1 transport entered taking data from address exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd autoreply -odi -odi -t -oem -oi -f <> -E10HmaX-000000005vi-0000 Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1238 configuration file is TESTSUITE/test-config @@ -917,6 +920,7 @@ LOG: MAIN search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaY-000000005vi-0000 Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1239 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0408 b/test/stderr/0408 index 34992e8ee..c43b02a03 100644 --- a/test/stderr/0408 +++ b/test/stderr/0408 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config @@ -47,6 +48,7 @@ created log directory TESTSUITE/spool/log search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-000000005vi-0000 Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1235 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0414 b/test/stderr/0414 index 14244f60c..05abad438 100644 --- a/test/stderr/0414 +++ b/test/stderr/0414 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0419 b/test/stderr/0419 index d21a45473..28f6784a2 100644 --- a/test/stderr/0419 +++ b/test/stderr/0419 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0426 b/test/stderr/0426 index acb3e9409..f72ecc2ce 100644 --- a/test/stderr/0426 +++ b/test/stderr/0426 @@ -1,10 +1,12 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -58,12 +60,14 @@ cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:QUIT+:250' LOG: MAIN ** x@uppercase.test.ex R=r1 T=t1 H=uppercase.test.ex [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 550 Unknown Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user LOG: MAIN <= <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/0432 b/test/stderr/0432 index a4f3433d7..debaae3db 100644 --- a/test/stderr/0432 +++ b/test/stderr/0432 @@ -28,6 +28,7 @@ MUNGED: ::1 will be omitted in what follows >>> accept: condition test succeeded in ACL "mail" >>> end of ACL "mail": ACCEPT Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config @@ -97,8 +98,10 @@ Attempting full verification using callout returned from EXIM_DBOPEN: 0xAAAAAAAA opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR dbfn_read: key=y + dbfn_read: null return callout cache: no domain record found for y dbfn_read: key=x@y + dbfn_read: null return callout cache: no address record found for x@y EXIM_DBCLOSE(0xAAAAAAAA) closed hints database and lockfile @@ -132,10 +135,10 @@ cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:QUIT:220' 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 + dbfn_write: key=y datalen 40 wrote callout cache domain record for y: result=1 postmaster=0 random=0 - dbfn_write: key=x@y + dbfn_write: key=x@y datalen 16 wrote positive callout cache address record for x@y EXIM_DBCLOSE(0xAAAAAAAA) closed hints database and lockfile @@ -151,6 +154,7 @@ LOG: smtp_connection MAIN search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config @@ -220,8 +224,10 @@ Attempting full verification using callout returned from EXIM_DBOPEN: 0xAAAAAAAA opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR dbfn_read: key=y + dbfn_read: size 40 return callout cache: found domain record for y dbfn_read: key=x@y + dbfn_read: size 16 return callout cache: found address record for x@y callout cache: address record is positive EXIM_DBCLOSE(0xAAAAAAAA) diff --git a/test/stderr/0433 b/test/stderr/0433 index 40eef044c..eff327b62 100644 --- a/test/stderr/0433 +++ b/test/stderr/0433 @@ -1,6 +1,7 @@ ******** SERVER ******** Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config @@ -23,6 +24,7 @@ p1240 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=se search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config @@ -46,6 +48,7 @@ p1241 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=se search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1235 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1236 configuration file is TESTSUITE/test-config @@ -70,6 +73,7 @@ p1242 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=se search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1236 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1237 configuration file is TESTSUITE/test-config @@ -94,6 +98,7 @@ p1243 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=se search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1237 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1238 configuration file is TESTSUITE/test-config @@ -119,6 +124,7 @@ p1244 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=se search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1238 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1239 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0435 b/test/stderr/0435 index 77e147981..2ae20bf65 100644 --- a/test/stderr/0435 +++ b/test/stderr/0435 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0437 b/test/stderr/0437 index a8142da54..debc4f72a 100644 --- a/test/stderr/0437 +++ b/test/stderr/0437 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: search_open: lsearch "TESTSUITE/aux-fixed/0437.ls" search_find: file="TESTSUITE/aux-fixed/0437.ls" key="spool" partial=-1 affix=NULL starflags=0 opts=NULL diff --git a/test/stderr/0438 b/test/stderr/0438 index 58f8d8262..b63c3c556 100644 --- a/test/stderr/0438 +++ b/test/stderr/0438 @@ -1,6 +1,7 @@ ******** SERVER ******** Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config @@ -25,6 +26,7 @@ p1237 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=se search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config @@ -49,6 +51,7 @@ p1238 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=se search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1235 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1236 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0450 b/test/stderr/0450 index 979b30d45..28dd13c54 100644 --- a/test/stderr/0450 +++ b/test/stderr/0450 @@ -1,10 +1,12 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -32,6 +34,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid diff --git a/test/stderr/0462 b/test/stderr/0462 index f1f6d8fd3..1f0f29e01 100644 --- a/test/stderr/0462 +++ b/test/stderr/0462 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -53,6 +54,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -91,6 +93,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/0463 b/test/stderr/0463 index e12674204..391589473 100644 --- a/test/stderr/0463 +++ b/test/stderr/0463 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0464 b/test/stderr/0464 index 672b36ba5..aa91bff38 100644 --- a/test/stderr/0464 +++ b/test/stderr/0464 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0465 b/test/stderr/0465 index 5bcd5a1ce..3b0d8418d 100644 --- a/test/stderr/0465 +++ b/test/stderr/0465 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 seeking password data for user "CALLER": cache not available @@ -34,6 +35,7 @@ search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> exim: bad -f address "abc@somewhere.": domain is malformed (trailing dot not allowed) Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1235 seeking password data for user "CALLER": cache not available @@ -108,6 +110,7 @@ LOG: smtp_connection MAIN search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1236 seeking password data for user "CALLER": cache not available diff --git a/test/stderr/0469 b/test/stderr/0469 index 0fcb7f8c2..f58711b97 100644 --- a/test/stderr/0469 +++ b/test/stderr/0469 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0471 b/test/stderr/0471 index a0950c7a3..a83a4921f 100644 --- a/test/stderr/0471 +++ b/test/stderr/0471 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config @@ -26886,6 +26887,7 @@ created log directory TESTSUITE/spool/log search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config @@ -27082,6 +27084,7 @@ LOG: MAIN search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1236 configuration file is TESTSUITE/test-config @@ -27278,6 +27281,7 @@ LOG: MAIN search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1237 configuration file is TESTSUITE/test-config @@ -27446,6 +27450,7 @@ LOG: MAIN search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1238 configuration file is TESTSUITE/test-config @@ -27609,6 +27614,7 @@ LOG: MAIN search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1239 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0473 b/test/stderr/0473 index e3e8f01ef..3639713ec 100644 --- a/test/stderr/0473 +++ b/test/stderr/0473 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -33,6 +34,7 @@ LOG: smtp_connection MAIN SMTP connection from CALLER D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/0476 b/test/stderr/0476 index 61227a388..1f265b0a7 100644 --- a/test/stderr/0476 +++ b/test/stderr/0476 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -60,6 +61,7 @@ LOG: MAIN ** userx@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 550 NO set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000 Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -69,6 +71,7 @@ writing data block fd=dddd size=sss timeout=0 LOG: MAIN <= <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/0479 b/test/stderr/0479 index 64ff0acc0..dbcd3b5bd 100644 --- a/test/stderr/0479 +++ b/test/stderr/0479 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0483 b/test/stderr/0483 index a40b66a66..ff2b49beb 100644 --- a/test/stderr/0483 +++ b/test/stderr/0483 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: smtp_connection MAIN diff --git a/test/stderr/0484 b/test/stderr/0484 index 22ea6ae65..5855e2c6f 100644 --- a/test/stderr/0484 +++ b/test/stderr/0484 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: -C, -D, -be or -bf forces real uid uid=CALLER_UID gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0487 b/test/stderr/0487 index d8b9bc1d9..696d5a72d 100644 --- a/test/stderr/0487 +++ b/test/stderr/0487 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 seeking password data for user "CALLER": cache not available @@ -79,6 +80,7 @@ SMTP>> 250 OK id=10HmaX-000000005vi-0000 search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-000000005vi-0000 Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1235 seeking password data for user "CALLER": cache not available diff --git a/test/stderr/0489 b/test/stderr/0489 index 1c20a8b4b..80e21ae5d 100644 --- a/test/stderr/0489 +++ b/test/stderr/0489 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -32,6 +33,7 @@ LOG: MAIN created log directory TESTSUITE/spool/log >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -64,6 +66,7 @@ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -96,6 +99,7 @@ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -128,6 +132,7 @@ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -160,6 +165,7 @@ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss >>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -192,6 +198,7 @@ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss >>>>>>>>>>>>>>>> Exim pid=p1239 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -224,6 +231,7 @@ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss >>>>>>>>>>>>>>>> Exim pid=p1240 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/0499 b/test/stderr/0499 index 236d952fd..ebc043e8e 100644 --- a/test/stderr/0499 +++ b/test/stderr/0499 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0512 b/test/stderr/0512 index 98f21d1bd..e7c7f8f9f 100644 --- a/test/stderr/0512 +++ b/test/stderr/0512 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -71,6 +72,7 @@ LOG: MAIN LOG: MAIN ** userx@myhost.test.ex: retry timeout exceeded Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -79,6 +81,7 @@ writing data block fd=dddd size=sss timeout=0 LOG: MAIN <= <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -96,6 +99,7 @@ LOG: queue_run MAIN End queue run: pid=p1234 -qf >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -144,6 +148,7 @@ LOG: MAIN LOG: MAIN ** userx@myhost.test.ex: retry timeout exceeded Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -152,6 +157,7 @@ writing data block fd=dddd size=sss timeout=0 LOG: MAIN <= <> R=10HmaZ-000000005vi-0000 U=EXIMUSER P=local S=sss Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/0514 b/test/stderr/0514 index 31658bec3..d6c49aa20 100644 --- a/test/stderr/0514 +++ b/test/stderr/0514 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0529 b/test/stderr/0529 index 536804c4d..c4a292a48 100644 --- a/test/stderr/0529 +++ b/test/stderr/0529 @@ -1,10 +1,12 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -48,6 +50,7 @@ end of retry processing >>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid diff --git a/test/stderr/0543 b/test/stderr/0543 index 5df9df63b..997abd329 100644 --- a/test/stderr/0543 +++ b/test/stderr/0543 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid diff --git a/test/stderr/0544 b/test/stderr/0544 index f2e80499d..9540e834a 100644 --- a/test/stderr/0544 +++ b/test/stderr/0544 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: environment after trimming: PATH= adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys @@ -350,6 +351,7 @@ LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log Exim version x.yz .... +Hints DB: environment after trimming: PATH= adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys @@ -434,6 +436,7 @@ try option delay_warning_condition >>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: environment after trimming: PATH= adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys diff --git a/test/stderr/0545 b/test/stderr/0545 index 25f935ced..0f7a71a32 100644 --- a/test/stderr/0545 +++ b/test/stderr/0545 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config @@ -86,6 +87,7 @@ routed by dns router search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0554 b/test/stderr/0554 index 4e6690afb..1536315ab 100644 --- a/test/stderr/0554 +++ b/test/stderr/0554 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -38,6 +39,7 @@ Writing retry data for R:x@y: end of retry processing >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid diff --git a/test/stderr/0563 b/test/stderr/0563 index 09cc0d0df..8ce12a2e5 100644 --- a/test/stderr/0563 +++ b/test/stderr/0563 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0575 b/test/stderr/0575 index c1bc66ab6..ad89f09be 100644 --- a/test/stderr/0575 +++ b/test/stderr/0575 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config diff --git a/test/stderr/0578 b/test/stderr/0578 index 6e746438a..67739d428 100644 --- a/test/stderr/0578 +++ b/test/stderr/0578 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -43,6 +44,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -69,6 +71,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -94,6 +97,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -134,6 +138,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -156,6 +161,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -195,6 +201,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1239 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -216,6 +223,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1240 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -264,6 +272,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1241 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -286,6 +295,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1242 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -337,6 +347,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1243 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -364,6 +375,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1244 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -409,6 +421,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1245 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -436,6 +449,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1246 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -481,6 +495,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1247 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -508,6 +523,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1248 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -565,6 +581,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1249 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -593,6 +610,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1250 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -644,6 +662,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1251 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -689,6 +708,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1252 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -739,6 +759,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1253 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -784,6 +805,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1254 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -834,6 +856,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1255 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -876,6 +899,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1256 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -927,6 +951,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1257 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -976,6 +1001,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1258 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -1023,6 +1049,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1259 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -1076,6 +1103,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1260 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/0609 b/test/stderr/0609 index 350764c32..6a801a299 100644 --- a/test/stderr/0609 +++ b/test/stderr/0609 @@ -1,6 +1,7 @@ ******** SERVER ******** Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid diff --git a/test/stderr/0620 b/test/stderr/0620 index 8b59ca9a6..147ad3067 100644 --- a/test/stderr/0620 +++ b/test/stderr/0620 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: environment after trimming: PATH= adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys @@ -73,6 +74,7 @@ LOG: smtp_connection MAIN SMTP connection from CALLER D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: environment after trimming: PATH= adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys diff --git a/test/stderr/0623 b/test/stderr/0623 index 44152a48e..a1d5f070e 100644 --- a/test/stderr/0623 +++ b/test/stderr/0623 @@ -1,9 +1,11 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -64,11 +66,13 @@ LOG: MAIN >>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -131,11 +135,13 @@ LOG: MAIN >>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/0628 b/test/stderr/0628 index 5424c5664..802d98a71 100644 --- a/test/stderr/0628 +++ b/test/stderr/0628 @@ -25,6 +25,7 @@ 01:01:01 p1237 LOG: smtp_connection MAIN 01:01:01 p1237 SMTP connection from (test.ex) [127.0.0.1] D=qqs closed by QUIT 01:01:01 p1239 Exim version x.yz uid=EXIM_UID gid=EXIM_GID pid=p1239 D=fff9ffff +01:01:01 p1239 Hints DB: 01:01:01 p1239 macros_trusted overridden to true by whitelisting 01:01:01 p1239 changed uid/gid: forcing real = effective 01:01:01 p1239 uid=uuuu gid=EXIM_GID pid=p1239 diff --git a/test/stderr/0632 b/test/stderr/0632 index 50cfd4880..d7fac294a 100644 --- a/test/stderr/0632 +++ b/test/stderr/0632 @@ -1,6 +1,7 @@ ******** SERVER ******** Exim version x.yz .... +Hints DB: environment after trimming: PATH= adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys diff --git a/test/stderr/0909 b/test/stderr/0909 index 3093c24ef..9a9b6a901 100644 --- a/test/stderr/0909 +++ b/test/stderr/0909 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -8,6 +9,7 @@ created log directory TESTSUITE/spool/log LOG: MAIN <= fred@myhost.test.ex U=root P=local-smtp S=sss Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -67,6 +69,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=q.qqqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -75,6 +78,7 @@ LOG: smtp_connection MAIN LOG: MAIN <= fred@myhost.test.ex U=root P=local-smtp S=sss Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -133,6 +137,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=q.qqqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -141,6 +146,7 @@ LOG: smtp_connection MAIN LOG: MAIN <= fred@myhost.test.ex U=root P=local-smtp S=sss Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -202,6 +208,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=q.qqqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -210,6 +217,7 @@ LOG: smtp_connection MAIN LOG: MAIN <= fred@myhost.test.ex U=root P=local-smtp S=sss Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -273,6 +281,7 @@ LOG: smtp_connection MAIN SMTP connection from root D=q.qqqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1240 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -281,6 +290,7 @@ LOG: smtp_connection MAIN LOG: MAIN <= fred@myhost.test.ex U=root P=local-smtp S=sss Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/1006 b/test/stderr/1006 index de73350f1..ef5f0b89f 100644 --- a/test/stderr/1006 +++ b/test/stderr/1006 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -24,6 +25,7 @@ DNS lookup of 46.test.ex (A) succeeded writing neg-cache entry for v6.test.ex-A-xxxx, ttl 3000 >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid diff --git a/test/stderr/1007 b/test/stderr/1007 index ca46d25e6..aa1a3f048 100644 --- a/test/stderr/1007 +++ b/test/stderr/1007 @@ -1,6 +1,7 @@ ******** SERVER ******** Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config @@ -24,6 +25,7 @@ p1242 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=se search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config @@ -49,6 +51,7 @@ p1243 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=se search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1235 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1236 configuration file is TESTSUITE/test-config @@ -75,6 +78,7 @@ p1244 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=se search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1236 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1237 configuration file is TESTSUITE/test-config @@ -101,6 +105,7 @@ p1245 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=se search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1237 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1238 configuration file is TESTSUITE/test-config @@ -124,6 +129,7 @@ p1246 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=se search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1238 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1239 configuration file is TESTSUITE/test-config @@ -150,6 +156,7 @@ p1247 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=se search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1239 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1240 configuration file is TESTSUITE/test-config @@ -177,6 +184,7 @@ p1248 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=se search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1240 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1241 configuration file is TESTSUITE/test-config diff --git a/test/stderr/1157 b/test/stderr/1157 index 7a9ebd556..27b80fa00 100644 --- a/test/stderr/1157 +++ b/test/stderr/1157 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -47,6 +48,7 @@ LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=p1245 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -68,6 +70,7 @@ LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=p1246 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -98,6 +101,7 @@ LOG: queue_run MAIN End queue run: pid=p1234 -qqf >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -146,6 +150,7 @@ LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=p1252 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -167,6 +172,7 @@ LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=p1253 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -197,6 +203,7 @@ LOG: queue_run MAIN End queue run: pid=p1235 -qqf >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -255,6 +262,7 @@ LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=p1259 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -297,6 +305,7 @@ LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=p1260 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/2035 b/test/stderr/2035 index 98817e639..9192cd128 100644 --- a/test/stderr/2035 +++ b/test/stderr/2035 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: smtp_connection MAIN @@ -42,6 +43,7 @@ LOG: smtp_connection MAIN SMTP connection from CALLER D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/2135 b/test/stderr/2135 index 98817e639..9192cd128 100644 --- a/test/stderr/2135 +++ b/test/stderr/2135 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: smtp_connection MAIN @@ -42,6 +43,7 @@ LOG: smtp_connection MAIN SMTP connection from CALLER D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/2200 b/test/stderr/2200 index 7f1722497..70972b0c0 100644 --- a/test/stderr/2200 +++ b/test/stderr/2200 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -24,6 +25,7 @@ dropping to exim gid; retaining priv uid search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user search_tidyup called diff --git a/test/stderr/2201 b/test/stderr/2201 index 0cee0c364..eb37f80cb 100644 --- a/test/stderr/2201 +++ b/test/stderr/2201 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1236 seeking password data for user "CALLER": cache not available @@ -167,6 +168,7 @@ routed by r2 router search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -212,6 +214,7 @@ search_tidyup called ******** SERVER ******** Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/2202 b/test/stderr/2202 index 55f935040..f9c7704ca 100644 --- a/test/stderr/2202 +++ b/test/stderr/2202 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config @@ -109,6 +110,7 @@ LOG: smtp_connection MAIN search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config diff --git a/test/stderr/2600 b/test/stderr/2600 index ae1208ca6..4c814c3a1 100644 --- a/test/stderr/2600 +++ b/test/stderr/2600 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -136,6 +137,7 @@ dropping to exim gid; retaining priv uid search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config @@ -264,6 +266,7 @@ LOG: smtp_connection MAIN search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1236 configuration file is TESTSUITE/test-config @@ -392,6 +395,7 @@ LOG: smtp_connection MAIN search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1237 configuration file is TESTSUITE/test-config @@ -509,6 +513,7 @@ LOG: smtp_connection MAIN search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1238 configuration file is TESTSUITE/test-config @@ -557,6 +562,7 @@ created log directory TESTSUITE/spool/log search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DOPT=y -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-000000005vi-0000 Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1239 configuration file is TESTSUITE/test-config @@ -700,6 +706,7 @@ search_tidyup called search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -716,6 +723,7 @@ dropping to exim gid; retaining priv uid search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1241 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -732,6 +740,7 @@ dropping to exim gid; retaining priv uid search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1242 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -740,6 +749,7 @@ dropping to exim gid; retaining priv uid search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1243 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid diff --git a/test/stderr/2610 b/test/stderr/2610 index c76b30338..e35a8f5a4 100644 --- a/test/stderr/2610 +++ b/test/stderr/2610 @@ -2,6 +2,7 @@ ### wait for db startup, set password on the root user ### create testdb and extra users Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -244,6 +245,7 @@ close MYSQL connection: ip4.ip4.ip4.ip4:1223/test/root close MYSQL connection: 127.0.0.1:PORT_N/test/root >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> 01:01:01 p1235 Exim version x.yz uid=CALLER_UID gid=CALLER_GID pid=p1235 D=fff9ffff +01:01:01 p1235 Hints DB: 01:01:01 p1235 macros_trusted overridden to true by whitelisting 01:01:01 p1235 changed uid/gid: forcing real = effective 01:01:01 p1235 uid=uuuu gid=CALLER_GID pid=p1235 @@ -727,6 +729,7 @@ close MYSQL connection: 127.0.0.1:PORT_N/test/root 01:01:01 p1235 close MYSQL connection: 127.0.0.1:PORT_N/test/root 01:01:01 p1235 >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1236 configuration file is TESTSUITE/test-config @@ -781,6 +784,7 @@ created log directory TESTSUITE/spool/log search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-000000005vi-0000 Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1237 configuration file is TESTSUITE/test-config diff --git a/test/stderr/2620 b/test/stderr/2620 index 6f244223d..15ce3eab1 100644 --- a/test/stderr/2620 +++ b/test/stderr/2620 @@ -2,6 +2,7 @@ WARNING: enabling "trust" authentication for local connections initdb: hint: You can change this by editing pg_hba.conf or using the option -A, or --auth-local and --auth-host, the next time you run initdb. Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -226,6 +227,7 @@ close PGSQL connection: (TESTSUITE/pgsql/.s.PGSQL.1223)/test/CALLER close PGSQL connection: localhost:PORT_N/test/CALLER >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1236 configuration file is TESTSUITE/test-config @@ -652,6 +654,7 @@ search_tidyup called close PGSQL connection: localhost:PORT_N/test/CALLER >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1237 configuration file is TESTSUITE/test-config @@ -700,6 +703,7 @@ created log directory TESTSUITE/spool/log search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-000000005vi-0000 Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1238 configuration file is TESTSUITE/test-config @@ -847,6 +851,7 @@ search_tidyup called search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid diff --git a/test/stderr/3000 b/test/stderr/3000 index c95336931..b04a15086 100644 --- a/test/stderr/3000 +++ b/test/stderr/3000 @@ -1,5 +1,6 @@ 1999-03-02 09:44:33 this is a warning at TESTSUITE/aux-fixed/3000.pl line 25. Exim version x.yz .... +Hints DB: environment after trimming: PATH= adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys diff --git a/test/stderr/3201 b/test/stderr/3201 index 0098e6e4f..70d48576b 100644 --- a/test/stderr/3201 +++ b/test/stderr/3201 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config @@ -44,6 +45,7 @@ LOG: connection_reject MAIN REJECT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1235 configuration file is TESTSUITE/test-config diff --git a/test/stderr/3210 b/test/stderr/3210 index 65bf3955b..1dfb873e8 100644 --- a/test/stderr/3210 +++ b/test/stderr/3210 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config diff --git a/test/stderr/3212 b/test/stderr/3212 index f9f556d30..a7f4de90e 100644 --- a/test/stderr/3212 +++ b/test/stderr/3212 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: -C, -D, -be or -bf forces real uid uid=CALLER_UID gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config diff --git a/test/stderr/3400 b/test/stderr/3400 index 27eebf0a1..915c6e8f1 100644 --- a/test/stderr/3400 +++ b/test/stderr/3400 @@ -680,6 +680,7 @@ LOG: H=(test.host) [10.0.0.3] F= rejected RCPT >> host in chunking_advertise_hosts? >>> host in chunking_advertise_hosts? no (end of list) Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 seeking password data for user "CALLER": cache not available diff --git a/test/stderr/4052 b/test/stderr/4052 index 0cbbd2033..184891086 100644 --- a/test/stderr/4052 +++ b/test/stderr/4052 @@ -1,9 +1,11 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: MAIN <= CALLER@the.local.host.name U=CALLER P=local S=sss Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/4510 b/test/stderr/4510 index 0ce5029a9..d1a32a322 100644 --- a/test/stderr/4510 +++ b/test/stderr/4510 @@ -1,9 +1,11 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/4530 b/test/stderr/4530 index 30d93160e..7d7489c05 100644 --- a/test/stderr/4530 +++ b/test/stderr/4530 @@ -1,9 +1,11 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/4802 b/test/stderr/4802 index 4dc96971b..72a915d0b 100644 --- a/test/stderr/4802 +++ b/test/stderr/4802 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -9,6 +10,7 @@ dropping to exim gid; retaining priv uid DNS lookup of a-aa.test.ex (A/AAAA) requested AD, but got AA >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid diff --git a/test/stderr/4803 b/test/stderr/4803 index ff308e31d..c22fbdc7f 100644 --- a/test/stderr/4803 +++ b/test/stderr/4803 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -11,6 +12,7 @@ dropping to exim gid; retaining priv uid DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *)) >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid diff --git a/test/stderr/5000 b/test/stderr/5000 index 843b20242..5b04c5a79 100644 --- a/test/stderr/5000 +++ b/test/stderr/5000 @@ -1,10 +1,12 @@ 1999-03-02 09:44:33 10HmaX-000000005vi-0000 == userx@myhost.test.ex R=localuser T=maildir_tagged_appendfile defer (-1): Expansion of "${if eq{0}{1}{rhubarb}" (maildir_tag for maildir_tagged_appendfile transport) failed: syntax error in "if" item - "fail" expected Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/5004 b/test/stderr/5004 index dd3ddcf1f..8d716e9ea 100644 --- a/test/stderr/5004 +++ b/test/stderr/5004 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config @@ -49,6 +50,7 @@ created log directory TESTSUITE/spool/log search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-000000005vi-0000 Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1235 configuration file is TESTSUITE/test-config diff --git a/test/stderr/5005 b/test/stderr/5005 index db4429ef0..34cae4c83 100644 --- a/test/stderr/5005 +++ b/test/stderr/5005 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config @@ -47,6 +48,7 @@ created log directory TESTSUITE/spool/log search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-000000005vi-0000 Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1235 configuration file is TESTSUITE/test-config @@ -190,6 +192,7 @@ search_tidyup called search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1237 configuration file is TESTSUITE/test-config @@ -237,6 +240,7 @@ LOG: MAIN search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaY-000000005vi-0000 Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1238 configuration file is TESTSUITE/test-config @@ -382,6 +386,7 @@ search_tidyup called search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1240 configuration file is TESTSUITE/test-config @@ -429,6 +434,7 @@ LOG: MAIN search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaZ-000000005vi-0000 Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1241 configuration file is TESTSUITE/test-config @@ -564,11 +570,12 @@ Deferred addresses: userx@test.ex in "*"? yes (matched "*") retry for T:userx@test.ex = * 0 0 dbfn_read: key=T:userx@test.ex + dbfn_read: null return 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 + dbfn_write: key=T:userx@test.ex datalen NNN EXIM_DBCLOSE(0xAAAAAAAA) closed hints database and lockfile end of retry processing @@ -584,6 +591,7 @@ search_tidyup called search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1240 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1243 configuration file is TESTSUITE/test-config @@ -631,6 +639,7 @@ LOG: MAIN search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmbA-000000005vi-0000 Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1244 configuration file is TESTSUITE/test-config @@ -663,8 +672,11 @@ Delivery address list: Considering: userx@test.ex unique = userx@test.ex dbfn_read: key=R:test.ex + dbfn_read: null return dbfn_read: key=R:userx@test.ex + dbfn_read: null return dbfn_read: key=R:userx@test.ex: + dbfn_read: null return no domain retry record no address retry record userx@test.ex: queued for routing @@ -701,6 +713,7 @@ search_tidyup called returned from EXIM_DBOPEN: 0xAAAAAAAA opened hints database TESTSUITE/spool/db/retry: flags=O_RDONLY dbfn_read: key=T:userx@test.ex + dbfn_read: size 154 return retry record exists: age=ttt (max 1w) time to retry = tttt expired = 0 EXIM_DBCLOSE(0xAAAAAAAA) @@ -761,11 +774,12 @@ Deferred addresses: userx@test.ex in "*"? yes (matched "*") retry for T:userx@test.ex = * 0 0 dbfn_read: key=T:userx@test.ex + dbfn_read: size 154 return 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 + dbfn_write: key=T:userx@test.ex datalen NNN EXIM_DBCLOSE(0xAAAAAAAA) closed hints database and lockfile end of retry processing diff --git a/test/stderr/5006 b/test/stderr/5006 index a1c80c1a9..53a83bcd1 100644 --- a/test/stderr/5006 +++ b/test/stderr/5006 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config @@ -47,6 +48,7 @@ created log directory TESTSUITE/spool/log search_tidyup called exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-000000005vi-0000 Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1235 configuration file is TESTSUITE/test-config diff --git a/test/stderr/5008 b/test/stderr/5008 index a89631236..3afac02c3 100644 --- a/test/stderr/5008 +++ b/test/stderr/5008 @@ -1,10 +1,12 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user @@ -40,11 +42,13 @@ LOG: MAIN >>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/5204 b/test/stderr/5204 index 895c87e7b..d2f548258 100644 --- a/test/stderr/5204 +++ b/test/stderr/5204 @@ -1,6 +1,7 @@ LOG: MAIN remote host address is the local host: some.host (while routing <"ACCEPT hosts=localhost lookup=byname"@some.host>) Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -26,6 +27,7 @@ q router declined for "DECLINE cannot route this one (DECLINE)"@some.host no more routers >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -49,6 +51,7 @@ command wrote: FAIL cannot route this one (FAIL) q router forced address failure >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -75,6 +78,7 @@ q router: defer for "ERROR cannot route this one (ERROR)"@some.host message: bad command yield: ERROR cannot route this one (ERROR) >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -99,6 +103,7 @@ q router: defer for "DEFER cannot route this one (DEFER)"@some.host message: cannot route this one (DEFER) >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -131,6 +136,7 @@ routed by q router host ten-1.test.ex [V4NET.0.0.1] >>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -176,6 +182,7 @@ routed by s router host 127.0.0.1 [127.0.0.1] >>>>>>>>>>>>>>>> Exim pid=p1239 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -200,6 +207,7 @@ q router: defer for "FREEZE cannot route this one (FREEZE)"@some.host message: cannot route this one (FREEZE) >>>>>>>>>>>>>>>> Exim pid=p1240 (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid @@ -261,6 +269,7 @@ routed by pm router transport: null >>>>>>>>>>>>>>>> Exim pid=p1241 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user host in hosts_connection_nolog? no (option unset) diff --git a/test/stderr/5410 b/test/stderr/5410 index dd25241b2..53104d082 100644 --- a/test/stderr/5410 +++ b/test/stderr/5410 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: environment after trimming: PATH= adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys @@ -657,6 +658,7 @@ LOG: smtp_connection MAIN SMTP connection from CALLER D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: environment after trimming: PATH= adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys @@ -1265,6 +1267,7 @@ LOG: smtp_connection MAIN SMTP connection from CALLER D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: environment after trimming: PATH= adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys diff --git a/test/stderr/5420 b/test/stderr/5420 index a09e86994..f815d3883 100644 --- a/test/stderr/5420 +++ b/test/stderr/5420 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: environment after trimming: PATH= adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys @@ -657,6 +658,7 @@ LOG: smtp_connection MAIN SMTP connection from CALLER D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: environment after trimming: PATH= adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys @@ -1265,6 +1267,7 @@ LOG: smtp_connection MAIN SMTP connection from CALLER D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: environment after trimming: PATH= adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys -- 2.30.2