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/1004-vici-support-asynchronous-initiation.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/1004-vici-support-asynchronous-initiation.patch')
| -rw-r--r-- | main/strongswan/1004-vici-support-asynchronous-initiation.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/strongswan/1004-vici-support-asynchronous-initiation.patch b/main/strongswan/1004-vici-support-asynchronous-initiation.patch index 5c99482796..dc95bde749 100644 --- a/main/strongswan/1004-vici-support-asynchronous-initiation.patch +++ b/main/strongswan/1004-vici-support-asynchronous-initiation.patch @@ -1,4 +1,4 @@ -From 4564b52fdbb6e588398178e607023fbac2819da8 Mon Sep 17 00:00:00 2001 +From 21efa8dbe5aab423b452277d6aa70f9c14e2f440 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> Date: Thu, 28 May 2015 13:06:51 +0300 Subject: [PATCH] vici: support asynchronous initiation @@ -12,7 +12,7 @@ Signed-off-by: Timo Teräs <timo.teras@iki.fi> 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/libcharon/plugins/vici/vici_control.c b/src/libcharon/plugins/vici/vici_control.c -index d37e11f..66478fd 100644 +index 55f667b..da2b68f 100644 --- a/src/libcharon/plugins/vici/vici_control.c +++ b/src/libcharon/plugins/vici/vici_control.c @@ -187,7 +187,7 @@ CALLBACK(initiate, vici_message_t*, @@ -43,5 +43,5 @@ index d37e11f..66478fd 100644 case SUCCESS: msg = send_reply(this, NULL); -- -2.4.5 +2.4.6 |