From 59990751bad8438d84d22a7f621ebc7746851cb9 Mon Sep 17 00:00:00 2001 From: Thomas Markwalder Date: Mon, 16 Feb 2015 13:25:25 -0500 Subject: [PATCH] [master] Corrected reuse_lease debug log content Merges in rt38686 --- RELNOTES | 1 + server/dhcp.c | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) 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; } } -- 2.47.3