From: Roy Marples <roy@marples.name>
Date: Fri, 30 Apr 2010 18:39:24 +0000 (+0000)
Subject: Always respect the timeout.
X-Git-Tag: v5.2.3~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=daf6e6a6b42d1e1a18e460ff1246719caa0d3286;p=thirdparty%2Fdhcpcd.git

Always respect the timeout.
---

diff --git a/dhcpcd.c b/dhcpcd.c
index 007c71ce..16903ed6 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -1883,10 +1883,7 @@ main(int argc, char **argv)
 		{
 			syslog(LOG_WARNING, "no interfaces have a carrier");
 			daemonise();
-		} else if (ifo->timeout > 0 &&
-			   (options & DHCPCD_DAEMONISE ||
-			    options & DHCPCD_TEST))
-		{
+		} else if (ifo->timeout > 0) {
 			if (options & DHCPCD_IPV4LL)
 				options |= DHCPCD_TIMEOUT_IPV4LL;
 			add_timeout_sec(ifo->timeout, handle_exit_timeout,