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
This commit is contained in:
Dan Williams 2013-03-15 15:01:18 -05:00
parent bd636ffb40
commit 3e293e1101

View file

@ -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