From 35b11dd0e52b5ac176849f807cca8898bcaf0c3d Mon Sep 17 00:00:00 2001 From: "Heiko Schlittermann (HS12-RIPE)" Date: Sun, 28 Mar 2021 10:49:49 +0200 Subject: [PATCH 03/23] dbstuff --- src/dbstuff.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/dbstuff.h b/src/dbstuff.h index c1fb54346..dcee78696 100644 --- a/src/dbstuff.h +++ b/src/dbstuff.h @@ -643,11 +643,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); \ -- 2.30.2