From: Thomas Markwalder <tmark@isc.org>
Date: Mon, 16 Feb 2015 18:25:25 +0000 (-0500)
Subject: [master] Corrected reuse_lease debug log content
X-Git-Tag: v4_3_2rc1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59990751bad8438d84d22a7f621ebc7746851cb9;p=thirdparty%2Fdhcp.git

[master] Corrected reuse_lease debug log content

    Merges in rt38686
---

diff --git a/RELNOTES b/RELNOTES
index 9500ff219..2bc6780f9 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -186,6 +186,7 @@ by Eric Young (eay@cryptsoft.com).
   the existing lease and the forward DNS name had not changed.  This has been
   corrected.
   [ISC-Bugs #37368]
+  [ISC-Bugs #38686]
 
 - Corrected an issue which caused dhclient to incorrectly form the result when
   prepending or appending to the IPv4 domain-search option, received from the
diff --git a/server/dhcp.c b/server/dhcp.c
index 7c5b7c776..317060599 100644
--- a/server/dhcp.c
+++ b/server/dhcp.c
@@ -5229,9 +5229,11 @@ reuse_lease (struct packet* packet,
 				}
 
 				/* We're cleared to reuse it */
-				log_debug("reuse_lease: lease age %ld"
-					  " under %d%% limit, reusing it",
-					  lease_age, limit);
+				log_debug("reuse_lease: lease age %ld (secs)"
+					  " under %d%% threshold, reply with "
+					  "unaltered, existing lease",
+					  lease_age, thresh);
+
 				reusable = 1;
 			}
 		}