OpenSSL: add remote host info to log line for in-connection TLS error. Bug 3010

[exim.git] / src / src / lookups / whoson.c

diff --git a/src/src/lookups/whoson.c b/src/src/lookups/whoson.c
index d1979058fa3f32ee80cd1f1c549ba711b5aad3d7..cd6c7e85c6ee6bcc98b9d4e2cc0d4150e0e17af7 100644 (file)
--- a/src/src/lookups/whoson.c
+++ b/src/src/lookups/whoson.c
@@ -1,11 +1,11 @@
-/* $Cambridge: exim/src/src/lookups/whoson.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) The Exim Maintainers 2020 - 2022 */
+/* Copyright (c) University of Cambridge 1995 - 2015 */
 /* See the file NOTICE for conditions of use and distribution. */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 /* This code originally came from Robert Wal. */
 
@@ -22,10 +22,8 @@
 /* See local README for interface description. */
 
 static void *
-whoson_open(uschar *filename, uschar **errmsg)
+whoson_open(const uschar * filename, uschar ** errmsg)
 {
-filename = filename;   /* Keep picky compilers happy */
-errmsg = errmsg;
 return (void *)(1);    /* Just return something non-null */
 }
 
@@ -37,17 +35,12 @@ return (void *)(1);    /* Just return something non-null */
 /* See local README for interface description. */
 
 static int
-whoson_find(void *handle, uschar *filename, uschar *query, int length,
-  uschar **result, uschar **errmsg, BOOL *do_cache)
+whoson_find(void * handle, const uschar * filename, uschar * query, int length,
+  uschar ** result, uschar ** errmsg, uint * do_cache, const uschar * opts)
 {
 uschar buffer[80];
-handle = handle;          /* Keep picky compilers happy */
-filename = filename;
-length = length;
-errmsg = errmsg;
-do_cache = do_cache;
 
-switch (wso_query(query, CS buffer, sizeof(buffer)))
+switch (wso_query(CS query, CS buffer, sizeof(buffer)))
   {
   case 0:
   *result = string_copy(buffer);    /* IP in database; return name of user */
@@ -62,15 +55,38 @@ switch (wso_query(query, CS buffer, sizeof(buffer)))
   }
 }
 
+
+
+/*************************************************
+*         Version reporting entry point          *
+*************************************************/
+
+/* See local README for interface description. */
+
+#include "../version.h"
+
+gstring *
+whoson_version_report(gstring * g)
+{
+g = string_fmt_append(g,
+  "Library version: Whoson: Runtime: %s\n", wso_version());
+#ifdef DYNLOOKUP
+g = string_fmt_append(g,
+  "                         Exim version %s\n", EXIM_VERSION_STR);
+#endif
+return g;
+}
+
 static lookup_info _lookup_info = {
-  US"whoson",                    /* lookup name */
-  lookup_querystyle,             /* query-style lookup */
-  whoson_open,                   /* open function */
-  NULL,                          /* check function */
-  whoson_find,                   /* find function */
-  NULL,                          /* no close function */
-  NULL,                          /* no tidy function */
-  NULL                           /* no quoting function */
+  .name = US"whoson",                  /* lookup name */
+  .type = lookup_querystyle,           /* query-style lookup */
+  .open = whoson_open,                 /* open function */
+  .check = NULL,                       /* check function */
+  .find = whoson_find,                 /* find function */
+  .close = NULL,                       /* no close function */
+  .tidy = NULL,                                /* no tidy function */
+  .quote = NULL,                       /* no quoting function */
+  .version_report = whoson_version_report          /* version reporting */
 };
 
 #ifdef DYNLOOKUP