summaryrefslogtreecommitdiffstats
path: root/debian/patches/75_13-lf_sqlperform.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/75_13-lf_sqlperform.patch')
-rw-r--r--debian/patches/75_13-lf_sqlperform.patch49
1 files changed, 49 insertions, 0 deletions
diff --git a/debian/patches/75_13-lf_sqlperform.patch b/debian/patches/75_13-lf_sqlperform.patch
new file mode 100644
index 0000000..67283a0
--- /dev/null
+++ b/debian/patches/75_13-lf_sqlperform.patch
@@ -0,0 +1,49 @@
+From 9810dfc25d8b9687b46e57963a3ac30bf5c9b2c9 Mon Sep 17 00:00:00 2001
+From: "Heiko Schlittermann (HS12-RIPE)" <hs@schlittermann.de>
+Date: Thu, 1 Apr 2021 21:36:12 +0200
+Subject: [PATCH 13/23] lf_sqlperform
+
+---
+ src/lookups/lf_sqlperform.c | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/src/lookups/lf_sqlperform.c b/src/lookups/lf_sqlperform.c
+index ad1df29d1..eda3089e2 100644
+--- a/src/lookups/lf_sqlperform.c
++++ b/src/lookups/lf_sqlperform.c
+@@ -102,11 +102,13 @@ if (Ustrncmp(query, "servers", 7) == 0)
+ }
+ }
+
+- if (is_tainted(server))
+- {
+- *errmsg = string_sprintf("%s server \"%s\" is tainted", name, server);
++ { uschar *m;
++ if (m = is_tainted2(server, 0, "Tainted %s server '%s'", name, server))
++ {
++ *errmsg = m;
+ return DEFER;
+ }
++ }
+
+ rc = (*fn)(ss+1, server, result, errmsg, &defer_break, do_cache, opts);
+ if (rc != DEFER || defer_break) return rc;
+@@ -158,11 +160,13 @@ else
+ server = ele;
+ }
+
+- if (is_tainted(server))
++ { uschar *m;
++ if (is_tainted2(server, 0, "Tainted %s server '%s'", name, server))
+ {
+- *errmsg = string_sprintf("%s server \"%s\" is tainted", name, server);
++ *errmsg = m;
+ return DEFER;
+ }
++ }
+
+ rc = (*fn)(query, server, result, errmsg, &defer_break, do_cache, opts);
+ if (rc != DEFER || defer_break) return rc;
+--
+2.30.2
+