colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2006-07-10 Dan Williams <dcbw@redhat.com>

Browse Source 
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:
Dan Williams
2006-07-10 17:22:32 +00:00
parent 8b992922d0
commit 7d8f84edf6
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -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> 2006-07-09 Dan Williams <dcbw@redhat.com>
* gnome/applet/applet.c * gnome/applet/applet.c

4
src/nm-device.c
View File

@@ -849,7 +849,10 @@ real_act_stage3_ip_config_start (NMDevice *self,
{ {
/* Begin a DHCP transaction on the interface */ /* Begin a DHCP transaction on the interface */
if (!nm_dhcp_manager_begin_transaction (data->dhcp_manager, req)) if (!nm_dhcp_manager_begin_transaction (data->dhcp_manager, req))
{
ret = NM_ACT_STAGE_RETURN_FAILURE; ret = NM_ACT_STAGE_RETURN_FAILURE;
goto out;
}
/* DHCP devices will be notified by the DHCP manager when /* DHCP devices will be notified by the DHCP manager when
* stuff happens. * stuff happens.
@@ -857,6 +860,7 @@ real_act_stage3_ip_config_start (NMDevice *self,
ret = NM_ACT_STAGE_RETURN_POSTPONE; ret = NM_ACT_STAGE_RETURN_POSTPONE;
} }
out:
return ret; return ret;
} }