diff options
| author | Martin Willi <martin@strongswan.org> | 2007-02-12 15:56:47 +0000 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2007-02-12 15:56:47 +0000 |
| commit | f27f6296e6ae5beece739342fd54528cf91e5394 (patch) | |
| tree | c868a123b98b8a244b249473ab91b0bd4a764b31 /src/starter/confread.c | |
| parent | 6fda18d99d2b6eac921e731a52229d9c1cf8a295 (diff) | |
| download | strongswan-f27f6296e6ae5beece739342fd54528cf91e5394.tar.bz2 strongswan-f27f6296e6ae5beece739342fd54528cf91e5394.tar.xz | |
merged EAP framework from branch into trunk
includes a lot of other modifications
Diffstat (limited to 'src/starter/confread.c')
| -rw-r--r-- | src/starter/confread.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/starter/confread.c b/src/starter/confread.c index 03b223878..66f70e5f9 100644 --- a/src/starter/confread.c +++ b/src/starter/confread.c @@ -63,6 +63,7 @@ static void default_values(starter_config_t *cfg) cfg->setup.interfaces = new_list("%defaultroute"); cfg->setup.charonstart = TRUE; cfg->setup.plutostart = TRUE; + cfg->setup.eapdir = IPSEC_EAPDIR; cfg->conn_default.seen = LEMPTY; cfg->conn_default.startup = STARTUP_NO; @@ -414,7 +415,7 @@ load_conn(starter_conn_t *conn, kw_list_t *kw, starter_config_t *cfg) case KW_AUTHBY: conn->policy &= ~(POLICY_ID_AUTH_MASK | POLICY_ENCRYPT); - if (strcmp(kw->value, "never") != 0) + if (!(streq(kw->value, "never") || streq(kw->value, "eap"))) { char *value = kw->value; char *second = strchr(kw->value, '|'); @@ -446,6 +447,20 @@ load_conn(starter_conn_t *conn, kw_list_t *kw, starter_config_t *cfg) } } break; + case KW_EAP: + /* TODO: a gperf function for all EAP types */ + if (streq(kw->value, "aka")) + conn->eap = 23; + else + { + conn->eap = atoi(kw->value); + if (conn->eap == 0) + { + plog("# unknown EAP type: %s=%s", kw->entry->name, kw->value); + cfg->err++; + } + } + break; case KW_REKEY: KW_POLICY_FLAG("no", "yes", POLICY_DONT_REKEY) break; |