From 84edd136b5f0c303be0eeb43374da5aaafcc173e Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sat, 27 Dec 2014 21:43:30 +0200 Subject: [PATCH] D-Bus(old): Fix interface to show correct err_msg for blob removal The "Invalid blob name" string was not shown since the zero-length name was used regardless of first verifying that it should not be allowed. Signed-off-by: Jouni Malinen --- wpa_supplicant/dbus/dbus_old_handlers.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/wpa_supplicant/dbus/dbus_old_handlers.c b/wpa_supplicant/dbus/dbus_old_handlers.c index b78644bab..c37f7709d 100644 --- a/wpa_supplicant/dbus/dbus_old_handlers.c +++ b/wpa_supplicant/dbus/dbus_old_handlers.c @@ -1428,8 +1428,7 @@ DBusMessage * wpas_dbus_iface_remove_blobs(DBusMessage *message, dbus_message_iter_get_basic(&array, &name); if (!os_strlen(name)) err_msg = "Invalid blob name."; - - if (wpa_config_remove_blob(wpa_s->conf, name) != 0) + else if (wpa_config_remove_blob(wpa_s->conf, name) != 0) err_msg = "Error removing blob."; else wpas_notify_blob_removed(wpa_s, name);