diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2016-03-29 14:34:26 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2016-03-29 15:08:19 +0200 |
| commit | 0684632936e57a2f042caef6592f87e243a319a4 (patch) | |
| tree | 2608ae9e87ba20f620e13a46a54bfdc0075b7f69 /libnm | |
| parent | 31669329bbf90edf37e5586909e2f0f3b995c5e2 (diff) | |
| download | NetworkManager-0684632936e57a2f042caef6592f87e243a319a4.tar.gz | |
libnm: don't check if the agent is still registered when unregistering
The name_owner_chagned() unregisters the agent if NetworkManager goes away and
nmc_cleanup() also tries to unregister an agent, resulting in an assertion
failure:
# nmcli c up conn666
<daemon terminates>
Error: Connection activation failed: Message recipient disconnected from message bus without replying
(process:8746): libnm-CRITICAL **: nm_secret_agent_old_unregister: assertion 'priv->registered == TRUE' failed
_internal_unregister() already contains a priv->registered check and raising an
error on duplicate unregister attempt from a daemon after a restart is not a
problem either, since nmc_cleanup() doesn't care about the error returned
on teardown anyway.
Diffstat (limited to 'libnm')
| -rw-r--r-- | libnm/nm-secret-agent-old.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libnm/nm-secret-agent-old.c b/libnm/nm-secret-agent-old.c index 60b7a624e2..02a3f685ca 100644 --- a/libnm/nm-secret-agent-old.c +++ b/libnm/nm-secret-agent-old.c @@ -746,9 +746,6 @@ nm_secret_agent_old_register_finish (NMSecretAgentOld *self, * indicating to NetworkManager that the agent will no longer provide or * store secrets on behalf of this user. * - * It is a programmer error to attempt to unregister an agent that is not - * registered. - * * Returns: %TRUE if unregistration was successful, %FALSE on error **/ gboolean @@ -763,7 +760,6 @@ nm_secret_agent_old_unregister (NMSecretAgentOld *self, priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (self); - g_return_val_if_fail (priv->registered == TRUE, FALSE); g_return_val_if_fail (priv->bus != NULL, FALSE); g_return_val_if_fail (priv->manager_proxy != NULL, FALSE); @@ -811,9 +807,6 @@ unregister_cb (GObject *proxy, GAsyncResult *result, gpointer user_data) * Asynchronously unregisters the #NMSecretAgentOld with the NetworkManager secret * manager, indicating to NetworkManager that the agent will no longer provide * or store secrets on behalf of this user. - * - * It is a programmer error to attempt to unregister an agent that is not - * registered. **/ void nm_secret_agent_old_unregister_async (NMSecretAgentOld *self, @@ -829,7 +822,6 @@ nm_secret_agent_old_unregister_async (NMSecretAgentOld *self, priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (self); - g_return_if_fail (priv->registered == TRUE); g_return_if_fail (priv->bus != NULL); g_return_if_fail (priv->manager_proxy != NULL); |