summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2016-01-22 15:19:06 +0100
committerBeniamino Galvani <bgalvani@redhat.com>2016-01-23 10:19:43 +0100
commit936a70bf4aa8608779b7e2ba2097d00698b15ef6 (patch)
treeff65af7a339b6c826fb264ef1f57d2253ebbd1d4
parenteadb0051dc0715499c3b50a057bb1b49e9ef7da2 (diff)
downloadNetworkManager-936a70bf4aa8608779b7e2ba2097d00698b15ef6.tar.gz
manager: cleanup active connections upon exit
When connection sharing is enabled, the removal of iptables rules is delegated to the NMActRequest destructor; but for this to work it is required that the object is properly dereferenced upon NM termination. Clean up the active connections which are in DEACTIVATED state when quitting, so that they are unexported and destroyed. https://bugzilla.gnome.org/show_bug.cgi?id=692673 (cherry picked from commit e3a6ba6756620b5ed64459141567dd7a760e2c30)
-rw-r--r--src/nm-manager.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 26e2127354..0abae70554 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -4235,6 +4235,8 @@ nm_manager_stop (NMManager *self)
/* Remove all devices */
while (priv->devices)
remove_device (self, NM_DEVICE (priv->devices->data), TRUE, TRUE);
+
+ _active_connection_cleanup (self);
}
static gboolean