Taint: generate detainted $domain_data & $local_part_data from Rverify callout

[user/henk/code/exim.git] / src / src / hintsdb.h

diff --git a/src/src/hintsdb.h b/src/src/hintsdb.h
index d7116f7c3ad963a0b20899b06e96e43cca2b8285..e3e9e98d841e5b0ff876287311e7ab1b5b840a0f 100644 (file)
--- a/src/src/hintsdb.h
+++ b/src/src/hintsdb.h
@@ -2,8 +2,8 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) University of Cambridge 1995 - 2018 */
 /* Copyright (c) The Exim Maintainers 2020 - 2022 */
+/* Copyright (c) University of Cambridge 1995 - 2018 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* This header file contains macro definitions so that a variety of DBM
@@ -17,7 +17,7 @@ For convenience, the definitions of the structures used in the various hints
 databases are also kept in this file, which is used by the maintenance
 utilities as well as the main Exim binary. */
 
-#if !defined(HINTSDB_H) && !defined(MACRO_PREDEF)
+#ifndef HINTSDB_H
 #define HINTSDB_H
 
 
@@ -746,7 +746,7 @@ exim_datum_free(EXIM_DATUM * d)
 
 
 
-#ifdef COMPILE_UTILITY
+#if defined(COMPILE_UTILITY) || defined(MACRO_PREDEF)
 
 static inline EXIM_DB *
 exim_dbopen(const uschar * name, const uschar * dirname, int flags,
@@ -797,7 +797,7 @@ DEBUG(D_hints_lookup) debug_printf_indent("EXIM_DBCLOSE(%p)\n", dbp);
 exim_dbclose__(dbp);
 }
 
-# endif                /* COMPILE_UTILITY */
+# endif                /* defined(COMPILE_UTILITY) || defined(MACRO_PREDEF) */
 
 /********************* End of dbm library definitions **********************/