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
SPDX: license tags (mostly by guesswork)
[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 38b7c2ad345c4bde4f6cbcadb74ae42994eb2f8a..cf4b9cd0b04ebd98a74534869118b317f3b3d990 100644
(file)
--- a/
src/src/lookups/lf_sqlperform.c
+++ b/
src/src/lookups/lf_sqlperform.c
@@
-2,9
+2,10
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
+/* SPDX-License-Identifier: GPL-2.0-only */
#include "../exim.h"
#include "../exim.h"
@@
-102,13
+103,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
+159,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;