Commit 773e64ec authored by Mark Andrews's avatar Mark Andrews
Browse files

try-edns is no more

parent e2099424
......@@ -428,7 +428,7 @@
972. [bug] The file modification time code in zone.c was using the
wrong epoch. [RT #1667]
971. [func] 'try-edns' can be use to disable edns on all queries.
971. [placeholder]
970. [func] 'max-journal-size' can now be used to set a target
size for a journal.
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: config.c,v 1.18 2001/11/07 03:52:15 marka Exp $ */
/* $Id: config.c,v 1.19 2001/11/07 04:25:11 marka Exp $ */
#include <config.h>
......@@ -101,7 +101,6 @@ options {\n\
recursion true;\n\
provide-ixfr true;\n\
request-ixfr true;\n\
try-edns true;\n\
fetch-glue no;\n\
rfc2308-type1 no;\n\
additional-from-auth true;\n\
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: query.c,v 1.210 2001/10/29 19:02:48 gson Exp $ */
/* $Id: query.c,v 1.211 2001/11/07 04:25:12 marka Exp $ */
#include <config.h>
......@@ -2110,7 +2110,6 @@ query_recurse(ns_client_t *client, dns_rdatatype_t qtype, dns_name_t *qdomain,
{
isc_result_t result;
dns_rdataset_t *rdataset, *sigrdataset;
unsigned int options;
inc_stats(client, dns_statscounter_recursion);
......@@ -2172,13 +2171,10 @@ query_recurse(ns_client_t *client, dns_rdatatype_t qtype, dns_name_t *qdomain,
if (client->query.timerset == ISC_FALSE)
ns_client_settimeout(client, 60);
options = client->query.fetchoptions;
if (!client->view->tryedns)
options |= DNS_FETCHOPT_NOEDNS0;
result = dns_resolver_createfetch(client->view->resolver,
client->query.qname,
qtype, qdomain, nameservers,
NULL, options,
NULL, client->query.fetchoptions,
client->task,
query_resume, client,
rdataset, sigrdataset,
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: server.c,v 1.359 2001/11/07 03:52:16 marka Exp $ */
/* $Id: server.c,v 1.360 2001/11/07 04:25:13 marka Exp $ */
#include <config.h>
......@@ -827,11 +827,6 @@ configure_view(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig,
CHECK(configure_view_acl(vconfig, config, "sortlist",
actx, ns_g_mctx, &view->sortlist));
obj = NULL;
result = ns_config_get(maps, "try-edns", &obj);
INSIST(result == ISC_R_SUCCESS);
view->tryedns = cfg_obj_asboolean(obj);
obj = NULL;
result = ns_config_get(maps, "request-ixfr", &obj);
INSIST(result == ISC_R_SUCCESS);
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: adb.c,v 1.188 2001/11/05 20:02:41 gson Exp $ */
/* $Id: adb.c,v 1.189 2001/11/07 04:25:15 marka Exp $ */
/*
* Implementation notes
......@@ -1612,7 +1612,6 @@ a6missing(dns_a6context_t *a6ctx, dns_name_t *a6name) {
dns_adb_t *adb;
dns_adbfetch6_t *fetch;
isc_result_t result;
unsigned int options = 0;
name = a6ctx->arg;
INSIST(DNS_ADBNAME_VALID(name));
......@@ -1625,11 +1624,9 @@ a6missing(dns_a6context_t *a6ctx, dns_name_t *a6name) {
return;
}
if (!adb->view->tryedns)
options |= DNS_FETCHOPT_NOEDNS0;
result = dns_resolver_createfetch(adb->view->resolver, a6name,
dns_rdatatype_a6,
NULL, NULL, NULL, options,
NULL, NULL, NULL, 0,
adb->task, fetch_callback_a6,
name, &fetch->rdataset, NULL,
&fetch->fetch);
......@@ -3787,8 +3784,6 @@ fetch_name_v4(dns_adbname_t *adbname, isc_boolean_t start_at_root) {
goto cleanup;
}
if (!adb->view->tryedns)
options |= DNS_FETCHOPT_NOEDNS0;
result = dns_resolver_createfetch(adb->view->resolver, &adbname->name,
dns_rdatatype_a,
name, nameservers, NULL, options,
......@@ -3816,7 +3811,6 @@ fetch_name_aaaa(dns_adbname_t *adbname) {
isc_result_t result;
dns_adbfetch_t *fetch;
dns_adb_t *adb;
unsigned int options = 0;
INSIST(DNS_ADBNAME_VALID(adbname));
adb = adbname->adb;
......@@ -3832,11 +3826,9 @@ fetch_name_aaaa(dns_adbname_t *adbname) {
goto cleanup;
}
if (!adb->view->tryedns)
options |= DNS_FETCHOPT_NOEDNS0;
result = dns_resolver_createfetch(adb->view->resolver, &adbname->name,
dns_rdatatype_aaaa,
NULL, NULL, NULL, options,
NULL, NULL, NULL, 0,
adb->task, fetch_callback,
adbname, &fetch->rdataset, NULL,
&fetch->fetch);
......@@ -3895,8 +3887,6 @@ fetch_name_a6(dns_adbname_t *adbname, isc_boolean_t start_at_root) {
}
fetch->flags |= FETCH_FIRST_A6;
if (!adb->view->tryedns)
options |= DNS_FETCHOPT_NOEDNS0;
result = dns_resolver_createfetch(adb->view->resolver, &adbname->name,
dns_rdatatype_a6,
name, nameservers, NULL, options,
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: view.h,v 1.74 2001/08/30 05:52:16 marka Exp $ */
/* $Id: view.h,v 1.75 2001/11/07 04:25:18 marka Exp $ */
#ifndef DNS_VIEW_H
#define DNS_VIEW_H 1
......@@ -113,7 +113,6 @@ struct dns_view {
dns_acl_t * sortlist;
isc_boolean_t requestixfr;
isc_boolean_t provideixfr;
isc_boolean_t tryedns;
dns_ttl_t maxcachettl;
dns_ttl_t maxncachettl;
in_port_t dstport;
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: view.c,v 1.105 2001/10/25 04:57:43 marka Exp $ */
/* $Id: view.c,v 1.106 2001/11/07 04:25:17 marka Exp $ */
#include <config.h>
......@@ -158,7 +158,6 @@ dns_view_create(isc_mem_t *mctx, dns_rdataclass_t rdclass,
view->maxcachettl = 7 * 24 * 3600;
view->maxncachettl = 3 * 3600;
view->dstport = 53;
view->tryedns = ISC_TRUE;
result = dns_peerlist_new(view->mctx, &view->peers);
if (result != ISC_R_SUCCESS)
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: parser.c,v 1.89 2001/11/07 03:52:20 marka Exp $ */
/* $Id: parser.c,v 1.90 2001/11/07 04:25:19 marka Exp $ */
#include <config.h>
......@@ -908,7 +908,6 @@ view_clauses[] = {
{ "recursion", &cfg_type_boolean, 0 },
{ "provide-ixfr", &cfg_type_boolean, 0 },
{ "request-ixfr", &cfg_type_boolean, 0 },
{ "try-edns", &cfg_type_boolean, 0 },
{ "fetch-glue", &cfg_type_boolean, CFG_CLAUSEFLAG_OBSOLETE },
{ "rfc2308-type1", &cfg_type_boolean, CFG_CLAUSEFLAG_NYI },
{ "additional-from-auth", &cfg_type_boolean, 0 },
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment