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
/
lookups
/
dnsdb.c
diff --git
a/src/src/lookups/dnsdb.c
b/src/src/lookups/dnsdb.c
index d064821436cb551b0718468ba10248700cf9c45a..4f43cf6749ab502fa9d662a73b9585b5bc9de980 100644
(file)
--- a/
src/src/lookups/dnsdb.c
+++ b/
src/src/lookups/dnsdb.c
@@
-2,9
+2,10
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
+/* SPDX-License-Identifier: GPL-2.0-only */
#include "../exim.h"
#include "lf_functions.h"
#include "../exim.h"
#include "lf_functions.h"
@@
-190,7
+191,8
@@
for (;;)
else
{
*errmsg = US"unsupported dnsdb defer behaviour";
else
{
*errmsg = US"unsupported dnsdb defer behaviour";
- return DEFER;
+ rc = DEFER;
+ goto out;
}
}
else if (strncmpic(keystring, US"dnssec_", 7) == 0)
}
}
else if (strncmpic(keystring, US"dnssec_", 7) == 0)
@@
-205,7
+207,8
@@
for (;;)
else
{
*errmsg = US"unsupported dnsdb dnssec behaviour";
else
{
*errmsg = US"unsupported dnsdb dnssec behaviour";
- return DEFER;
+ rc = DEFER;
+ goto out;
}
}
else if (strncmpic(keystring, US"retrans_", 8) == 0)
}
}
else if (strncmpic(keystring, US"retrans_", 8) == 0)
@@
-214,7
+217,8
@@
for (;;)
if ((timeout_sec = readconf_readtime(keystring += 8, ',', FALSE)) <= 0)
{
*errmsg = US"unsupported dnsdb timeout value";
if ((timeout_sec = readconf_readtime(keystring += 8, ',', FALSE)) <= 0)
{
*errmsg = US"unsupported dnsdb timeout value";
- return DEFER;
+ rc = DEFER;
+ goto out;
}
dns_retrans = timeout_sec;
while (*keystring != ',') keystring++;
}
dns_retrans = timeout_sec;
while (*keystring != ',') keystring++;
@@
-225,7
+229,8
@@
for (;;)
if ((retries = (int)strtol(CCS keystring + 6, CSS &keystring, 0)) < 0)
{
*errmsg = US"unsupported dnsdb retry count";
if ((retries = (int)strtol(CCS keystring + 6, CSS &keystring, 0)) < 0)
{
*errmsg = US"unsupported dnsdb retry count";
- return DEFER;
+ rc = DEFER;
+ goto out;
}
dns_retry = retries;
}
}
dns_retry = retries;
}
@@
-236,7
+241,8
@@
for (;;)
if (*keystring++ != ',')
{
*errmsg = US"dnsdb modifier syntax error";
if (*keystring++ != ',')
{
*errmsg = US"dnsdb modifier syntax error";
- return DEFER;
+ rc = DEFER;
+ goto out;
}
while (isspace(*keystring)) keystring++;
}
}
while (isspace(*keystring)) keystring++;
}
@@
-264,7
+270,8
@@
if ((equals = Ustrchr(keystring, '=')) != NULL)
if (i >= nelem(type_names))
{
*errmsg = US"unsupported DNS record type";
if (i >= nelem(type_names))
{
*errmsg = US"unsupported DNS record type";
- return DEFER;
+ rc = DEFER;
+ goto out;
}
keystring = equals + 1;
}
keystring = equals + 1;
@@
-359,7
+366,8
@@
while ((domain = string_nextinlist(&keystring, &sep, NULL, 0)))
dns_retrans = save_retrans;
dns_retry = save_retry;
dns_init(FALSE, FALSE, FALSE); /* clr dnssec bit */
dns_retrans = save_retrans;
dns_retry = save_retry;
dns_init(FALSE, FALSE, FALSE); /* clr dnssec bit */
- return DEFER; /* always defer */
+ rc = DEFER; /* always defer */
+ goto out;
}
if (defer_mode == PASS) failrc = DEFER; /* defer only if all do */
continue; /* treat defer as fail */
}
if (defer_mode == PASS) failrc = DEFER; /* defer only if all do */
continue; /* treat defer as fail */
@@
-549,10
+557,18
@@
dns_retrans = save_retrans;
dns_retry = save_retry;
dns_init(FALSE, FALSE, FALSE); /* clear the dnssec bit for getaddrbyname */
dns_retry = save_retry;
dns_init(FALSE, FALSE, FALSE); /* clear the dnssec bit for getaddrbyname */
-if (!yield || !yield->ptr) return failrc;
+if (!yield || !yield->ptr)
+ rc = failrc;
+else
+ {
+ *result = string_from_gstring(yield);
+ rc = OK;
+ }
+
+out:
-
*result = string_from_gstring(yield
);
-return
OK
;
+
store_free_dns_answer(dnsa
);
+return
rc
;
}
}
@@
-565,12
+581,13
@@
return OK;
#include "../version.h"
#include "../version.h"
-void
-dnsdb_version_report(
FILE *f
)
+gstring *
+dnsdb_version_report(
gstring * g
)
{
#ifdef DYNLOOKUP
{
#ifdef DYNLOOKUP
-
fprintf(f
, "Library version: DNSDB: Exim version %s\n", EXIM_VERSION_STR);
+
g = string_fmt_append(g
, "Library version: DNSDB: Exim version %s\n", EXIM_VERSION_STR);
#endif
#endif
+return g;
}
}