From 3e293e11010201b53a7bdd2b66d4bbdfa722c10e Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 15 Mar 2013 15:01:18 -0500 Subject: [PATCH] dhcp: we don't always have an NMSettingIP6Config for the DHCP hostname Prevents: NetworkManager[19405]: nm_setting_ip6_config_get_dhcp_hostname: assertion `NM_IS_SETTING_IP6_CONFIG (setting)' failed --- src/dhcp-manager/nm-dhcp-manager.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c index 91ea7831c1..c1ac648926 100644 --- a/src/dhcp-manager/nm-dhcp-manager.c +++ b/src/dhcp-manager/nm-dhcp-manager.c @@ -507,7 +507,8 @@ nm_dhcp_manager_start_ip6 (NMDHCPManager *self, priv = NM_DHCP_MANAGER_GET_PRIVATE (self); - hostname = nm_setting_ip6_config_get_dhcp_hostname (s_ip6); + if (s_ip6) + hostname = nm_setting_ip6_config_get_dhcp_hostname (s_ip6); if (!hostname && priv->hostname_provider) { hostname = nm_hostname_provider_get_hostname (priv->hostname_provider); if ( g_strcmp0 (hostname, "localhost.localdomain") == 0