diff options
| author | Sjoerd Simons <sjoerd@luon.net> | 2013-10-25 21:21:07 +0200 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd@luon.net> | 2013-10-25 21:21:07 +0200 |
| commit | e83d1de9b746dbc078ac1cf45f1798e1bc6b7e2f (patch) | |
| tree | c36a40d79a5ae7d2bbca7d240d0a6f664049b435 /src/dhcp-manager/nm-dhcp-manager.c | |
| parent | 26283b4c9e5035574a6c168003e7f1da53a8f32a (diff) | |
| parent | a4256940da049f91bbbea5e53e469a59ea9c10f7 (diff) | |
Merge tag 'upstream/0.9.8.8' into experimental
Upstream version 0.9.8.8
Diffstat (limited to 'src/dhcp-manager/nm-dhcp-manager.c')
| -rw-r--r-- | src/dhcp-manager/nm-dhcp-manager.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c index 1bd7f984..7088839a 100644 --- a/src/dhcp-manager/nm-dhcp-manager.c +++ b/src/dhcp-manager/nm-dhcp-manager.c @@ -509,7 +509,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 @@ -553,12 +554,14 @@ nm_dhcp_manager_get_lease_config (NMDHCPManager *self, const char *uuid, gboolean ipv6) { - g_return_val_if_fail (self != NULL, NULL); - g_return_val_if_fail (NM_IS_DHCP_MANAGER (self), NULL); + NMDHCPManagerPrivate *priv = NM_DHCP_MANAGER_GET_PRIVATE (self); + 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); + if (priv->get_lease_config_func) + return priv->get_lease_config_func (iface, uuid, ipv6); + return NULL; } NMIP4Config * |