From: Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>
Date: Sun, 28 Mar 2021 08:49:49 +0000 (+0200)
Subject: dbstuff
X-Git-Url: https://git.exim.org/users/heiko/exim.git/commitdiff_plain/9cabf99d8937247d8200aa51a74548b8e6e9f9c7?ds=sidebyside;hp=0e56fd1d024d0b67de1effc7e5e89f6339960ab5

dbstuff
---

diff --git a/src/src/dbstuff.h b/src/src/dbstuff.h
index 5a8441d6a..c65fdafe9 100644
--- a/src/src/dbstuff.h
+++ b/src/src/dbstuff.h
@@ -640,11 +640,9 @@ after reading data. */
       : (flags) == O_RDWR ? "O_RDWR"	\
       : (flags) == (O_RDWR|O_CREAT) ? "O_RDWR|O_CREAT"	\
       : "??");	\
-  if (is_tainted(name) || is_tainted(dirname)) \
-    { \
-    log_write(0, LOG_MAIN|LOG_PANIC, "Tainted name for DB file not permitted"); \
+  if (is_tainted2(name, LOG_MAIN|LOG_PANIC, "Tainted name '%s' for DB file not permitted", name) \
+      || is_tainted2(dirname, LOG_MAIN|LOG_PANIC, "Tainted name '%s' for DB directory not permitted", dirname)) \
     *dbpp = NULL; \
-    } \
   else \
     { EXIM_DBOPEN__(name, dirname, flags, mode, dbpp); } \
   DEBUG(D_hints_lookup) debug_printf_indent("returned from EXIM_DBOPEN: %p\n", *dbpp); \