[exim-cvs] dbstuff

Αρχική Σελίδα
Delete this message
Reply to this message
Συντάκτης: Exim Git Commits Mailing List
Ημερομηνία:  
Προς: exim-cvs
Αντικείμενο: [exim-cvs] dbstuff
Gitweb: https://git.exim.org/exim.git/commitdiff/2382cd3e81838709abd3b0c1b410f65274d90e25
Commit:     2382cd3e81838709abd3b0c1b410f65274d90e25
Parent:     8fc13e4adcdf5d0cec382c401ce72592569084fe
Author:     Heiko Schlittermann (HS12-RIPE) <hs@???>
AuthorDate: Sun Mar 28 10:49:49 2021 +0200
Committer:  Heiko Schlittermann (HS12-RIPE) <hs@???>
CommitDate: Thu Jun 24 21:43:05 2021 +0200


    dbstuff


    (cherry picked from commit 35b11dd0e52b5ac176849f807cca8898bcaf0c3d)
---
 src/src/dbstuff.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)


diff --git a/src/src/dbstuff.h b/src/src/dbstuff.h
index 8a8a5fb..2f00dff 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); \