From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 22 Feb 2018 10:31:14 +0000 (+0100)
Subject: Merge branch 'trap-manager-uninstall'
X-Git-Tag: 5.6.3dr1~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6df2938fd280a01b6873c6402daf5ae8d3e427c5;p=thirdparty%2Fstrongswan.git

Merge branch 'trap-manager-uninstall'

This changes how trap policies are deleted in order to avoid conflicts if a
trap policy with changed peer config is concurrently removed and reinstalled
under a different name (the reqid will be the same, so the wrong policy
could have been deleted by the old code).
---

6df2938fd280a01b6873c6402daf5ae8d3e427c5