From: Tom Gundersen <teg@jklm.no>
Date: Wed, 12 Feb 2014 15:59:52 +0000 (+0100)
Subject: sd-dhcp: make sure client->secs > 0
X-Git-Tag: v209~168
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=c6f7b693fedfd822febc219868fc810c32d458c5;hp=60ad0c85e58ea8f546677c1d2e425551f7b96179

sd-dhcp: make sure client->secs > 0

Some DHCP servers will not work correctly if secs == 0, so round up
to at least 1.
---

diff --git a/src/libsystemd-dhcp/sd-dhcp-client.c b/src/libsystemd-dhcp/sd-dhcp-client.c
index 4f41b4c06..3b4db1d96 100644
--- a/src/libsystemd-dhcp/sd-dhcp-client.c
+++ b/src/libsystemd-dhcp/sd-dhcp-client.c
@@ -338,7 +338,7 @@ static int client_send_request(sd_dhcp_client *client, uint16_t secs) {
 
 static uint16_t client_update_secs(sd_dhcp_client *client, usec_t time_now)
 {
-        client->secs = (time_now - client->start_time) / USEC_PER_SEC;
+        client->secs = ((time_now - client->start_time) / USEC_PER_SEC) ? : 1;
 
         return client->secs;
 }