From fbf2ca9ec3176ff07fd5f9f40ca137ec71cfd53e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Thu, 17 Oct 2013 14:39:57 +0200 Subject: [PATCH] dhcp: don't crash when no DHCP client is available (rh #1015809) Print a warning instead. https://bugzilla.redhat.com/show_bug.cgi?id=1015809 --- src/dhcp-manager/nm-dhcp-manager.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c index 1ec870b2fb..b7359d70bc 100644 --- a/src/dhcp-manager/nm-dhcp-manager.c +++ b/src/dhcp-manager/nm-dhcp-manager.c @@ -615,11 +615,19 @@ nm_dhcp_manager_get_lease_config (NMDHCPManager *self, const char *uuid, gboolean ipv6) { + NMDHCPManagerPrivate *priv; + g_return_val_if_fail (NM_IS_DHCP_MANAGER (self), NULL); g_return_val_if_fail (iface != 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 *