From 92b58e56f5cc01b484af36623e17ee4ea386e53a Mon Sep 17 00:00:00 2001 From: Mikhail Efremov Date: Fri, 19 Nov 2010 16:52:55 -0600 Subject: [PATCH] dhcp: ensure that dhcp client is exited On restart ensure that the client we're trying to kill has actually exited even if it's not our child. --- src/dhcp-manager/nm-dhcp-client.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/dhcp-manager/nm-dhcp-client.c b/src/dhcp-manager/nm-dhcp-client.c index 0c7f3d49b..3a8b19408 100644 --- a/src/dhcp-manager/nm-dhcp-client.c +++ b/src/dhcp-manager/nm-dhcp-client.c @@ -156,11 +156,15 @@ stop_process (GPid pid, const char *iface) if (ret == -1) { /* Child already exited */ - if (errno == ECHILD) + if (errno == ECHILD) { + /* Was it really our child and it exited? */ + if (kill (pid, 0) < 0 && errno == ESRCH) + break; + } else { + /* Took too long; shoot it in the head */ + i = 0; break; - /* Took too long; shoot it in the head */ - i = 0; - break; + } } g_usleep (G_USEC_PER_SEC / 5); }