git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert introduction of alloc_insecure_tainted_data
[exim.git]
/
src
/
src
/
lookups
/
lf_sqlperform.c
diff --git
a/src/src/lookups/lf_sqlperform.c
b/src/src/lookups/lf_sqlperform.c
index b9de0a1c8924cb2a2ca73b25f4b6a28901c845f0..3204e1256d7951207c5ad1d1a19668c9d67fa901 100644
(file)
--- a/
src/src/lookups/lf_sqlperform.c
+++ b/
src/src/lookups/lf_sqlperform.c
@@
-102,13
+102,11
@@
if (Ustrncmp(query, "servers", 7) == 0)
}
}
}
}
- { uschar *m;
- if ((m = is_tainted2(server, 0, "Tainted %s server '%s'", name, server)))
- {
- *errmsg = m;
+ if (is_tainted(server))
+ {
+ *errmsg = string_sprintf("%s server \"%s\" is tainted", name, server);
return DEFER;
}
return DEFER;
}
- }
rc = (*fn)(ss+1, server, result, errmsg, &defer_break, do_cache, opts);
if (rc != DEFER || defer_break) return rc;
rc = (*fn)(ss+1, server, result, errmsg, &defer_break, do_cache, opts);
if (rc != DEFER || defer_break) return rc;
@@
-160,13
+158,11
@@
else
server = ele;
}
server = ele;
}
- { uschar *m;
- if ((m = is_tainted2(server, 0, "Tainted %s server '%s'", name, server)))
+ if (is_tainted(server))
{
{
- *errmsg =
m
;
+ *errmsg =
string_sprintf("%s server \"%s\" is tainted", name, server)
;
return DEFER;
}
return DEFER;
}
- }
rc = (*fn)(query, server, result, errmsg, &defer_break, do_cache, opts);
if (rc != DEFER || defer_break) return rc;
rc = (*fn)(query, server, result, errmsg, &defer_break, do_cache, opts);
if (rc != DEFER || defer_break) return rc;