[master] Corrected reuse_lease debug log content

    Merges in rt38686

diff --git a/RELNOTES b/RELNOTES
index 9500ff2192a21f235ac1d6a45ba37bf7096b52f9..2bc6780f95609776e440e81f629a0809256d3fb3 100644 (file)
--- 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 7c5b7c776eaa200ef81657331a4034d69f5ec6bc..31706059981f0f4c20b8ac70699142ca1fc6b638 100644 (file)
--- 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;
                        }
                }