IKEv2 was only partially the default for connections with auto=route and auto=start.

Connections with auto=route and auto=start that did not have
keyexchange=ikev2 explicitly specified did get added to charon,
but did not get routed or started by charon.
This commit is contained in:
Tobias Brunner
2011-04-27 11:33:06 +02:00
parent cce8f65232
commit 67ec2be665
+2 -2
View File
@@ -714,7 +714,7 @@ int main (int argc, char **argv)
if (conn->startup == STARTUP_START) if (conn->startup == STARTUP_START)
{ {
if (conn->keyexchange == KEY_EXCHANGE_IKEV2) if (conn->keyexchange != KEY_EXCHANGE_IKEV1)
{ {
if (starter_charon_pid()) if (starter_charon_pid())
{ {
@@ -731,7 +731,7 @@ int main (int argc, char **argv)
} }
else if (conn->startup == STARTUP_ROUTE) else if (conn->startup == STARTUP_ROUTE)
{ {
if (conn->keyexchange == KEY_EXCHANGE_IKEV2) if (conn->keyexchange != KEY_EXCHANGE_IKEV1)
{ {
if (starter_charon_pid()) if (starter_charon_pid())
{ {