summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Markwalder <tmark@isc.org>2015-02-16 13:25:25 -0500
committerThomas Markwalder <tmark@isc.org>2015-02-16 13:25:25 -0500
commit59990751bad8438d84d22a7f621ebc7746851cb9 (patch)
tree04023ede66231806165167b6f59bb62581900e7e
parentb8a437d331ca968896b2f08eb3b673be8c9b21e7 (diff)
downloadisc-dhcp-59990751bad8438d84d22a7f621ebc7746851cb9.tar.gz
[master] Corrected reuse_lease debug log contentv4_3_2rc1
Merges in rt38686
-rw-r--r--RELNOTES1
-rw-r--r--server/dhcp.c8
2 files changed, 6 insertions, 3 deletions
diff --git a/RELNOTES b/RELNOTES
index 9500ff21..2bc6780f 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 7c5b7c77..31706059 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;
}
}