From b3317cfaabe29c73478125e14f58236b2229da4b Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Mon, 25 Nov 2019 15:21:56 +0000 Subject: [PATCH] Local_scan: bump the ABI major version number Broken-by: 925ac8e4f1 --- doc/doc-docbook/spec.xfpt | 6 +++--- doc/doc-txt/ChangeLog | 6 ++++++ src/src/local_scan.h | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index 452d76434..483aa9656 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -34359,9 +34359,9 @@ The second argument is used to request that the data be buffered This is advisory only, but likely to save on system-calls and packets sent when a sequence of calls to the function are made. -The argument was added in Exim version 4.90 - changing the API. -Nobody noticed until 4.93 was imminent. -A decision on the way forward has not yet been made. +The argument was added in Exim version 4.90 - changing the API/ABI. +Nobody noticed until 4.93 was imminent, at which point the +ABI version number was incremented. .wen Strings that are written by &'smtp_printf()'& from within &[local_scan()]& diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index faf6914ca..64198944a 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -206,6 +206,12 @@ JH/44 With OpenSSL 1.1.1 (onwards) disable renegotiation for TLS1.2 and below; JH/45 local_scan API: documented the current smtp_printf() call. This changed for version 4.90 - adding a "more data" boolean to the arguments. + Bumped the ABI version number also, this having been missed previously; + release versions 4.90 to 4.92.3 inclusive were effectively broken in + respect of usage of smtp_printf() by either local_scan code or libraries + accessed via the ${dlfunc } expansion item. Both will need coding + adjustment for any calls to smtp_printf() to match the new function + signature; a FALSE value for the new argument is always safe. Exim version 4.92 diff --git a/src/src/local_scan.h b/src/src/local_scan.h index 41a17a35c..e0a97088f 100644 --- a/src/src/local_scan.h +++ b/src/src/local_scan.h @@ -98,7 +98,7 @@ ABI is changed in a non backward compatible way. The minor number is increased each time a new feature is added (in a way that doesn't break backward compatibility). */ -#define LOCAL_SCAN_ABI_VERSION_MAJOR 2 +#define LOCAL_SCAN_ABI_VERSION_MAJOR 3 #define LOCAL_SCAN_ABI_VERSION_MINOR 1 #define LOCAL_SCAN_ABI_VERSION \ LOCAL_SCAN_ABI_VERSION_MAJOR.LOCAL_SCAN_ABI_VERSION_MINOR -- 2.25.1