Commit 9a1863d5 authored by Lubomir Rintel's avatar Lubomir Rintel
Browse files

merge: branch 'lr/no-keyring'

parents 4ca56482 ecdf7087
......@@ -299,6 +299,11 @@ keyring_find_secrets_cb (GObject *source,
"The secrets request was canceled by the user");
g_error_free (search_error);
goto done;
&& g_error_matches (search_error, G_DBUS_ERROR, G_DBUS_ERROR_SERVICE_UNKNOWN)) {
/* If the connection always asks for secrets, tolerate
* keyring service not being present. */
g_clear_error (&search_error);
} else if (search_error) {
error = g_error_new (NM_SECRET_AGENT_ERROR,
......@@ -2866,8 +2866,10 @@ get_existing_secrets_cb (NMSecretAgentOld *agent,
NMADeviceClass *dclass;
GError *error = NULL;
/* Merge existing secrets into connection; ignore errors */
nm_connection_update_secrets (connection, req->setting_name, secrets, NULL);
if (secrets)
nm_connection_update_secrets (connection, req->setting_name, secrets, NULL);
nm_connection_clear_secrets (connection);
dclass = get_device_class_from_connection (connection, req->applet);
g_assert (dclass);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment