summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn Routhier <sar@isc.org>2012-06-06 00:24:02 +0000
committerShawn Routhier <sar@isc.org>2012-06-06 00:24:02 +0000
commit654f3a7a6018d3a0d76d09e54ef607b592addc62 (patch)
treea595163659894bb0a267516fbb559d2b63dfdcb0
parent12eb3b58d61563e525341172f870a14b918d613c (diff)
downloadisc-dhcp-654f3a7a6018d3a0d76d09e54ef607b592addc62.tar.gz
Correct code to calculate timing values in client to compare
rebind value to infinity instead of renew value. [ISC-Bugs #29062]
-rw-r--r--RELNOTES12
-rw-r--r--client/dhc6.c3
2 files changed, 14 insertions, 1 deletions
diff --git a/RELNOTES b/RELNOTES
index 18133167..2fca7f46 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -39,6 +39,18 @@ The system has only been tested on Linux, FreeBSD, and Solaris, and may not
work on other platforms. Please report any problems and suggested fixes to
<dhcp-users@isc.org>.
+ Changes since 4.2.4
+
+- Correct code to calculate timing values in client to compare
+ rebind value to infinity instead of renew value.
+ Thanks to Chenda Huang from H3C Technologies Co., Limited
+ for reporting this issue.
+ [ISC-Bugs #29062]
+
+ Changes since 4.2.4rc2
+
+- None
+
Changes since 4.2.4rc1
- Rotate the lease file when running in v6 mode.
diff --git a/client/dhc6.c b/client/dhc6.c
index 633f9b1a..eb019c87 100644
--- a/client/dhc6.c
+++ b/client/dhc6.c
@@ -1,6 +1,7 @@
/* dhc6.c - DHCPv6 client routines. */
/*
+ * Copyright (c) 2012 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 2006-2010 by Internet Systems Consortium, Inc. ("ISC")
*
* Permission to use, copy, modify, and distribute this software for any
@@ -4023,7 +4024,7 @@ dhc6_check_times(struct client_state *client)
/* Set rebind to 3/4 expiration interval. */
tmp = ia->starts;
tmp += use_expire + (use_expire / 2);
- } else if (ia->renew == 0xffffffff)
+ } else if (ia->rebind == 0xffffffff)
tmp = MAX_TIME;
else
tmp = ia->starts + ia->rebind;