From 754c1c0ef7c4e1615db4f9930fd0f73aff3ef59b Mon Sep 17 00:00:00 2001
From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Fri, 21 Mar 2008 09:34:40 +0000
Subject: [PATCH] suppress IKEv2-specific policy flags in pluto. Patch
 contributed by Heiko Hund from Astaro.

---
 src/starter/starterwhack.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/starter/starterwhack.c b/src/starter/starterwhack.c
index 98fcae6ec..019489eec 100644
--- a/src/starter/starterwhack.c
+++ b/src/starter/starterwhack.c
@@ -251,6 +251,14 @@ starter_whack_add_conn(starter_conn_t *conn)
     msg.sa_keying_tries       = conn->sa_keying_tries;
     msg.policy                = conn->policy;
 
+    /*
+     * Make sure the IKEv2-only policy bits are unset for IKEv1 connections
+     */
+    msg.policy &= ~POLICY_DONT_REAUTH;
+    msg.policy &= ~POLICY_BEET;
+    msg.policy &= ~POLICY_MOBIKE;
+    msg.policy &= ~POLICY_FORCE_ENCAP;
+
     set_whack_end(&msg.left, &conn->left, conn->addr_family);
     set_whack_end(&msg.right, &conn->right, conn->addr_family);