From: Roy Marples <roy@marples.name>
Date: Tue, 11 Aug 2009 20:13:58 +0000 (+0000)
Subject: Fix timeout of 0 disabling the timeout.
X-Git-Tag: v5.1.0~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=593243fe16364f43af4cf7f056656fb26275a3ae;p=thirdparty%2Fdhcpcd.git

Fix timeout of 0 disabling the timeout.
---

diff --git a/dhcpcd.c b/dhcpcd.c
index 9bdb8c1c..5dc46a9f 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -1753,7 +1753,7 @@ main(int argc, char **argv)
 	    (ifc == 0 && options & DHCPCD_LINK && options & DHCPCD_DAEMONISE))
 	{
 		daemonise();
-	} else if (options & DHCPCD_DAEMONISE) {
+	} else if (options & DHCPCD_DAEMONISE && ifo->timeout > 0) {
 		oi = ifo->timeout;
 		if (ifo->options & DHCPCD_IPV4LL)
 			oi += 10;