jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

D-Bus: Fix per-iface object unregistration on not existing objects

Browse source 
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>
This commit is contained in:
Jouni Malinen 2013-08-31 16:46:24 +03:00
parent 447969e034
commit 731ef436d1
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
wpa_supplicant/dbus/dbus_new_helpers.c
View file

@ -590,11 +590,11 @@ int wpa_dbus_unregister_object_per_iface(
if (!obj_desc) { if (!obj_desc) {
wpa_printf(MSG_ERROR, "dbus: %s: Could not obtain object's " wpa_printf(MSG_ERROR, "dbus: %s: Could not obtain object's "
"private data: %s", __func__, path); "private data: %s", __func__, path);
} else { return 0;
eloop_cancel_timeout(flush_object_timeout_handler, con,
obj_desc);
} }
eloop_cancel_timeout(flush_object_timeout_handler, con, obj_desc);
if (!dbus_connection_unregister_object_path(con, path)) if (!dbus_connection_unregister_object_path(con, path))
return -1; return -1;