- A cosmetic bug in DHCPDECLINE processing was fixed which caused all

  successful DHCPDECLINEs to be logged as "not found" rather than
  "abandoned".  [ISC-Bugs #18605]

diff --git a/RELNOTES b/RELNOTES
index 08411706a19c067f41540be349e46c9fcda45312..ea8b5ca66cf4baed21a0ea1d1e2b30a32255a20a 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -48,6 +48,12 @@ work on other platforms. Please report any problems and suggested fixes to
 <dhcp-users@isc.org>.
 
 
+                       Changes since 4.1.0a2
+
+- A cosmetic bug in DHCPDECLINE processing was fixed which caused all
+  successful DHCPDECLINEs to be logged as "not found" rather than
+  "abandoned".
+
                        Changes since 4.1.0a1
 
 - Corrected list of failover state values in dhcpd man page.

diff --git a/server/dhcp.c b/server/dhcp.c
index 72e34382ce3af053396a1b4cf6e66766ed136ebe..d26fc0002ae47a4b86ca8de97506aeacb18d44fe 100644 (file)
--- a/server/dhcp.c
+++ b/server/dhcp.c
@@ -917,8 +917,9 @@ void dhcpdecline (packet, ms_nulltp)
 
                abandon_lease (lease, "declined.");
                status = "abandoned";
+           } else {
+               status = "not found";
            }
-           status = "not found";
        } else
            status = "ignored";