diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-02-05 13:41:25 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-02-05 13:41:55 +0200 |
| commit | ba39f71b2a8dfd155684df4b01f098039b68389e (patch) | |
| tree | 3f88043924f0726a1ff7861e2458a26011fdb101 /main/ipsec-tools/20-grekey-support.patch | |
| parent | 4382b60ad0a9738a21beb561c1e39cdd43b9c9f3 (diff) | |
| download | aports-ba39f71b2a8dfd155684df4b01f098039b68389e.tar.bz2 aports-ba39f71b2a8dfd155684df4b01f098039b68389e.tar.xz | |
main/ipsec-tools: cherry-pick fixes from upstream
Diffstat (limited to 'main/ipsec-tools/20-grekey-support.patch')
| -rw-r--r-- | main/ipsec-tools/20-grekey-support.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/ipsec-tools/20-grekey-support.patch b/main/ipsec-tools/20-grekey-support.patch index 17fea3e991..7651b8dbf2 100644 --- a/main/ipsec-tools/20-grekey-support.patch +++ b/main/ipsec-tools/20-grekey-support.patch @@ -499,7 +499,7 @@ Index: ipsec-tools-cvs-HEAD/src/racoon/isakmp.c if (iph1hint == NULL || iph1hint->rmconf == NULL) { - rmconf = getrmconf(iph2->dst, nopassive ? GETRMCONF_F_NO_PASSIVE : 0); + int flags = 0; -+ uint32_t remoteid; ++ uint32_t remoteid = 0; + if (nopassive) + flags |= GETRMCONF_F_NO_PASSIVE; + if (iph2->sainfo != NULL) { |