From: Martin Willi <martin@revosec.ch>
Date: Wed, 19 Jun 2013 14:31:06 +0000 (+0200)
Subject: Merge branch 'consistent-reqid'
X-Git-Tag: 5.1.0dr1~107
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f88ad669a2a5d65bd7e6d60896df14246f58a5e;p=thirdparty%2Fstrongswan.git

Merge branch 'consistent-reqid'

Checks if a trap policy exists when installing a CHILD_SA as responder,
reuse that reqid and keeping the trap untouched. This makes auto=route on
both sides more reliable.

In addition, we no prevent to refcount an existing policy if the reqid differs;
this should not happen anymore. We now can properly reject new CHILD_SAs in
such conflicts, instead of silently breaking an existing policy.
---

4f88ad669a2a5d65bd7e6d60896df14246f58a5e