search

(cherry picked from commit b71d675f695c2cf17357b190476129535d5f446c)

diff --git a/src/src/search.c b/src/src/search.c
index 421d9c789c0ef08d06c29079bf39c61990c533c8..81d1d20f982651c6042b7485eb5256cb69d94fbb 100644 (file)
--- a/src/src/search.c
+++ b/src/src/search.c
@@ -392,12 +392,8 @@ lookup_info *lk = lookup_list[search_type];
 uschar keybuffer[256];
 int old_pool = store_pool;
 
 uschar keybuffer[256];
 int old_pool = store_pool;
 

-if (filename && is_tainted(filename))
-  {
-  log_write(0, LOG_MAIN|LOG_PANIC,
-    "Tainted filename for search: '%s'", filename);
+if (filename && is_tainted2(filename, LOG_MAIN|LOG_PANIC, "Tainted filename for search: '%s'", filename))

   return NULL;
   return NULL;

-  }

 
 /* Change to the search store pool and remember our reset point */
 
 
 /* Change to the search store pool and remember our reset point */
 


@@ -714,7 +710,7 @@ if (opts)
 /* Arrange to put this database at the top of the LRU chain if it is a type
 that opens real files. */
 
 /* Arrange to put this database at the top of the LRU chain if it is a type
 that opens real files. */
 

-if (  open_top != (tree_node *)handle 
+if (  open_top != (tree_node *)handle

    && lookup_list[t->name[0]-'0']->type == lookup_absfile)
   {
   search_cache *c = (search_cache *)(t->data.ptr);
    && lookup_list[t->name[0]-'0']->type == lookup_absfile)
   {
   search_cache *c = (search_cache *)(t->data.ptr);