X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/f4e62a871680af98f14beb5f21dbe3b85c5c35ff..d89f32c2711de4e1272b8132a13bf98b9a17580d:/src/src/dbstuff.h

diff --git a/src/src/dbstuff.h b/src/src/dbstuff.h
index 227de39e5..a45874dc9 100644
--- a/src/src/dbstuff.h
+++ b/src/src/dbstuff.h
@@ -642,7 +642,13 @@ after reading data. */
       : (flags) == O_RDWR ? "O_RDWR"	\
       : (flags) == (O_RDWR|O_CREAT) ? "O_RDWR|O_CREAT"	\
       : "??");	\
-  EXIM_DBOPEN__(name, dirname, flags, mode, dbpp); \
+  if (is_tainted(name) || is_tainted(dirname)) \
+    { \
+    log_write(0, LOG_MAIN|LOG_PANIC, "Tainted name for DB file not permitted"); \
+    *dbpp = NULL; \
+    } \
+  else \
+    { EXIM_DBOPEN__(name, dirname, flags, mode, dbpp); } \
   DEBUG(D_hints_lookup) debug_printf_indent("returned from EXIM_DBOPEN: %p\n", *dbpp); \
   } while(0)
 #  define EXIM_DBCLOSE(db) \
@@ -786,7 +792,7 @@ typedef struct {
   uschar   bloom[40];     /* Bloom filter which may be larger than this */
 } dbdata_ratelimit_unique;
 
-#ifdef EXPERIMENTAL_PIPE_CONNECT
+#ifndef DISABLE_PIPE_CONNECT
 /* This structure records the EHLO responses, cleartext and crypted,
 for an IP, as bitmasks (cf. OPTION_TLS) */
 
@@ -807,7 +813,8 @@ typedef struct {
 typedef struct {
   time_t time_stamp;
   /*************/
-  uschar verify_override;
+  uschar verify_override:1;
+  uschar ocsp:3;
   uschar session[1];
 } dbdata_tls_session;