← Back to branch summary

~network-manager/network-manager/ubuntu.hardy.07

« back to all changes in this revision

Viewing changes to src/dhcp-manager/nm-dhcp-dhclient.c

* merge 0.7~~svn20080905t025540+eni0 snapshot to hardy branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/dhcp-manager/nm-dhcp-dhclient.c
236
236
                unsigned long int tmp = strtoul (pid_contents, NULL, 10);
237
237
 
238
238
                if (!((tmp == ULONG_MAX) && (errno == ERANGE)))
239
 
                        nm_dhcp_client_stop (device->iface, (pid_t) tmp, TRUE);
 
239
                        nm_dhcp_client_stop (device->iface, (pid_t) tmp);
240
240
                remove (device->pid_file);
241
241
        }
242
242
 
260
260
        g_ptr_array_add (dhclient_argv, (gpointer) device->iface);
261
261
        g_ptr_array_add (dhclient_argv, NULL);
262
262
 
263
 
        if (!g_spawn_async (NULL, (char **) dhclient_argv->pdata, NULL, 0,
 
263
        if (!g_spawn_async (NULL, (char **) dhclient_argv->pdata, NULL, G_SPAWN_DO_NOT_REAP_CHILD,
264
264
                            &dhclient_child_setup, NULL, &pid, &error)) {
265
265
                nm_warning ("dhclient failed to start.  error: '%s'", error->message);
266
266
                g_error_free (error);