git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SPDX: license tags (mostly by guesswork)
[exim.git]
/
src
/
src
/
spf.c
diff --git
a/src/src/spf.c
b/src/src/spf.c
index 9f0805ada9d49ac93ad36356c4e08ad015282f4b..a94bc96772b40df94c935ded900b1b237266c023 100644
(file)
--- a/
src/src/spf.c
+++ b/
src/src/spf.c
@@
-3,9
+3,10
@@
*************************************************/
/* SPF support.
*************************************************/
/* SPF support.
+ Copyright (c) The Exim Maintainers 2015 - 2022
Copyright (c) Tom Kistner <tom@duncanthrax.net> 2004 - 2014
License: GPL
Copyright (c) Tom Kistner <tom@duncanthrax.net> 2004 - 2014
License: GPL
- Copyright (c) The Exim Maintainers 2015 - 2021
+ SPDX-License-Identifier: GPL-2.0-only
*/
/* Code for calling spf checks via libspf-alt. Called from acl.c. */
*/
/* Code for calling spf checks via libspf-alt. Called from acl.c. */
@@
-34,15
+35,17
@@
SPF_response_t *spf_response_2mx = NULL;
SPF_dns_rr_t * spf_nxdomain = NULL;
SPF_dns_rr_t * spf_nxdomain = NULL;
-void
-spf_lib_version_report(
FILE * fp
)
+gstring *
+spf_lib_version_report(
gstring * g
)
{
int maj, min, patch;
{
int maj, min, patch;
+
SPF_get_lib_version(&maj, &min, &patch);
SPF_get_lib_version(&maj, &min, &patch);
-
fprintf(fp
, "Library version: spf2: Compile: %d.%d.%d\n",
+
g = string_fmt_append(g
, "Library version: spf2: Compile: %d.%d.%d\n",
SPF_LIB_VERSION_MAJOR, SPF_LIB_VERSION_MINOR, SPF_LIB_VERSION_PATCH);
SPF_LIB_VERSION_MAJOR, SPF_LIB_VERSION_MINOR, SPF_LIB_VERSION_PATCH);
-
fprintf(fp,
" Runtime: %d.%d.%d\n",
+
g = string_fmt_append(g,
" Runtime: %d.%d.%d\n",
maj, min, patch);
maj, min, patch);
+return g;
}
}
@@
-202,7
+205,7
@@
spf_nxdomain = SPF_dns_rr_new_init(spf_dns_server,
"", ns_t_any, 24 * 60 * 60, HOST_NOT_FOUND);
if (!spf_nxdomain)
{
"", ns_t_any, 24 * 60 * 60, HOST_NOT_FOUND);
if (!spf_nxdomain)
{
- free(spf_dns_server);
+
store_
free(spf_dns_server);
return NULL;
}
return NULL;
}