* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2024 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
/* See the file NOTICE for conditions of use and distribution. */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "../exim.h"
const uschar *qserverlist;
uschar *qserver;
+ log_write(0, LOG_MAIN|LOG_CONFIG_IN, "WARNING: obslete syntax used for lookup\n");
+
s = query + 7;
skip_whitespace(&s);
if (*s++ != '=')
}
}
- { 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;
}
- }
rc = (*fn)(ss+1, server, result, errmsg, &defer_break, do_cache, opts);
if (rc != DEFER || defer_break) return rc;
server = ele;
}
- { uschar *m;
- if (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;
}
- }
rc = (*fn)(query, server, result, errmsg, &defer_break, do_cache, opts);
if (rc != DEFER || defer_break) return rc;