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

dhcp: don't crash when no DHCP client is available (rh #1015809)

Browse source 
Print a warning instead.

https://bugzilla.redhat.com/show_bug.cgi?id=1015809
This commit is contained in:
Jiří Klimeš 2013-10-17 14:39:57 +02:00
parent bc092bcf44
commit fbf2ca9ec3
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/dhcp-manager/nm-dhcp-manager.c
View file

@ -615,11 +615,19 @@ nm_dhcp_manager_get_lease_config (NMDHCPManager *self,
const char *uuid, const char *uuid,
gboolean ipv6) gboolean ipv6)
{ {
NMDHCPManagerPrivate *priv;
g_return_val_if_fail (NM_IS_DHCP_MANAGER (self), NULL); g_return_val_if_fail (NM_IS_DHCP_MANAGER (self), NULL);
g_return_val_if_fail (iface != NULL, NULL); g_return_val_if_fail (iface != NULL, NULL);
g_return_val_if_fail (uuid != NULL, NULL); g_return_val_if_fail (uuid != NULL, NULL);
return NM_DHCP_MANAGER_GET_PRIVATE (self)->get_lease_config_func (iface, uuid, ipv6); priv = NM_DHCP_MANAGER_GET_PRIVATE (self);
if (priv->get_lease_config_func)
return priv->get_lease_config_func (iface, uuid, ipv6);
nm_log_warn (LOGD_DHCP, "Cannot get a DHCP lease config (no usable DHCP client was found!)");
return NULL;
} }
NMIP4Config * NMIP4Config *