1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
From e4e66eda1683cfd3a6658b39c21be91a7ca99df0 Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sat, 29 Nov 2025 14:01:04 +0000
Subject: [PATCH] local_scan: bump API version, for smtp_fflush()
Broken-by: 9682a4923d1d
---
doc/doc-docbook/spec.xfpt | 10 +++++-----
src/local_scan.h | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
--- a/src/local_scan.h
+++ b/src/local_scan.h
@@ -41,12 +41,12 @@ helps the maintainers if we keep their A
mutate into more general support later. The major number is increased when the
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 6
-#define LOCAL_SCAN_ABI_VERSION_MINOR 1
+#define LOCAL_SCAN_ABI_VERSION_MAJOR 7
+#define LOCAL_SCAN_ABI_VERSION_MINOR 0
#define LOCAL_SCAN_ABI_VERSION \
LOCAL_SCAN_ABI_VERSION_MAJOR.LOCAL_SCAN_ABI_VERSION_MINOR
--- a/doc/spec.txt
+++ b/doc/spec.txt
@@ -33601,11 +33601,11 @@ uschar rfc2047_decode
argument to return an error message. The variable pointed to by error is
set to NULL if there is no error; it may be set non-NULL even when the
function returns a non-NULL value if decoding was successful, but there was
a problem with translation.
-int smtp_fflush(void)
+int smtp_fflush(BOOL)
This function is used in conjunction with smtp_printf(), as described
below.
void smtp_printf(char *,BOOL, ...)
@@ -33650,13 +33650,14 @@ void smtp_printf(char *,BOOL, ...)
The smtp_printf() function does not return any error indication, because it
does not guarantee a flush of pending output, and therefore does not test
the state of the stream. (In the main code of Exim, flushing and error
detection is done when Exim is ready for the next SMTP input command.) If
you want to flush the output and check for an error (for example, the
- dropping of a TCP/IP connection), you can call smtp_fflush(), which has no
- arguments. It flushes the output stream, and returns a non-zero value if
- there is an error.
+ dropping of a TCP/IP connection), you can call smtp_fflush(), which has
+ one argument saying whether to also uncork the socket layer (it is always
+ safe to do so). It flushes the output stream, and returns a non-zero
+ value if there is an error.
void *store_get(int,BOOL)
This function accesses Exim's internal store (memory) manager. It gets a
new chunk of memory whose size is given by the first argument. The second
|
