Allow a forced-fail for banner expansion to close connection without panic-log

[exim.git] / src / src / dnsbl.c

diff --git a/src/src/dnsbl.c b/src/src/dnsbl.c
index ad36e8ecbcb1e8ff9dd499cbdca32904466411d7..1172d61833e4d54a09e40a8bb18a3857976d90ab 100644 (file)
--- a/src/src/dnsbl.c
+++ b/src/src/dnsbl.c
@@ -2,9 +2,10 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
 /* 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 */
 
 /* Functions concerned with dnsbls */
 
@@ -115,9 +116,9 @@ else
 
   else
     {  /* Set up a tree entry to cache the lookup */
-    t = store_get(sizeof(tree_node) + qlen + 1 + 1, is_tainted(query));
+    t = store_get(sizeof(tree_node) + qlen + 1 + 1, query);
     Ustrcpy(t->name, query);
-    t->data.ptr = cb = store_get(sizeof(dnsbl_cache_block), FALSE);
+    t->data.ptr = cb = store_get(sizeof(dnsbl_cache_block), GET_UNTAINTED);
     (void)tree_insertnode(&dnsbl_cache, t);
     }
 
@@ -365,7 +366,7 @@ if (cb->rc == DNS_SUCCEED)
          int len = (rr->data)[0];
          if (len > 511) len = 127;
          store_pool = POOL_PERM;
-         cb->text = string_copyn_taint(CUS (rr->data+1), len, TRUE);
+         cb->text = string_copyn_taint(CUS (rr->data+1), len, GET_TAINTED);
          store_pool = old_pool;
          break;
          }