Fix the code that checks for an existing DDNS transaction to cancel

when removing DDNS information, so that we will continue with the
processing if we have a lease even if it doesn't have an outstanding
transaction.  [ISC-Bugs #24682]

diff --git a/RELNOTES b/RELNOTES
index d5343973c2780692fe77c853ff955c2a7d4f8729..101cd65f59156094bba96007e4be5c5a7f48122b 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -39,6 +39,13 @@ The system has only been tested on Linux, FreeBSD, and Solaris, and may not
 work on other platforms. Please report any problems and suggested fixes to
 <dhcp-users@isc.org>.
 
+                       Changes since 4.2.2
+
+- Fix the code that checks for an existing DDNS transaction to cancel
+  when removing DDNS information, so that we will continue with the
+  processing if we have a lease even if it doesn't have an outstanding
+  transaction.  [ISC-Bugs #24682]
+
                        Changes since 4.2.2rc1
 
 ! Two packets were found that cause a server to halt.  The code

diff --git a/server/ddns.c b/server/ddns.c
index b1683c39a45efe6678cea69fd41e6ab308673f9d..cc2486bd1f41c8c31cc1da7f0c3c1567c228cd9a 100644 (file)
--- a/server/ddns.c
+++ b/server/ddns.c
@@ -1591,8 +1591,7 @@ ddns_removals(struct lease    *lease,
        } else if ((lease6 != NULL) && (lease6->ddns_cb != NULL)) {
                ddns_cancel(lease6->ddns_cb);
                lease6->ddns_cb = NULL;
-       } else
-               goto cleanup;
+       }
 
        /* allocate our control block */
        ddns_cb = ddns_cb_alloc(MDL);