From: Patrik Flykt <patrik.flykt@linux.intel.com>
Date: Fri, 31 Jan 2014 09:31:24 +0000 (+0200)
Subject: libsystemd-dhcp: Fix stopping of DHCP client
X-Git-Tag: v209~271
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f8fdefe4f50c5b1b34cd018e649deddd7af2519f;p=elogind.git

libsystemd-dhcp: Fix stopping of DHCP client

Go back to Init state independent of the current state the client
is in.
---

diff --git a/src/libsystemd-dhcp/sd-dhcp-client.c b/src/libsystemd-dhcp/sd-dhcp-client.c
index 37fad9a30..403878507 100644
--- a/src/libsystemd-dhcp/sd-dhcp-client.c
+++ b/src/libsystemd-dhcp/sd-dhcp-client.c
@@ -302,24 +302,8 @@ static int client_stop(sd_dhcp_client *client, int error) {
 
         client_notify(client, error);
 
-        switch (client->state) {
-
-        case DHCP_STATE_INIT:
-        case DHCP_STATE_SELECTING:
-        case DHCP_STATE_REQUESTING:
-        case DHCP_STATE_BOUND:
-
-                client->start_time = 0;
-                client->state = DHCP_STATE_INIT;
-                break;
-
-        case DHCP_STATE_INIT_REBOOT:
-        case DHCP_STATE_REBOOTING:
-        case DHCP_STATE_RENEWING:
-        case DHCP_STATE_REBINDING:
-
-                break;
-        }
+        client->start_time = 0;
+        client->state = DHCP_STATE_INIT;
 
         if (client->lease) {
                 lease_free(client->lease);