diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2015-09-29 13:55:38 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-09-29 14:10:47 +0200 |
| commit | 8b0bb7a02219b5d1c10ebc8c48a2e7f0878be4d5 (patch) | |
| tree | 4bce781a8cedf86dbe2f625fdf72093e5ca7d139 | |
| parent | b38bc1574788aae6bbce125d12e0710dd94cbe4a (diff) | |
| download | NetworkManager-8b0bb7a02219b5d1c10ebc8c48a2e7f0878be4d5.tar.gz | |
firewall-manager: avoid leaving dangling request if firewalld is not running
Unhook it prior to deallocation. Fixes an assertion on daemon shutdown:
NetworkManager[30037]: <info> exiting (success)
**
NetworkManager:ERROR:nm-firewall-manager.c:489:dispose: assertion failed: (g_hash_table_size (priv->pending_calls) == 0)
Aborted (core dumped)
Fixes: 94f888a2628a5e743d5abbb3e6f95c7c83052f09
| -rw-r--r-- | src/nm-firewall-manager.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nm-firewall-manager.c b/src/nm-firewall-manager.c index 8dd8db2dde..6572d1651f 100644 --- a/src/nm-firewall-manager.c +++ b/src/nm-firewall-manager.c @@ -325,7 +325,7 @@ _start_request (NMFirewallManager *self, * there is no point in scheduling an idle-request to fake success. Just * return right away. */ _LOGD (info, "complete: drop request simulating success"); - _cb_info_free (info); + _cb_info_complete_normal (info, NULL); return NULL; } else info->idle.id = g_idle_add (_handle_idle, info); |