X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/d7d7b7b91dd75cec636fc144da7e27eed860f971..1d28cc061677bd07d9bed48dd84bd5c590247043:/src/src/lookups/whoson.c

diff --git a/src/src/lookups/whoson.c b/src/src/lookups/whoson.c
index 870960e4d..cd6c7e85c 100644
--- a/src/src/lookups/whoson.c
+++ b/src/src/lookups/whoson.c
@@ -1,33 +1,18 @@
-/* $Cambridge: exim/src/src/lookups/whoson.c,v 1.3 2006/02/07 11:19:01 ph10 Exp $ */
-
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) University of Cambridge 1995 - 2006 */
+/* 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. */
 
 #include "../exim.h"
 
 
-/* We can't just compile this code and allow the library mechanism to omit the
-functions if they are not wanted, because we need to have the WHOSON headers
-available for compiling. Therefore, compile these functions only if
-LOOKUP_WHOSON is defined. However, some compilers don't like compiling empty
-modules, so keep them happy with a dummy when skipping the rest. Make it
-reference itself to stop picky compilers complaining that it is unused, and put
-in a dummy argument to stop even pickier compilers complaining about infinite
-loops. */
-
-#ifndef LOOKUP_WHOSON
-static void dummy(int x) { dummy(x-1); }
-#else
-
-
 #include <whoson.h>        /* Public header */
-#include "whoson.h"        /* Local header */
 
 
 /*************************************************
@@ -36,11 +21,9 @@ static void dummy(int x) { dummy(x-1); }
 
 /* See local README for interface description. */
 
-void *
-whoson_open(uschar *filename, uschar **errmsg)
+static void *
+whoson_open(const uschar * filename, uschar ** errmsg)
 {
-filename = filename;   /* Keep picky compilers happy */
-errmsg = errmsg;
 return (void *)(1);    /* Just return something non-null */
 }
 
@@ -51,18 +34,13 @@ return (void *)(1);    /* Just return something non-null */
 
 /* See local README for interface description. */
 
-int
-whoson_find(void *handle, uschar *filename, uschar *query, int length,
-  uschar **result, uschar **errmsg, BOOL *do_cache)
+static int
+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 */
@@ -77,6 +55,45 @@ switch (wso_query(query, CS buffer, sizeof(buffer)))
   }
 }
 
-#endif  /* LOOKUP_WHOSON */
+
+
+/*************************************************
+*         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 = {
+  .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
+#define whoson_lookup_module_info _lookup_module_info
+#endif
+
+static lookup_info *_lookup_list[] = { &_lookup_info };
+lookup_module_info whoson_lookup_module_info = { LOOKUP_MODULE_INFO_MAGIC, _lookup_list, 1 };
 
 /* End of lookups/whoson.c */