chiark / gitweb /
libsystemd-dhcp: Fix stopping of DHCP client
authorPatrik Flykt <patrik.flykt@linux.intel.com>
Fri, 31 Jan 2014 09:31:24 +0000 (11:31 +0200)
committerTom Gundersen <teg@jklm.no>
Fri, 31 Jan 2014 11:04:51 +0000 (12:04 +0100)
Go back to Init state independent of the current state the client
is in.

src/libsystemd-dhcp/sd-dhcp-client.c

index 37fad9a30159f915eb53ae218ff92660d3199865..4038785079e55d4f6a94654cbf34a786c733e2fc 100644 (file)
@@ -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);