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

Fix timeout of 0 disabling the timeout.
---

diff --git a/dhcpcd.c b/dhcpcd.c
index 52c7fa2d..716b5ef6 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -1752,7 +1752,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;