From 44ccf3454b2609637c0857740974b6525c288450 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 19 Sep 2013 09:37:44 -0500 Subject: [PATCH] supplicant: suppress more bus activation failure errors These are expected errors if the supplicant can't be launched for some reason. We should only log entirely unexpected errors like wrong method arguments or types, really odd failures, etc. NetworkManager[1312]: [1379601146.148818] [supplicant-manager/nm-supplicant-interface.c:853] interface_add_cb(): (wlan0): error adding interface: Did not receive a reply. Possible causes include: the remote application did not send a reply, the message bus security policy blocked the reply, the reply timeout expired, or the network connection was broken. NetworkManager[1312]: [1379601171.160742] [supplicant-manager/nm-supplicant-interface.c:853] interface_add_cb(): (wlan0): error adding interface: Activation of fi.w1.wpa_supplicant1 timed out --- src/supplicant-manager/nm-supplicant-interface.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant-manager/nm-supplicant-interface.c index ce02ecbb80..4063085c3b 100644 --- a/src/supplicant-manager/nm-supplicant-interface.c +++ b/src/supplicant-manager/nm-supplicant-interface.c @@ -840,8 +840,10 @@ interface_add_cb (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data || g_error_matches (error, DBUS_GERROR, DBUS_GERROR_SPAWN_FORK_FAILED) || g_error_matches (error, DBUS_GERROR, DBUS_GERROR_SPAWN_FAILED) || g_error_matches (error, DBUS_GERROR, DBUS_GERROR_TIMEOUT) + || g_error_matches (error, DBUS_GERROR, DBUS_GERROR_NO_REPLY) + || g_error_matches (error, DBUS_GERROR, DBUS_GERROR_TIMED_OUT) || dbus_g_error_has_name (error, DBUS_ERROR_SPAWN_SERVICE_NOT_FOUND)) { - /* Supplicant wasn't running and could be launched via service + /* Supplicant wasn't running and could not be launched via service * activation. Wait for it to start by moving back to the INIT * state. */