62 lines
1.4 KiB
Diff
62 lines
1.4 KiB
Diff
|
From d8ecc7bf97934a1e2244788c610c958cacd740bd Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jeremy Harris <jgh146exb@wizmail.org>
|
||
|
|
Date: Wed, 31 Aug 2022 17:03:37 +0100
|
||
|
|
Subject: [PATCH] Fix non-WITH_CONTENT_SCAN build.
|
||
|
|
|
||
|
|
Broken-by: 4e9ed49f8f
|
||
|
|
|
||
|
|
[Upstream: https://sources.debian.org/data/main/e/exim4/4.96-9/debian/patches/75_09-Fix-non-WITH_CONTENT_SCAN-build.patch]
|
||
|
|
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||
|
|
---
|
||
|
|
src/exim.c | 11 +++++++++++
|
||
|
|
src/regex.c | 10 ----------
|
||
|
|
2 files changed, 11 insertions(+), 10 deletions(-)
|
||
|
|
|
||
|
|
--- a/src/exim.c
|
||
|
|
+++ b/src/exim.c
|
||
|
|
@@ -1677,10 +1677,21 @@
|
||
|
|
if ((s = expand_string(big_buffer))) printf("%s\n", CS s);
|
||
|
|
else printf("Failed: %s\n", expand_string_message);
|
||
|
|
}
|
||
|
|
|
||
|
|
|
||
|
|
+/* reset regex expansion variables */
|
||
|
|
+void
|
||
|
|
+regex_vars_clear(void)
|
||
|
|
+{
|
||
|
|
+regex_match_string = NULL;
|
||
|
|
+for (int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
+
|
||
|
|
+
|
||
|
|
+
|
||
|
|
|
||
|
|
/*************************************************
|
||
|
|
* Entry point and high-level code *
|
||
|
|
*************************************************/
|
||
|
|
|
||
|
|
--- a/src/regex.c
|
||
|
|
+++ b/src/regex.c
|
||
|
|
@@ -95,20 +95,10 @@
|
||
|
|
pcre2_match_data_free(md);
|
||
|
|
return FAIL;
|
||
|
|
}
|
||
|
|
|
||
|
|
|
||
|
|
-/* reset expansion variables */
|
||
|
|
-void
|
||
|
|
-regex_vars_clear(void)
|
||
|
|
-{
|
||
|
|
-regex_match_string = NULL;
|
||
|
|
-for (int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL;
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
-
|
||
|
|
-
|
||
|
|
int
|
||
|
|
regex(const uschar ** listptr)
|
||
|
|
{
|
||
|
|
unsigned long mbox_size;
|
||
|
|
FILE * mbox_file;
|