DSN: fix null deref when bounce is due to conn-timeout. Bug 1630

[user/henk/code/exim.git] / src / src / lookups / testdb.c

diff --git a/src/src/lookups/testdb.c b/src/src/lookups/testdb.c
index 03404d82f8db82ede4d5ba1cafa4316d96081a44..c82fa7f3eb8ba8a969a97a608209c7cf53e354b9 100644 (file)
--- a/src/src/lookups/testdb.c
+++ b/src/src/lookups/testdb.c
@@ -1,10 +1,8 @@
-/* $Cambridge: exim/src/src/lookups/testdb.c,v 1.5 2009/11/16 19:50:38 nm4 Exp $ */
-
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) University of Cambridge 1995 - 2009 */
+/* Copyright (c) University of Cambridge 1995 - 2015 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 #include "../exim.h"
@@ -39,7 +37,7 @@ return (void *)(1);    /* Just return something non-null */
 /* See local README for interface description. */
 
 static int
-testdb_find(void *handle, uschar *filename, uschar *query, int length,
+testdb_find(void *handle, uschar *filename, const uschar *query, int length,
   uschar **result, uschar **errmsg, BOOL *do_cache)
 {
 handle = handle;          /* Keep picky compilers happy */
@@ -65,6 +63,24 @@ if (Ustrcmp(query, "nocache") == 0) *do_cache = FALSE;
 return OK;
 }
 
+
+/*************************************************
+*         Version reporting entry point          *
+*************************************************/
+
+/* See local README for interface description. */
+
+#include "../version.h"
+
+void
+testdb_version_report(FILE *f)
+{
+#ifdef DYNLOOKUP
+fprintf(f, "Library version: TestDB: Exim version %s\n", EXIM_VERSION_STR);
+#endif
+}
+
+
 static lookup_info _lookup_info = {
   US"testdb",                    /* lookup name */
   lookup_querystyle,             /* query-style lookup */
@@ -73,7 +89,8 @@ static lookup_info _lookup_info = {
   testdb_find,                   /* find function */
   NULL,                          /* no close function */
   NULL,                          /* no tidy function */
-  NULL                           /* no quoting function */
+  NULL,                          /* no quoting function */
+  testdb_version_report          /* version reporting */
 };
 
 #ifdef DYNLOOKUP