From: David Hankins <dhankins@isc.org>
Date: Thu, 11 Sep 2008 16:11:46 +0000 (+0000)
Subject: - A cosmetic bug in DHCPDECLINE processing was fixed which caused all
X-Git-Tag: v4_1_0b1~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4ffedd162fa7baf2c0a29d6fdff786000ba7e7c;p=thirdparty%2Fdhcp.git

- 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 08411706a..ea8b5ca66 100644
--- 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 72e34382c..d26fc0002 100644
--- 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";