From ed1d84b9ccc8206d2216c454aefa5dc803fa301e Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 3 Aug 2010 16:39:37 -0700 Subject: [PATCH] libnm-glib: fix retrieval of DHCP4 and DHCP6 options (rh #611141) Busted since 2008 apparently. Oops. --- libnm-glib/nm-dhcp4-config.c | 8 ++++---- libnm-glib/nm-dhcp6-config.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libnm-glib/nm-dhcp4-config.c b/libnm-glib/nm-dhcp4-config.c index c87feedf4f..442d19d192 100644 --- a/libnm-glib/nm-dhcp4-config.c +++ b/libnm-glib/nm-dhcp4-config.c @@ -17,7 +17,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA. * - * Copyright (C) 2008 Red Hat, Inc. + * Copyright (C) 2008 - 2010 Red Hat, Inc. * Copyright (C) 2008 Novell, Inc. */ @@ -216,9 +216,9 @@ nm_dhcp4_config_get_options (NMDHCP4Config *config) return priv->options; if (!_nm_object_get_property (NM_OBJECT (config), - "org.freedesktop.DBus.Properties", - "Options", - &value)) + NM_DBUS_INTERFACE_DHCP4_CONFIG, + "Options", + &value)) goto out; demarshal_dhcp4_options (NM_OBJECT (config), NULL, &value, &priv->options); diff --git a/libnm-glib/nm-dhcp6-config.c b/libnm-glib/nm-dhcp6-config.c index 49eeda39ec..3792867207 100644 --- a/libnm-glib/nm-dhcp6-config.c +++ b/libnm-glib/nm-dhcp6-config.c @@ -216,9 +216,9 @@ nm_dhcp6_config_get_options (NMDHCP6Config *config) return priv->options; if (!_nm_object_get_property (NM_OBJECT (config), - "org.freedesktop.DBus.Properties", - "Options", - &value)) + NM_DBUS_INTERFACE_DHCP6_CONFIG, + "Options", + &value)) goto out; demarshal_dhcp6_options (NM_OBJECT (config), NULL, &value, &priv->options);