Merge branch '4.next'

diff --cc doc/doc-txt/ChangeLog
index fad93254e839bceb3ac7b03f784a25abc74521b2,2965c7c658053b9e19f480d38d02def30e48424f..fadb4995a6a0616272b4a4a6dae5a0922d48e399
--- 1/doc/doc-txt/ChangeLog
--- 2/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@@ -2,9 -2,26 +2,26 @@@ This document describes *changes* to pr
  affect Exim's operation, with an unchanged configuration file.  For new
  options, and new features, see the NewStuff file next to this ChangeLog.
  
 -Since version 4.98
 -------------------
 +Exim version 4.98
 +-----------------
  
+ JH/01 Use fewer forks & execs for sending many messages to a single host.
+       By passing back more info from the transport to the delivery process,
+       we can loop there.  A two-phase queue run will benefit, particularly for
+       mailinglist and smarthost cases.
+ 
+ JH/02 Add transaction support for hintsdbs. The sole initial provider is
+       sqlite, and is used for the wait-transport and retry DBs. Transactions
+       imply locking internal to the DB. We no longer need a separate lockfile,
+       can keep the DB handle open for extended periods, yet potentially benefit
+       from concurrency on non-conflicting record uses.
+ 
+ JH/03 With dkim_verify_minimal, avoid calling the DKIM ACL after the first
+       good verify.
+ 
+ Exim version 4.98
+ -----------------
+ 
  JH/01 Support list of dkim results in the dkim_status ACL condition, making
        it more usable in the data ACL.
  

diff --cc src/src/dbfunctions.h
Simple merge

diff --cc src/src/globals.c
Simple merge

diff --cc src/src/hintsdb.h
index a6555ed251a52fb73d498e24815468faf081dbb5,f20b07ce2ac0b540f5d490a150ef4d0f12745259..ba50ae1b976bfd75b4224d0ebb5cc064283cfc0c
--- 1/src/src/hintsdb.h
--- 2/src/src/hintsdb.h
+++ b/src/src/hintsdb.h
@@@ -71,310 -71,9 +71,9 @@@ required by Exim's process transitions)
  # if defined(USE_DB) || defined(USE_GDBM) || defined(USE_TDB)
  #  error USE_SQLITE conflict with alternate definition
  # endif
- 
- /* ********************* sqlite3 interface ************************ */
- 
- # include <sqlite3.h>
- 
- /* 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 */
- 
- static inline BOOL
- exim_lockfile_needed(void)
- {
- return FALSE; /* We do transaction; no extra locking needed */
- }
- 
- /* 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);
-   ret = sqlite3_exec(dbp, "BEGIN TRANSACTION;", NULL, NULL, NULL);
-   if (ret == SQLITE_OK && flags & O_CREAT)
-     ret = sqlite3_exec(dbp,
-           "CREATE TABLE IF NOT EXISTS tbl (ky TEXT PRIMARY KEY, dat BLOB);",
-           NULL, NULL, NULL);
-   if (ret != SQLITE_OK)
-     sqlite3_close(dbp);
-   }
- //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);
- # ifdef COMPILE_UTILITY
- if (!(res->data = malloc(res->len +1)))
-   { sqlite3_finalize(statement); return FALSE; }
- # else
- res->data = store_get(res->len +1, GET_TAINTED);
- # endif
- 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); */
- i = snprintf(NULL, 0, FMT, (int) key->len, key->data)+1;
- if (!(qry = malloc(i)))
-   return FALSE;
- 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)
- {
- int hlen = data->len * 2, off = 0, res;
- # define FMT "INSERT OR %s INTO tbl (ky,dat) VALUES ('%.*s', X'%.*s');"
- uschar * qry;
- # ifdef COMPILE_UTILITY
- uschar * hex = malloc(hlen+1);
- if (!hex) return EXIM_DBPUTB_DUP;     /* best we can do */
- # else
- uschar * hex = store_get(hlen+1, data->data);
- # endif
- 
- for (const uschar * s = data->data, * t = s + data->len; s < t; s++, off += 2)
-   sprintf(CS hex + off, "%02X", *s);
- 
- # ifdef COMPILE_UTILITY
- res = snprintf(CS hex, 0, FMT, alt, (int) key->len, key->data, hlen, hex) +1;
- if (!(qry = malloc(res))) return EXIM_DBPUTB_DUP;
- snprintf(CS qry, res, FMT, alt, (int) key->len, key->data, hlen, hex);
- /* fprintf(stderr, "exim_s_dbp(%s)\n", qry); */
- res = sqlite3_exec(dbp, CS qry, NULL, NULL, NULL);
- free(qry);
- free(hex);
- # else
- qry = string_sprintf(FMT, alt, (int) key->len, key->data, hlen, 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) +1; /* res includes nul */
- if (!(qry = malloc(res))) return SQLITE_NOMEM;
- 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)
- {
- # ifdef COMPILE_UTILITY
- EXIM_CURSOR * c = malloc(sizeof(int));
- if (!c) return NULL;
- # else
- EXIM_CURSOR * c = store_malloc(sizeof(int));
- # endif
- *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
- i = snprintf(NULL, 0, FMT, *cursor)+1;
- if (!(qry = malloc(i))) return FALSE;
- 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)
- {
- # ifdef COMPILE_UTILITY
- free(cursor);
- # else
- store_free(cursor);
- # endif
- }
- 
- 
- /* EXIM_DBCLOSE */
- static void
- exim_dbclose__(EXIM_DB * dbp)
- {
- (void) sqlite3_exec(dbp, "COMMIT TRANSACTION;", NULL, NULL, NULL);
- sqlite3_close(dbp);
- }
- 
- 
- /* 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
- 
- 
- 
- 
- 
- 
+ # include "hintsdb/hints_sqlite.h"
 -
  #elif defined(USE_TDB)
 +
  # if defined(USE_DB) || defined(USE_GDBM) || defined(USE_SQLITE)
  #  error USE_TDB conflict with alternate definition
  # endif

diff --cc src/src/transports/smtp.c
Simple merge

diff --cc test/runtest
Simple merge