mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-15 04:24:32 +00:00
2006-07-10 Dan Williams <dcbw@redhat.com>
Patch from Valentine Sinitsyn <e_val@inbox.ru> * src/nm-device.c - (real_act_stage3_ip_config_start): don't infinite loop when dhcdbd isn't running (Gnome #346845) git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1866 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
parent
8b992922d0
commit
7d8f84edf6
|
@ -1,3 +1,10 @@
|
|||
2006-07-10 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
Patch from Valentine Sinitsyn <e_val@inbox.ru>
|
||||
* src/nm-device.c
|
||||
- (real_act_stage3_ip_config_start): don't infinite loop when
|
||||
dhcdbd isn't running (Gnome #346845)
|
||||
|
||||
2006-07-09 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
* gnome/applet/applet.c
|
||||
|
|
|
@ -849,14 +849,18 @@ real_act_stage3_ip_config_start (NMDevice *self,
|
|||
{
|
||||
/* Begin a DHCP transaction on the interface */
|
||||
if (!nm_dhcp_manager_begin_transaction (data->dhcp_manager, req))
|
||||
{
|
||||
ret = NM_ACT_STAGE_RETURN_FAILURE;
|
||||
goto out;
|
||||
}
|
||||
|
||||
/* DHCP devices will be notified by the DHCP manager when
|
||||
* stuff happens.
|
||||
*/
|
||||
ret = NM_ACT_STAGE_RETURN_POSTPONE;
|
||||
}
|
||||
|
||||
|
||||
out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue