From: Thomas Markwalder <tmark@isc.org>
Date: Fri, 25 Sep 2015 14:04:50 +0000 (-0400)
Subject: [master] Added lease address to reuse lease log message
X-Git-Tag: v4_3_4~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20931f53c75579bc6f55c69d942e3ee91c2d9441;p=thirdparty%2Fdhcp.git

[master] Added lease address to reuse lease log message

    Merged in rt40598.
---

diff --git a/RELNOTES b/RELNOTES
index fb0ba6610..e50922d0f 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -54,8 +54,12 @@ by Eric Young (eay@cryptsoft.com).
 
 			Changes since 4.3.3
 
+- Added the lease address to the end of the debug level log message
+  emitted when an existing lease is renewed within the dhcp-cache-threshold.
+  [ISC-Bugs #40598]
+
 - Corrected compilation errors that prohibited building the server
-  and its ATF unit tests when failover disabled.
+  and its ATF unit tests when failover is disabled.
   [ISC-Bugs #40372]
 
 - Fixed several potential null references.  Thanks to Bill Parker
diff --git a/server/dhcp.c b/server/dhcp.c
index 7ebcfeb15..5969895cf 100644
--- a/server/dhcp.c
+++ b/server/dhcp.c
@@ -5259,8 +5259,8 @@ reuse_lease (struct packet* packet,
 				/* We're cleared to reuse it */
 				log_debug("reuse_lease: lease age %ld (secs)"
 					  " under %d%% threshold, reply with "
-					  "unaltered, existing lease",
-					  lease_age, thresh);
+					  "unaltered, existing lease for %s",
+					  lease_age, thresh, piaddr(lease->ip_addr));
 
 				reusable = 1;
 			}