diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2016-10-31 14:58:34 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2016-10-31 14:58:53 +0000 |
| commit | 17cddfa2011ab1b7ff750cbef1f10ff3e0ed5f0a (patch) | |
| tree | 9bd07b40e74ccac36312613ec1733edc15bf2ad2 /main/strongswan/1001-charon-add-optional-source-and-remote-overrides-for-.patch | |
| parent | 3e0594cf909c273e99481a5a1ccbff05bcfd1046 (diff) | |
| download | aports-17cddfa2011ab1b7ff750cbef1f10ff3e0ed5f0a.tar.bz2 aports-17cddfa2011ab1b7ff750cbef1f10ff3e0ed5f0a.tar.xz | |
main/strongswan: upgrade to 5.5.1
Diffstat (limited to 'main/strongswan/1001-charon-add-optional-source-and-remote-overrides-for-.patch')
| -rw-r--r-- | main/strongswan/1001-charon-add-optional-source-and-remote-overrides-for-.patch | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/main/strongswan/1001-charon-add-optional-source-and-remote-overrides-for-.patch b/main/strongswan/1001-charon-add-optional-source-and-remote-overrides-for-.patch index 6d5fa223bf..0dcf001244 100644 --- a/main/strongswan/1001-charon-add-optional-source-and-remote-overrides-for-.patch +++ b/main/strongswan/1001-charon-add-optional-source-and-remote-overrides-for-.patch @@ -20,7 +20,6 @@ Signed-off-by: Timo Teräs <timo.teras@iki.fi> src/charon-nm/nm/nm_service.c | 2 +- src/libcharon/control/controller.c | 43 +++++++++++++++- src/libcharon/control/controller.h | 3 ++ - src/libcharon/plugins/maemo/maemo_service.c | 2 +- src/libcharon/plugins/stroke/stroke_control.c | 5 +- src/libcharon/plugins/vici/vici_config.c | 2 +- src/libcharon/plugins/vici/vici_control.c | 63 ++++++++++++++++++++---- @@ -169,19 +168,6 @@ index 9524f53..7c51ba4 100644 controller_cb_t callback, void *param, u_int timeout, bool limits); -diff --git a/src/libcharon/plugins/maemo/maemo_service.c b/src/libcharon/plugins/maemo/maemo_service.c -index 3e5861b..5a6e03d 100644 ---- a/src/libcharon/plugins/maemo/maemo_service.c -+++ b/src/libcharon/plugins/maemo/maemo_service.c -@@ -364,7 +364,7 @@ static gboolean initiate_connection(private_maemo_service_t *this, - - /* get us an IKE_SA */ - ike_sa = charon->ike_sa_manager->checkout_by_config(charon->ike_sa_manager, -- peer_cfg); -+ peer_cfg, NULL, NULL); - if (!ike_sa) - { - peer_cfg->destroy(peer_cfg); diff --git a/src/libcharon/plugins/stroke/stroke_control.c b/src/libcharon/plugins/stroke/stroke_control.c index fb60d39..83f8ae5 100644 --- a/src/libcharon/plugins/stroke/stroke_control.c |