diff options
| author | Lennart Poettering <lennart@poettering.net> | 2021-03-05 17:47:45 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-05-15 21:19:27 +0200 |
| commit | 0e1e59674da060af421aed4f2a6a97b899e20054 (patch) | |
| tree | 3dba401dfe9cb3625da1814b411ac7653c8aec74 | |
| parent | c8d7fab2286384b19ff6328cece107c4c02d7bb8 (diff) | |
| download | systemd-247.7.tar.gz | |
dns-query: export CNAME_MAX, so that we can use it in other files, toov247.7
Let's rename it a bit, to be more explanatory while exporting it.
(And let's bump the CNAME limit to 16 — 8 just sounded so little)
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1949670.
(cherry picked from commit e0ae456a554d0fce250f9a009c561b97f20c41f8)
| -rw-r--r-- | src/resolve/resolved-dns-query.c | 3 | ||||
| -rw-r--r-- | src/resolve/resolved-dns-query.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/resolve/resolved-dns-query.c b/src/resolve/resolved-dns-query.c index 65a0a73cb8..fb94554358 100644 --- a/src/resolve/resolved-dns-query.c +++ b/src/resolve/resolved-dns-query.c @@ -10,7 +10,6 @@ #include "resolved-etc-hosts.h" #include "string-util.h" -#define CNAME_MAX 8 #define QUERIES_MAX 2048 #define AUXILIARY_QUERIES_MAX 64 @@ -912,7 +911,7 @@ static int dns_query_cname_redirect(DnsQuery *q, const DnsResourceRecord *cname) assert(q); q->n_cname_redirects++; - if (q->n_cname_redirects > CNAME_MAX) + if (q->n_cname_redirects > CNAME_REDIRECT_MAX) return -ELOOP; r = dns_question_cname_redirect(q->question_idna, cname, &nq_idna); diff --git a/src/resolve/resolved-dns-query.h b/src/resolve/resolved-dns-query.h index 133076dbf0..c6b918a5f7 100644 --- a/src/resolve/resolved-dns-query.h +++ b/src/resolve/resolved-dns-query.h @@ -128,3 +128,5 @@ const char *dns_query_string(DnsQuery *q); DEFINE_TRIVIAL_CLEANUP_FUNC(DnsQuery*, dns_query_free); bool dns_query_fully_authenticated(DnsQuery *q); + +#define CNAME_REDIRECT_MAX 16 |