From 8b0bb7a02219b5d1c10ebc8c48a2e7f0878be4d5 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 29 Sep 2015 13:55:38 +0200 Subject: [PATCH] firewall-manager: avoid leaving dangling request if firewalld is not running Unhook it prior to deallocation. Fixes an assertion on daemon shutdown: NetworkManager[30037]: 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 --- src/nm-firewall-manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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);