From d48326c00b228279a957da7f58b48a55f4b7823b Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sat, 19 Oct 2019 19:55:39 +0100 Subject: [PATCH] Fix HAVE_LOCAL_SCAN build. Bug 2457 Broken-by: f3ebb786e4 --- src/src/local_scan.h | 4 +++- src/src/string.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/src/local_scan.h b/src/src/local_scan.h index 235812ada..fb878591e 100644 --- a/src/src/local_scan.h +++ b/src/src/local_scan.h @@ -199,10 +199,12 @@ we can use an inlined implementation in the compiles of the main Exim files, with the original name. */ # define string_copy(s) string_copy_function(s) -# define string_copyn(s, n) string_copyn_function(s, n) +# define string_copyn(s, n) string_copyn_function((s), (n)) +# define string_copy_taint(s, t) string_copy_taint_function((s), (t)) extern uschar * string_copy_function(const uschar *); extern uschar * string_copyn_function(const uschar *); +extern uschar * string_copy_taint_function(const uschar *); #endif /* End of local_scan.h */ diff --git a/src/src/string.c b/src/src/string.c index a95439651..ced1ad8c7 100644 --- a/src/src/string.c +++ b/src/src/string.c @@ -411,7 +411,7 @@ return ss; -#ifdef HAVE_LOCAL_SCAN +#if defined(HAVE_LOCAL_SCAN) && !defined(MACRO_PREDEF) && !defined(COMPILE_UTILITY) /************************************************* * Copy and save string * *************************************************/ @@ -432,7 +432,7 @@ As above, but explicitly specifying the result taint status */ uschar * -string_copy_taint(const uschar * s, BOOL tainted) +string_copy_taint_function(const uschar * s, BOOL tainted) { int len = Ustrlen(s) + 1; uschar *ss = store_get(len, tainted); -- 2.25.1