diff options
| author | Jiří Klimeš <jklimes@redhat.com> | 2014-07-01 10:58:27 +0200 |
|---|---|---|
| committer | Jiří Klimeš <jklimes@redhat.com> | 2014-07-01 12:56:52 +0200 |
| commit | 4dcfdec347afb0f39cd80ed0220089aa95f7fdd1 (patch) | |
| tree | e08ebfe1972fba26b94ac3a8d7067d025fa13e1f | |
| parent | 392d4e48316f3dd6faf06faeafc70a7cd177c2f8 (diff) | |
| download | NetworkManager-4dcfdec347afb0f39cd80ed0220089aa95f7fdd1.tar.gz | |
device: test dhcp[46]_config when getting properties, not dhcp[46]_client
An assertion in nm_dhcp4_config_get_dbus_path() has been actually fixed
by 3d6936b2cc01fc72507b1ba9f7e66e1ec584e705 (hopefully for all cases).
But still I think we should check _config here instead of _client.
| -rw-r--r-- | src/devices/nm-device.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 2ee1c4937b..15f8b967d6 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -7549,7 +7549,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, "/"); @@ -7561,7 +7561,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, "/"); |