settings: fix secret-agent fallback
NMAgentManager was supposed to be trying multiple secret agents on any error except UserCanceled, but due to a botched last-minute rewrite, it was actually doing the reverse.
This commit is contained in:
@@ -816,7 +816,7 @@ get_done_cb (NMSecretAgent *agent,
|
|||||||
error ? error->code : -1,
|
error ? error->code : -1,
|
||||||
(error && error->message) ? error->message : "(unknown)");
|
(error && error->message) ? error->message : "(unknown)");
|
||||||
|
|
||||||
if (!dbus_g_error_has_name (error, NM_DBUS_INTERFACE_SECRET_AGENT ".UserCanceled")) {
|
if (dbus_g_error_has_name (error, NM_DBUS_INTERFACE_SECRET_AGENT ".UserCanceled")) {
|
||||||
error = g_error_new_literal (NM_AGENT_MANAGER_ERROR,
|
error = g_error_new_literal (NM_AGENT_MANAGER_ERROR,
|
||||||
NM_AGENT_MANAGER_ERROR_USER_CANCELED,
|
NM_AGENT_MANAGER_ERROR_USER_CANCELED,
|
||||||
"User canceled the secrets request.");
|
"User canceled the secrets request.");
|
||||||
|
Reference in New Issue
Block a user