CC: dot@dotat.at In-Reply-To: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RP_MATCHES_RCVD autolearn=ham autolearn_force=no version=3.4.0 X-Cam-Antivirus: no malware found References: Content-Type: text/plain; charset="utf-8" Message-ID: X-RT-Original-Encoding: utf-8 Received: from mx.pao1.isc.org (mx.pao1.isc.org [149.20.64.53]) by bugs.isc.org (Postfix) with ESMTP id C19302D20571 for ; Fri, 25 Jul 2014 14:45:32 +0000 (UTC) Received: from ppsw-50.csi.cam.ac.uk (ppsw-50-v6.csi.cam.ac.uk [IPv6:2001:630:212:8::e:f50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx.pao1.isc.org (Postfix) with ESMTPS id 490C93493C0 for ; Fri, 25 Jul 2014 14:45:30 +0000 (UTC) Received: from hermes-1.csi.cam.ac.uk ([131.111.8.51]:45753) by ppsw-50.csi.cam.ac.uk (smtp.hermes.cam.ac.uk [131.111.8.158]:25) with esmtpa (EXTERNAL:fanf2) id 1XAgkS-0000Zr-r2 (Exim 4.82_3-c0e5623) (return-path ); Fri, 25 Jul 2014 15:45:28 +0100 Received: from fanf2 by hermes-1.csi.cam.ac.uk (hermes.cam.ac.uk) with local id 1XAgkS-0002Ki-CZ (Exim 4.72) (return-path ); Fri, 25 Jul 2014 15:45:28 +0100 Delivered-To: bind9-bugs@bugs.isc.org Subject: [ISC-Bugs #36330] [PATCH 1/3] garbage collect unused NEEDEDNS0 flag Return-Path: X-Original-To: bind9-bugs@bugs.isc.org Sender: Tony Finch Date: Fri, 25 Jul 2014 15:21:30 +0100 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mx.pao1.isc.org To: bind9-bugs@isc.org X-Cam-Scannerinfo: http://www.cam.ac.uk/cs/email/scanner/ From: Tony Finch RT-Message-ID: Content-Length: 1381 --- 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.0.1