fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 22:58:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

dhcp: clean up client spawn return value

Browse source
This commit is contained in:
Dan Williams 2010-05-01 09:53:49 -07:00
parent 8398ccba59
commit 07de58bbeb
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dhcp-manager/nm-dhcp-dhclient.c
View file

@ -482,7 +482,7 @@ dhclient_start (NMDHCPClient *client,
{ {
NMDHCPDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (client); NMDHCPDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (client);
GPtrArray *argv = NULL; GPtrArray *argv = NULL;
GPid pid = 0; GPid pid = -1;
GError *error = NULL; GError *error = NULL;
const char *iface, *uuid; const char *iface, *uuid;
char *binary_name, *cmd_str; char *binary_name, *cmd_str;

3
src/dhcp-manager/nm-dhcp-dhcpcd.c
View file

@ -92,7 +92,7 @@ real_ip4_start (NMDHCPClient *client,
{ {
NMDHCPDhcpcdPrivate *priv = NM_DHCP_DHCPCD_GET_PRIVATE (client); NMDHCPDhcpcdPrivate *priv = NM_DHCP_DHCPCD_GET_PRIVATE (client);
GPtrArray *argv = NULL; GPtrArray *argv = NULL;
GPid pid = 0; GPid pid = -1;
GError *error = NULL; GError *error = NULL;
char *pid_contents = NULL, *binary_name, *cmd_str; char *pid_contents = NULL, *binary_name, *cmd_str;
const char *iface, *uuid, *hostname; const char *iface, *uuid, *hostname;
@ -147,6 +147,7 @@ real_ip4_start (NMDHCPClient *client,
&dhcpcd_child_setup, NULL, &pid, &error)) { &dhcpcd_child_setup, NULL, &pid, &error)) {
nm_log_warn (LOGD_DHCP4, "dhcpcd failed to start. error: '%s'", error->message); nm_log_warn (LOGD_DHCP4, "dhcpcd failed to start. error: '%s'", error->message);
g_error_free (error); g_error_free (error);
pid = -1;
} else } else
nm_log_info (LOGD_DHCP4, "dhcpcd started with pid %d", pid); nm_log_info (LOGD_DHCP4, "dhcpcd started with pid %d", pid);