aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2013-08-31 13:46:24 (GMT)
committerJouni Malinen <j@w1.fi>2013-08-31 13:46:24 (GMT)
commit731ef436d163b3954296f2bf268e8ba5059f99c9 (patch)
tree4538ad397856f8dddc74a9b6678621e22a934830 /wpa_supplicant
parent447969e034cbcdb9d2c686f7393f2fbeb69319b2 (diff)
downloadhostap-731ef436d163b3954296f2bf268e8ba5059f99c9.zip
hostap-731ef436d163b3954296f2bf268e8ba5059f99c9.tar.gz
hostap-731ef436d163b3954296f2bf268e8ba5059f99c9.tar.bz2
D-Bus: Fix per-iface object unregistration on not existing objects
If the private data for an object is not found, do not try to unregister that object to avoid D-Bus errors. Signed-hostap: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'wpa_supplicant')
-rw-r--r--wpa_supplicant/dbus/dbus_new_helpers.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/wpa_supplicant/dbus/dbus_new_helpers.c b/wpa_supplicant/dbus/dbus_new_helpers.c
index cfa6a15..e26086d 100644
--- a/wpa_supplicant/dbus/dbus_new_helpers.c
+++ b/wpa_supplicant/dbus/dbus_new_helpers.c
@@ -590,11 +590,11 @@ int wpa_dbus_unregister_object_per_iface(
if (!obj_desc) {
wpa_printf(MSG_ERROR, "dbus: %s: Could not obtain object's "
"private data: %s", __func__, path);
- } else {
- eloop_cancel_timeout(flush_object_timeout_handler, con,
- obj_desc);
+ return 0;
}
+ eloop_cancel_timeout(flush_object_timeout_handler, con, obj_desc);
+
if (!dbus_connection_unregister_object_path(con, path))
return -1;