diff options
| author | Jakob Schlyter <jakob@cvs.openbsd.org> | 2003-03-05 09:18:34 +0000 |
|---|---|---|
| committer | Jakob Schlyter <jakob@cvs.openbsd.org> | 2003-03-05 09:18:34 +0000 |
| commit | 5fe881b69c4379f44409e1d128644b2840776ed1 (patch) | |
| tree | 4613ed7799f42fcfcee82b1f8f443ed5f4a6ac16 /usr.sbin/bind/bin/named | |
| parent | f2f34adca78d50a267ff3043116f20c1b9b0e518 (diff) | |
update to BIND 9.2.2-release. ok millert@
Diffstat (limited to 'usr.sbin/bind/bin/named')
| -rw-r--r-- | usr.sbin/bind/bin/named/client.c | 8 | ||||
| -rw-r--r-- | usr.sbin/bind/bin/named/lwresd.html | 4 | ||||
| -rw-r--r-- | usr.sbin/bind/bin/named/named.html | 4 | ||||
| -rw-r--r-- | usr.sbin/bind/bin/named/query.c | 6 | ||||
| -rw-r--r-- | usr.sbin/bind/bin/named/server.c | 14 |
5 files changed, 25 insertions, 11 deletions
diff --git a/usr.sbin/bind/bin/named/client.c b/usr.sbin/bind/bin/named/client.c index 6b9695f8718..0a73e2d0ab1 100644 --- a/usr.sbin/bind/bin/named/client.c +++ b/usr.sbin/bind/bin/named/client.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2002 Internet Software Consortium. + * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $ISC: client.c,v 1.176.2.11 2002/04/23 01:53:53 marka Exp $ */ +/* $ISC: client.c,v 1.176.2.11.4.2 2003/02/17 07:05:04 marka Exp $ */ #include <config.h> @@ -1014,7 +1014,11 @@ client_addopt(ns_client_t *client) { /* * Set EXTENDED-RCODE, VERSION, and Z to 0. */ +#ifdef ISC_RFC2535 rdatalist->ttl = (client->extflags & DNS_MESSAGEEXTFLAG_REPLYPRESERVE); +#else + rdatalist->ttl = 0; +#endif /* * No ENDS options in the default case. diff --git a/usr.sbin/bind/bin/named/lwresd.html b/usr.sbin/bind/bin/named/lwresd.html index 2f569391e99..32bfe1c65e0 100644 --- a/usr.sbin/bind/bin/named/lwresd.html +++ b/usr.sbin/bind/bin/named/lwresd.html @@ -20,7 +20,7 @@ >lwresd</TITLE ><META NAME="GENERATOR" -CONTENT="Modular DocBook HTML Stylesheet Version 1.61 +CONTENT="Modular DocBook HTML Stylesheet Version 1.73 "></HEAD ><BODY CLASS="REFENTRY" @@ -535,4 +535,4 @@ NAME="AEN162" ></DIV ></BODY ></HTML ->
\ No newline at end of file +> diff --git a/usr.sbin/bind/bin/named/named.html b/usr.sbin/bind/bin/named/named.html index 4a1a1f50216..28a14d3b637 100644 --- a/usr.sbin/bind/bin/named/named.html +++ b/usr.sbin/bind/bin/named/named.html @@ -20,7 +20,7 @@ >named</TITLE ><META NAME="GENERATOR" -CONTENT="Modular DocBook HTML Stylesheet Version 1.61 +CONTENT="Modular DocBook HTML Stylesheet Version 1.73 "></HEAD ><BODY CLASS="REFENTRY" @@ -627,4 +627,4 @@ NAME="AEN182" ></DIV ></BODY ></HTML ->
\ No newline at end of file +> diff --git a/usr.sbin/bind/bin/named/query.c b/usr.sbin/bind/bin/named/query.c index d4344c882cb..018d71f737b 100644 --- a/usr.sbin/bind/bin/named/query.c +++ b/usr.sbin/bind/bin/named/query.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2002 Internet Software Consortium. + * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $ISC: query.c,v 1.198.2.8 2002/08/02 04:17:21 marka Exp $ */ +/* $ISC: query.c,v 1.198.2.8.4.2 2003/02/17 07:05:04 marka Exp $ */ #include <config.h> @@ -3300,9 +3300,11 @@ ns_query_start(ns_client_t *client) { if ((message->flags & DNS_MESSAGEFLAG_RD) != 0) client->query.attributes |= NS_QUERYATTR_WANTRECURSION; +#ifdef ISC_RFC2535 if ((client->extflags & DNS_MESSAGEEXTFLAG_DO) != 0 || (message->flags & DNS_MESSAGEFLAG_AD) != 0) client->query.attributes |= NS_QUERYATTR_WANTDNSSEC; +#endif if (client->view->minimalresponses) client->query.attributes |= (NS_QUERYATTR_NOAUTHORITY | diff --git a/usr.sbin/bind/bin/named/server.c b/usr.sbin/bind/bin/named/server.c index 708e801354f..cdfd6760c8b 100644 --- a/usr.sbin/bind/bin/named/server.c +++ b/usr.sbin/bind/bin/named/server.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2002 Internet Software Consortium. + * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $ISC: server.c,v 1.339.2.8 2002/07/10 04:27:23 marka Exp $ */ +/* $ISC: server.c,v 1.339.2.8.4.3 2003/02/18 03:27:58 marka Exp $ */ #include <config.h> @@ -163,6 +163,7 @@ configure_view_acl(cfg_obj_t *vconfig, cfg_obj_t *config, return (result); } +#ifdef ISC_RFC2335 static isc_result_t configure_view_dnsseckey(cfg_obj_t *vconfig, cfg_obj_t *key, dns_keytable_t *keytable, isc_mem_t *mctx) @@ -258,6 +259,7 @@ configure_view_dnsseckey(cfg_obj_t *vconfig, cfg_obj_t *key, return (result); } +#endif /* * Configure DNSSEC keys for a view. Currently used only for @@ -271,15 +273,21 @@ configure_view_dnsseckeys(cfg_obj_t *vconfig, cfg_obj_t *config, isc_mem_t *mctx, dns_keytable_t **target) { isc_result_t result; +#ifdef ISC_RFC2535 cfg_obj_t *keys = NULL; cfg_obj_t *voptions = NULL; cfg_listelt_t *element, *element2; cfg_obj_t *keylist; cfg_obj_t *key; +#endif dns_keytable_t *keytable = NULL; CHECK(dns_keytable_create(mctx, &keytable)); +#ifndef ISC_RFC2535 + UNUSED(vconfig); + UNUSED(config); +#else if (vconfig != NULL) voptions = cfg_tuple_get(vconfig, "options"); @@ -303,7 +311,7 @@ configure_view_dnsseckeys(cfg_obj_t *vconfig, cfg_obj_t *config, keytable, mctx)); } } - +#endif dns_keytable_detach(target); *target = keytable; /* Transfer ownership. */ keytable = NULL; |