Remove DNS_DISPATCHATTR_MAKEQUERY

This attribute was set but was no longer being used.

diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index ce2a48c4d094dc8c205666269ac8e3bb58a1e275..d0a2895d01ad1198e405977f90e1cfd701628596 100644 (file)
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -937,8 +937,7 @@ setup_system(void) {
        set_source_ports(dispatchmgr);
 
        if (have_ipv6) {
-               attrs = (DNS_DISPATCHATTR_UDP | DNS_DISPATCHATTR_MAKEQUERY |
-                        DNS_DISPATCHATTR_IPV6);
+               attrs = (DNS_DISPATCHATTR_UDP | DNS_DISPATCHATTR_IPV6);
                isc_sockaddr_any6(&bind_any6);
                result = dns_dispatch_createudp(dispatchmgr, socketmgr, taskmgr,
                                                &bind_any6, 4, 2, 3, 5, attrs,
@@ -947,8 +946,7 @@ setup_system(void) {
        }
 
        if (have_ipv4) {
-               attrs = (DNS_DISPATCHATTR_UDP | DNS_DISPATCHATTR_MAKEQUERY |
-                        DNS_DISPATCHATTR_IPV4);
+               attrs = (DNS_DISPATCHATTR_UDP | DNS_DISPATCHATTR_IPV4);
                isc_sockaddr_any(&bind_any);
                result = dns_dispatch_createudp(dispatchmgr, socketmgr, taskmgr,
                                                &bind_any, 4, 2, 3, 5, attrs,

diff --git a/bin/tests/system/pipelined/pipequeries.c b/bin/tests/system/pipelined/pipequeries.c
index e8aa99dbd16ccdee815cdf26e2f1c4cfd3a2a6b5..0adf5036ff0f172d1557112557bcb41f4e81e8b2 100644 (file)
--- a/bin/tests/system/pipelined/pipequeries.c
+++ b/bin/tests/system/pipelined/pipequeries.c
@@ -275,9 +275,7 @@ main(int argc, char *argv[]) {
        RUNCHECK(isc_task_create(taskmgr, 0, &task));
        RUNCHECK(dns_dispatchmgr_create(mctx, &dispatchmgr));
 
-       attrs = DNS_DISPATCHATTR_UDP | DNS_DISPATCHATTR_MAKEQUERY |
-               DNS_DISPATCHATTR_IPV4;
-
+       attrs = DNS_DISPATCHATTR_UDP | DNS_DISPATCHATTR_IPV4;
        RUNCHECK(dns_dispatch_createudp(dispatchmgr, socketmgr, taskmgr,
                                        have_src ? &srcaddr : &bind_any, 4, 2,
                                        3, 5, attrs, &dispatchv4));

diff --git a/bin/tests/system/tkey/keycreate.c b/bin/tests/system/tkey/keycreate.c
index 1b9d50089314bd7f6b0de52a11bd075f2d86d3f5..b5ca6fdb4848a4f09bf74ffb365bf46072413d1c 100644 (file)
--- a/bin/tests/system/tkey/keycreate.c
+++ b/bin/tests/system/tkey/keycreate.c
@@ -241,8 +241,7 @@ main(int argc, char *argv[]) {
        RUNCHECK(dns_dispatchmgr_create(mctx, &dispatchmgr));
 
        isc_sockaddr_any(&bind_any);
-       attrs = DNS_DISPATCHATTR_UDP | DNS_DISPATCHATTR_MAKEQUERY |
-               DNS_DISPATCHATTR_IPV4;
+       attrs = DNS_DISPATCHATTR_UDP | DNS_DISPATCHATTR_IPV4;
        RUNCHECK(dns_dispatch_createudp(dispatchmgr, socketmgr, taskmgr,
                                        &bind_any, 4, 2, 3, 5, attrs,
                                        &dispatchv4));

diff --git a/bin/tests/system/tkey/keydelete.c b/bin/tests/system/tkey/keydelete.c
index eabb3f0c7e9bcffee7abea04f0275f42c1624c47..d4caf2940deeafbe1e881995512d38f569cd8449 100644 (file)
--- a/bin/tests/system/tkey/keydelete.c
+++ b/bin/tests/system/tkey/keydelete.c
@@ -184,8 +184,7 @@ main(int argc, char **argv) {
        RUNCHECK(isc_task_create(taskmgr, 0, &task));
        RUNCHECK(dns_dispatchmgr_create(mctx, &dispatchmgr));
        isc_sockaddr_any(&bind_any);
-       attrs = DNS_DISPATCHATTR_UDP | DNS_DISPATCHATTR_MAKEQUERY |
-               DNS_DISPATCHATTR_IPV4;
+       attrs = DNS_DISPATCHATTR_UDP | DNS_DISPATCHATTR_IPV4;
        RUNCHECK(dns_dispatch_createudp(dispatchmgr, socketmgr, taskmgr,
                                        &bind_any, 4, 2, 3, 5, attrs,
                                        &dispatchv4));

diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c
index d379285ed76178e4155e042e851591d85bfb76ed..4578fd947216dcf24814421aaf69735ed0a54b86 100644 (file)
--- a/bin/tools/mdig.c
+++ b/bin/tools/mdig.c
@@ -2128,7 +2128,7 @@ main(int argc, char *argv[]) {
        RUNCHECK(isc_task_create(taskmgr, 0, &task));
        RUNCHECK(dns_dispatchmgr_create(mctx, &dispatchmgr));
 
-       attrs = DNS_DISPATCHATTR_UDP | DNS_DISPATCHATTR_MAKEQUERY;
+       attrs = DNS_DISPATCHATTR_UDP;
        if (have_ipv4) {
                isc_sockaddr_any(&bind_any);
                attrs |= DNS_DISPATCHATTR_IPV4;

diff --git a/lib/dns/include/dns/dispatch.h b/lib/dns/include/dns/dispatch.h
index e4fc0cc72753d0b095d11a1e2bf50f9ec33fdf1d..dfae6ff87eed6a6a0f43a1da0952b0268555e307 100644 (file)
--- a/lib/dns/include/dns/dispatch.h
+++ b/lib/dns/include/dns/dispatch.h
@@ -114,17 +114,12 @@ struct dns_dispatchset {
  *
  * _IPV4, _IPV6
  *     The dispatcher uses an IPv4 or IPv6 socket.
- *
- * _MAKEQUERY
- *     The dispatcher can be used to issue queries to other servers, and
- *     accept replies from them.
  */
 #define DNS_DISPATCHATTR_PRIVATE   0x00000001U
 #define DNS_DISPATCHATTR_TCP      0x00000002U
 #define DNS_DISPATCHATTR_UDP      0x00000004U
 #define DNS_DISPATCHATTR_IPV4     0x00000008U
 #define DNS_DISPATCHATTR_IPV6     0x00000010U
-#define DNS_DISPATCHATTR_MAKEQUERY 0x00000040U
 #define DNS_DISPATCHATTR_CONNECTED 0x00000080U
 /*@}*/
 

diff --git a/lib/dns/request.c b/lib/dns/request.c
index a4ca668e18936efd8ae1c3160dc092bda7e9e57b..c9256377d31f89717fd7a04505fd2961c2710e37 100644 (file)
--- a/lib/dns/request.c
+++ b/lib/dns/request.c
@@ -556,7 +556,7 @@ create_tcp_dispatch(bool newtcp, dns_requestmgr_t *requestmgr,
                goto cleanup;
        }
 
-       attrs = DNS_DISPATCHATTR_TCP | DNS_DISPATCHATTR_MAKEQUERY;
+       attrs = DNS_DISPATCHATTR_TCP;
        if (isc_sockaddr_pf(destaddr) == AF_INET) {
                attrs |= DNS_DISPATCHATTR_IPV4;
        } else {

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 66bebaaa6f34bc72ddb26fd0ad54fcc6f8c813cb..14f82f3a73ed42ee4d00379a4d4e51c6feaeae7c 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -2999,8 +2999,7 @@ resquery_connected(isc_task_t *task, isc_event_t *event) {
                         */
                        attrs = DNS_DISPATCHATTR_TCP |
                                DNS_DISPATCHATTR_PRIVATE |
-                               DNS_DISPATCHATTR_CONNECTED |
-                               DNS_DISPATCHATTR_MAKEQUERY;
+                               DNS_DISPATCHATTR_CONNECTED;
                        if (isc_sockaddr_pf(&query->addrinfo->sockaddr) ==
                            AF_INET) {
                                attrs |= DNS_DISPATCHATTR_IPV4;