[master] Correct BIND9 dns API call constant

    Merges in rt47757

diff --git a/RELNOTES b/RELNOTES
index 331f3fd467ecb47d0b565e4947bc05b1b81c0112..04fd0ee7e0efe93ead621349b3ec4b0b231379cb 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -87,9 +87,21 @@ ISC DHCP is open source software maintained by Internet Systems
 Consortium.  This product includes cryptographic software written
 by Eric Young (eay@cryptsoft.com).
 
-            Changes since 4.4.0 (New Features)
+               Changes since 4.4.1 (New Features)
 - none
-                   Changes since 4.4.0 (Bug Fixes)
+
+               Changes since 4.4.1 (Bug Fixes)
+
+- Corrected a misuse of the BIND9 DDNS API which caused DDNS updates to be
+  carried out over TCP rather than UDP. The coding error was exposed by
+  migration to BIND9 9.11.  Thanks to Jinmei Tatuya at Infoblox for
+  reporting the issue.
+  [ISC-Bugs #47757]
+
+               Changes since 4.4.0 (New Features)
+- none
+
+               Changes since 4.4.0 (Bug Fixes)
 
 - A delayed-ack value of 0 (the default), now correctly disables the delayed
   feature.  A change in 4.4.0 prohibited lease updates marking leases active

diff --git a/common/dns.c b/common/dns.c
index 44c42582ccfa0f388c74a85c5adcb793afc6eb70..bcebc63568a83dd7ca51d55dbac434b1ea667af8 100644 (file)
--- a/common/dns.c
+++ b/common/dns.c
@@ -2708,7 +2708,7 @@ ddns_modify_fwd(dhcp_ddns_cb_t *ddns_cb, const char *file, int line)
                             dns_rdataclass_in, zname,
                             &prereqlist, &updatelist,
                             zlist, tsec_key,
-                            DNS_CLIENTRESOPT_ALLOWRUN,
+                            DNS_CLIENTUPDOPT_ALLOWRUN,
                             dhcp_gbl_ctx.task,
                             ddns_interlude,
                             (void *)ddns_cb,
@@ -2903,7 +2903,7 @@ ddns_modify_ptr(dhcp_ddns_cb_t *ddns_cb, const char *file, int line)
                             dns_rdataclass_in, zname,
                             NULL, &updatelist,
                             zlist, tsec_key,
-                            DNS_CLIENTRESOPT_ALLOWRUN,
+                            DNS_CLIENTUPDOPT_ALLOWRUN,
                             dhcp_gbl_ctx.task,
                             ddns_interlude, (void *)ddns_cb,
                             &ddns_cb->transaction);