X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsrc%2Flookups%2Flf_sqlperform.c;h=38b7c2ad345c4bde4f6cbcadb74ae42994eb2f8a;hb=f7ea5ba1049ba2a53b8cb0bf98893bff6c6bc77f;hp=ad1df29d10b4c3a775fa6683c328a2f136233787;hpb=1e1ddfac79fbcd052f199500a6493c7f79cb8462;p=user%2Fhenk%2Fcode%2Fexim.git diff --git a/src/src/lookups/lf_sqlperform.c b/src/src/lookups/lf_sqlperform.c index ad1df29d1..38b7c2ad3 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 ((m = 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;