diff options
| author | author Timo Teräs timo.teras@iki.fi 1442826138 +0300 <author Timo Teräs timo.teras@iki.fi 1442826138 +0300> | 2015-09-21 12:02:18 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2015-09-21 14:22:41 +0300 |
| commit | bffeca85f0d7cf485aeabb17dd0d40735fe2b2ee (patch) | |
| tree | 1b554c92454930300c19e392352193cdd683c208 /main/strongswan/0005-ike-Fall-back-to-the-current-remote-IP-if-it-resolve.patch | |
| parent | 79d8c05b7c382123dd04bd4dfb7ed7472d87c5d7 (diff) | |
| download | aports-bffeca85f0d7cf485aeabb17dd0d40735fe2b2ee.tar.bz2 aports-bffeca85f0d7cf485aeabb17dd0d40735fe2b2ee.tar.xz | |
main/strongswan: upgrade to 5.3.3
remove upstreamed patches; rebase the rest
Diffstat (limited to 'main/strongswan/0005-ike-Fall-back-to-the-current-remote-IP-if-it-resolve.patch')
| -rw-r--r-- | main/strongswan/0005-ike-Fall-back-to-the-current-remote-IP-if-it-resolve.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/main/strongswan/0005-ike-Fall-back-to-the-current-remote-IP-if-it-resolve.patch b/main/strongswan/0005-ike-Fall-back-to-the-current-remote-IP-if-it-resolve.patch deleted file mode 100644 index 411bc58df9..0000000000 --- a/main/strongswan/0005-ike-Fall-back-to-the-current-remote-IP-if-it-resolve.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 6f7a3b33bc044e0c212be54be74b9497d513ca86 Mon Sep 17 00:00:00 2001 -From: Tobias Brunner <tobias@strongswan.org> -Date: Fri, 10 Jul 2015 10:23:02 +0200 -Subject: [PATCH] ike: Fall back to the current remote IP if it resolves to - %any - -In some situations it might be valid for a host that configures -right=%any to reestablish or reauthenticate an IKE_SA. Using %any would -immediately abort the initiation causing the new SA to fail (which -might already have the existing CHILD_SAs assigned). - -Fixes #1027. ---- - src/libcharon/sa/ike_sa.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c -index 0c13c58..752a756 100644 ---- a/src/libcharon/sa/ike_sa.c -+++ b/src/libcharon/sa/ike_sa.c -@@ -1224,7 +1224,12 @@ static void resolve_hosts(private_ike_sa_t *this) - } - if (host) - { -- set_other_host(this, host); -+ if (!host->is_anyaddr(host) || -+ this->other_host->is_anyaddr(this->other_host)) -+ { /* don't set to %any if we currently have an address, but the -+ * address family might have changed */ -+ set_other_host(this, host); -+ } - } - - if (this->local_host) --- -2.4.6 - |