diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2015-07-28 11:33:38 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2015-07-28 11:35:47 +0300 |
| commit | fc1ceeb02b3e149645205e67bcc009e742140590 (patch) | |
| tree | b559837b40485a7c0f77ce6459c03f131191283d /main/strongswan/0012-daemon-Flush-shunts-before-unloading-plugins.patch | |
| parent | c3aa1460dbeb4e1e10972fc00314d7a80413707e (diff) | |
| download | aports-fc1ceeb02b3e149645205e67bcc009e742140590.tar.bz2 aports-fc1ceeb02b3e149645205e67bcc009e742140590.tar.xz | |
main/strongswan: cherry-pick upstream fixes
also fixes a minor memory leak in patch 1001 (the offending hunk is
now just deleted, as other upstream commits fixed the issue it tried
to address)
Diffstat (limited to 'main/strongswan/0012-daemon-Flush-shunts-before-unloading-plugins.patch')
| -rw-r--r-- | main/strongswan/0012-daemon-Flush-shunts-before-unloading-plugins.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/main/strongswan/0012-daemon-Flush-shunts-before-unloading-plugins.patch b/main/strongswan/0012-daemon-Flush-shunts-before-unloading-plugins.patch new file mode 100644 index 0000000000..9d3be529b7 --- /dev/null +++ b/main/strongswan/0012-daemon-Flush-shunts-before-unloading-plugins.patch @@ -0,0 +1,27 @@ +From c04345d5edbbc4c37027cdfc21dba85d03e312af Mon Sep 17 00:00:00 2001 +From: Tobias Brunner <tobias@strongswan.org> +Date: Tue, 14 Jul 2015 16:56:33 +0200 +Subject: [PATCH] daemon: Flush shunts before unloading plugins + +--- + src/libcharon/daemon.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/libcharon/daemon.c b/src/libcharon/daemon.c +index b1b8f57..316be76 100644 +--- a/src/libcharon/daemon.c ++++ b/src/libcharon/daemon.c +@@ -462,6 +462,10 @@ static void destroy(private_daemon_t *this) + { + this->public.traps->flush(this->public.traps); + } ++ if (this->public.shunts) ++ { ++ this->public.shunts->flush(this->public.shunts); ++ } + if (this->public.sender) + { + this->public.sender->flush(this->public.sender); +-- +2.4.6 + |