summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>2021-03-28 10:49:49 +0200
committerHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>2021-06-24 21:43:05 +0200
commit2382cd3e81838709abd3b0c1b410f65274d90e25 (patch)
tree35cd64f5b1d4884a5dfd13d20e198367c838f79c /src
parent8fc13e4adcdf5d0cec382c401ce72592569084fe (diff)
dbstuff
(cherry picked from commit 35b11dd0e52b5ac176849f807cca8898bcaf0c3d)
Diffstat (limited to 'src')
-rw-r--r--src/src/dbstuff.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/src/dbstuff.h b/src/src/dbstuff.h
index 8a8a5fb67..2f00dffb4 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); \