commit 6d8dee6d685f2c0cdd55424bf5dde32349cf1d3e
author goldsimon <goldsimon@gmx.de> Wed Sep 26 21:30:01 2012 +0200
committer goldsimon <goldsimon@gmx.de> Wed Sep 26 22:07:06 2012 +0200
tree fce13f314d857df7a5020fd125b380a3538e2376
parent 3db149b42e5b0aadccb7f35519cde2c96bf2314b

Added brackets, completed CHANGELOG

CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index fc6d1e9..f7cf259 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -67,6 +67,9 @@
  ++ Bugfixes:
 
   2012-09-26: patch by Henrik Persson
+  * dhcp.c: patch #7843 Fix corner case with dhcp timeouts
+
+  2012-09-26: patch by Henrik Persson
   * dhcp.c: patch #7840 Segfault in dhcp_parse_reply if no end marker in dhcp packet
 
   2012-08-22: Simon Goldschmidt

src/core/dhcp.c

diff --git a/src/core/dhcp.c b/src/core/dhcp.c
index 071190d..eb12c55 100644
--- a/src/core/dhcp.c
+++ b/src/core/dhcp.c
@@ -963,7 +963,7 @@
   }
 
   /* If we have sub 1 minute lease, t2 and t1 will kick in at the same time. */
-  if (dhcp->t1_timeout >= dhcp->t2_timeout && dhcp->t2_timeout > 0) {
+  if ((dhcp->t1_timeout >= dhcp->t2_timeout) && (dhcp->t2_timeout > 0)) {
     dhcp->t1_timeout = 0;
   }