From 4e167e5c657e001c0691a4c1d72e82eb0de7025b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0pa=C4=8Dek?= Date: Sat, 1 Nov 2025 18:35:35 -0400 Subject: [PATCH] Remove leftover FCTX_ATTR_NEEDEDNS0 This is leftover from commit b6309ed962c4988a314d61742c4fbc4935467d68 which removed support for bitstring labels back in 2002. --- lib/dns/resolver.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index 3d915b95f2..85019613fb 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -496,7 +496,6 @@ struct fetchctx { #define FCTX_ATTR_ADDRWAIT 0x0004 #define FCTX_ATTR_WANTCACHE 0x0010 #define FCTX_ATTR_WANTNCACHE 0x0020 -#define FCTX_ATTR_NEEDEDNS0 0x0040 #define FCTX_ATTR_TRIEDFIND 0x0080 #define FCTX_ATTR_TRIEDALT 0x0100 @@ -511,8 +510,6 @@ struct fetchctx { ((atomic_load_acquire(&(f)->attributes) & FCTX_ATTR_WANTCACHE) != 0) #define WANTNCACHE(f) \ ((atomic_load_acquire(&(f)->attributes) & FCTX_ATTR_WANTNCACHE) != 0) -#define NEEDEDNS0(f) \ - ((atomic_load_acquire(&(f)->attributes) & FCTX_ATTR_NEEDEDNS0) != 0) #define TRIEDFIND(f) \ ((atomic_load_acquire(&(f)->attributes) & FCTX_ATTR_TRIEDFIND) != 0) #define TRIEDALT(f) \ @@ -2643,15 +2640,6 @@ resquery_send(resquery_t *query) { */ query->udpsize = udpsize; - /* - * If we need EDNS0 to do this query and aren't using it, we - * lose. - */ - if (NEEDEDNS0(fctx) && (query->options & DNS_FETCHOPT_NOEDNS0) != 0) { - result = DNS_R_SERVFAIL; - goto cleanup_message; - } - add_triededns(fctx, &query->addrinfo->sockaddr); /*