[PATCH 1/3] garbage collect unused NEEDEDNS0 flag

Tony Finch dot at dotat.at
Mon Jul 28 11:17:01 UTC 2014


---
 lib/dns/resolver.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 8ef2c5b..e6e5315 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -331,7 +331,6 @@ struct fetchctx {
 #define FCTX_ATTR_SHUTTINGDOWN          0x0008
 #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

@@ -345,7 +344,6 @@ struct fetchctx {
 				 != 0)
 #define WANTCACHE(f)            (((f)->attributes & FCTX_ATTR_WANTCACHE) != 0)
 #define WANTNCACHE(f)           (((f)->attributes & FCTX_ATTR_WANTNCACHE) != 0)
-#define NEEDEDNS0(f)            (((f)->attributes & FCTX_ATTR_NEEDEDNS0) != 0)
 #define TRIEDFIND(f)            (((f)->attributes & FCTX_ATTR_TRIEDFIND) != 0)
 #define TRIEDALT(f)             (((f)->attributes & FCTX_ATTR_TRIEDALT) != 0)

@@ -2161,14 +2159,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;
-	}
-
 	if (udpsize > 512U)
 		add_triededns(fctx, &query->addrinfo->sockaddr);

-- 
2.1.0.rc0.187.g3b9072a




More information about the bind-workers mailing list