X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/d447dbd160a0fb503ed1e763f3f23d28744b6ddd..a85c067ba6c6940512cf57ec213277a370d87e70:/src/src/lookups/spf.c

diff --git a/src/src/lookups/spf.c b/src/src/lookups/spf.c
index 243c271a4..a1052d7fc 100644
--- a/src/src/lookups/spf.c
+++ b/src/src/lookups/spf.c
@@ -5,14 +5,14 @@
 /* Exim - SPF lookup module using libspf2
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+Copyright (c) The Exim Maintainers 2020 - 2022
 Copyright (c) 2005 Chris Webb, Arachsys Internet Services Ltd
+SPDX-License-Identifier: GPL-2.0-or-later
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
 as published by the Free Software Foundation; either version 2
 of the License, or (at your option) any later version.
-
-Copyright (c) The Exim Maintainers 2020
 */
 
 #include "../exim.h"
@@ -65,7 +65,8 @@ if (spf_server) SPF_server_free(spf_server);
 
 static int
 spf_find(void * handle, const uschar * filename, const uschar * keystring,
-  int key_len, uschar ** result, uschar ** errmsg, uint * do_cache)
+  int key_len, uschar ** result, uschar ** errmsg, uint * do_cache,
+  const uschar * opts)
 {
 SPF_server_t *spf_server = handle;
 SPF_request_t *spf_request;
@@ -127,25 +128,26 @@ return OK;
 
 #include "../version.h"
 
-void
-spf_version_report(FILE *f)
+gstring *
+spf_version_report(gstring * g)
 {
 #ifdef DYNLOOKUP
-fprintf(f, "Library version: SPF: Exim version %s\n", EXIM_VERSION_STR);
+g = string_fmt_append(g, "Library version: SPF: Exim version %s\n", EXIM_VERSION_STR));
 #endif
+return g;
 }
 
 
 static lookup_info _lookup_info = {
-  US"spf",                       /* lookup name */
-  0,                             /* not absfile, not query style */
-  spf_open,                      /* open function */
-  NULL,                          /* no check function */
-  spf_find,                      /* find function */
-  spf_close,                     /* close function */
-  NULL,                          /* no tidy function */
-  NULL,                          /* no quoting function */
-  spf_version_report             /* version reporting */
+  .name = US"spf",			/* lookup name */
+  .type = 0,				/* not absfile, not query style */
+  .open = spf_open,			/* open function */
+  .check = NULL,			/* no check function */
+  .find = spf_find,			/* find function */
+  .close = spf_close,			/* close function */
+  .tidy = NULL,				/* no tidy function */
+  .quote = NULL,			/* no quoting function */
+  .version_report = spf_version_report             /* version reporting */
 };
 
 #ifdef DYNLOOKUP