diff options
| author | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2021-04-01 21:36:12 +0200 |
|---|---|---|
| committer | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2021-06-24 21:43:12 +0200 |
| commit | ec7e44dc9134307d74afa4b07f09afbdd019282c (patch) | |
| tree | 4068a7cf8ef080b0d23bd205386e5e9a4c686ffb | |
| parent | 0fa46a83a55054c65ffc539405f62bf86aac5b44 (diff) | |
lf_sqlperform
(cherry picked from commit 9810dfc25d8b9687b46e57963a3ac30bf5c9b2c9)
| -rw-r--r-- | src/src/lookups/lf_sqlperform.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/src/lookups/lf_sqlperform.c b/src/src/lookups/lf_sqlperform.c index ad1df29d1..eda3089e2 100644 --- a/src/src/lookups/lf_sqlperform.c +++ b/src/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; |