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 ba8e44d8dc54b7c915737b72ebef0687683f6eb6..a58fa381b3ec804ae16ca046c13a2ebb6e351e10 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.1
 
 ! In dhclient check the data for some string options for

diff --git a/server/ddns.c b/server/ddns.c
index 99c087148c3bc0c27c91498aac9a5c07907cd8a1..4149494e0a7f12cb47a2352a69f280e0d8485e87 100644 (file)
--- a/server/ddns.c
+++ b/server/ddns.c
@@ -1592,8 +1592,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);