diff options
| author | Martin Willi <martin@revosec.ch> | 2011-11-18 10:08:18 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2012-03-20 17:30:43 +0100 |
| commit | cf1772f68544828e13be59415262995e85ef3436 (patch) | |
| tree | 6acdf98a4459548760e36efa606d82a4aa48bde7 /src/starter | |
| parent | 558f79f76d624d4f47df2b1668ad6d8492100b89 (diff) | |
| download | strongswan-cf1772f68544828e13be59415262995e85ef3436.tar.bz2 strongswan-cf1772f68544828e13be59415262995e85ef3436.tar.xz | |
Do not ignore configs for IKEv1 in charon anymore
Diffstat (limited to 'src/starter')
| -rw-r--r-- | src/starter/confread.c | 2 | ||||
| -rw-r--r-- | src/starter/starter.c | 18 |
2 files changed, 7 insertions, 13 deletions
diff --git a/src/starter/confread.c b/src/starter/confread.c index 089be1aa5..1da4eb025 100644 --- a/src/starter/confread.c +++ b/src/starter/confread.c @@ -466,7 +466,7 @@ static void handle_dns_failure(const char *label, starter_end_t *end, plog("# fallback to %s=%%any due to '%%' prefix or %sallowany=yes", label, label); } - else if (!end->host || conn->keyexchange == KEY_EXCHANGE_IKEV1) + else if (!end->host) { /* declare an error */ cfg->err++; diff --git a/src/starter/starter.c b/src/starter/starter.c index 44e21431c..15c50c44b 100644 --- a/src/starter/starter.c +++ b/src/starter/starter.c @@ -764,14 +764,11 @@ int main (int argc, char **argv) if (conn->startup == STARTUP_START) { - if (conn->keyexchange != KEY_EXCHANGE_IKEV1) + if (starter_charon_pid()) { - if (starter_charon_pid()) - { - starter_stroke_initiate_conn(conn); - } + starter_stroke_initiate_conn(conn); } - else + if (conn->keyexchange == KEY_EXCHANGE_IKEV1) { if (starter_pluto_pid()) { @@ -781,14 +778,11 @@ int main (int argc, char **argv) } else if (conn->startup == STARTUP_ROUTE) { - if (conn->keyexchange != KEY_EXCHANGE_IKEV1) + if (starter_charon_pid()) { - if (starter_charon_pid()) - { - starter_stroke_route_conn(conn); - } + starter_stroke_route_conn(conn); } - else + if (conn->keyexchange == KEY_EXCHANGE_IKEV1) { if (starter_pluto_pid()) { |