rpms/dnsmasq
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fixup! Ensure search_servers domain is set on dnssec

Browse Source 
Initialize TCP too.

Resolves: rhbz#2182342
This commit is contained in:
Petr Menšík 2023-05-05 18:06:09 +02:00
parent 73f4c86bcc
commit 0cac9fc28b
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dnsmasq-2.85-search_servers-rhbz2182342.patch
View File

@ -1,4 +1,4 @@
From b3784649cd26c6bd5ec96e84cba0ea7d57786acf Mon Sep 17 00:00:00 2001 From d75a9691edaa2b2efd8b51f2de492c62cb57c629 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com> From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Fri, 5 May 2023 17:51:56 +0200 Date: Fri, 5 May 2023 17:51:56 +0200
Subject: [PATCH] Ensure search_servers domain is set on dnssec Subject: [PATCH] Ensure search_servers domain is set on dnssec
@ -8,12 +8,14 @@ dnssec key or domain were not properly initialized always. It were read
anyway inside search_servers. Because it is changed only sometime, do anyway inside search_servers. Because it is changed only sometime, do
not use its value on the end of function. domain can be NULL only at not use its value on the end of function. domain can be NULL only at
that point, use that value right away. that point, use that value right away.
Include also TCP.
--- ---
src/forward.c | 4 ++-- src/forward.c | 6 +++---
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/forward.c b/src/forward.c diff --git a/src/forward.c b/src/forward.c
index b09dc96..345eff3 100644 index b09dc96..fffab7a 100644
--- a/src/forward.c --- a/src/forward.c
+++ b/src/forward.c +++ b/src/forward.c
@@ -250,7 +250,7 @@ static unsigned int search_servers(time_t now, union all_addr **addrpp, unsigned @@ -250,7 +250,7 @@ static unsigned int search_servers(time_t now, union all_addr **addrpp, unsigned
@ -34,6 +36,15 @@ index b09dc96..345eff3 100644
*new = *forward; /* copy everything, then overwrite */ *new = *forward; /* copy everything, then overwrite */
new->next = next; new->next = next;
@@ -1633,7 +1633,7 @@ static int tcp_key_recurse(time_t now, int status, struct dns_header *header, si
while (1)
{
int type = SERV_DO_DNSSEC;
- char *domain;
+ char *domain = NULL;
size_t m;
unsigned char c1, c2;
struct server *firstsendto = NULL;
-- --
2.40.1 2.40.1