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

device: test dhcp[46]_config when getting properties, not dhcp[46]_client

Browse source 
An assertion in nm_dhcp4_config_get_dbus_path() has been actually fixed
by 3d6936b2cc (hopefully for all cases).
But still I think we should check _config here instead of _client.

(cherry picked from commit 4dcfdec347)
This commit is contained in:
Jiří Klimeš 2014-07-01 10:58:27 +02:00 • committed by Dan Williams
parent 1e16b5a32c
commit f6c36703c6
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/devices/nm-device.c
View file

@ -7537,7 +7537,7 @@ get_property (GObject *object, guint prop_id,
g_value_set_boxed (value, "/");
break;
case PROP_DHCP4_CONFIG:
if (ip_config_valid (priv->state) && priv->dhcp4_client)
if (ip_config_valid (priv->state) && priv->dhcp4_config)
g_value_set_boxed (value, nm_dhcp4_config_get_dbus_path (priv->dhcp4_config));
else
g_value_set_boxed (value, "/");
@ -7549,7 +7549,7 @@ get_property (GObject *object, guint prop_id,
g_value_set_boxed (value, "/");
break;
case PROP_DHCP6_CONFIG:
if (ip_config_valid (priv->state) && priv->dhcp6_client)
if (ip_config_valid (priv->state) && priv->dhcp6_config)
g_value_set_boxed (value, nm_dhcp6_config_get_dbus_path (priv->dhcp6_config));
else
g_value_set_boxed (value, "/");