diff options
| author | Martin Willi <martin@revosec.ch> | 2013-06-20 17:10:13 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2013-10-11 10:15:21 +0200 |
| commit | 25f74be8f962b38da65f23c8d3bc6aa75e35ab3c (patch) | |
| tree | 4d9400b43cfbf1ccee4bf60f3a05e0a9fabc449f /src/starter | |
| parent | d489e75579af191633ce7ae4bc33c2a31efc47f4 (diff) | |
| download | strongswan-25f74be8f962b38da65f23c8d3bc6aa75e35ab3c.tar.bz2 strongswan-25f74be8f962b38da65f23c8d3bc6aa75e35ab3c.tar.xz | |
starter: Remove obsolete 'auth' option
Diffstat (limited to 'src/starter')
| -rw-r--r-- | src/starter/args.c | 1 | ||||
| -rw-r--r-- | src/starter/confread.c | 3 | ||||
| -rw-r--r-- | src/starter/confread.h | 1 | ||||
| -rw-r--r-- | src/starter/keywords.h | 1 | ||||
| -rw-r--r-- | src/starter/keywords.txt | 1 |
5 files changed, 0 insertions, 7 deletions
diff --git a/src/starter/args.c b/src/starter/args.c index 9672c66db..42deb8639 100644 --- a/src/starter/args.c +++ b/src/starter/args.c @@ -140,7 +140,6 @@ static const token_info_t token_info[] = { ARG_MISC, 0, NULL /* KW_COMPRESS */ }, { ARG_ENUM, offsetof(starter_conn_t, install_policy), LST_bool }, { ARG_ENUM, offsetof(starter_conn_t, aggressive), LST_bool }, - { ARG_MISC, 0, NULL /* KW_AUTH */ }, { ARG_STR, offsetof(starter_conn_t, authby), LST_authby }, { ARG_STR, offsetof(starter_conn_t, eap_identity), NULL }, { ARG_STR, offsetof(starter_conn_t, aaa_identity), NULL }, diff --git a/src/starter/confread.c b/src/starter/confread.c index 2fb022692..cec9399e3 100644 --- a/src/starter/confread.c +++ b/src/starter/confread.c @@ -521,9 +521,6 @@ static void load_conn(starter_conn_t *conn, kw_list_t *kw, starter_config_t *cfg case KW_COMPRESS: KW_SA_OPTION_FLAG("yes", "no", SA_OPTION_COMPRESS) break; - case KW_AUTH: - KW_SA_OPTION_FLAG("ah", "esp", SA_OPTION_AUTHENTICATE) - break; case KW_MARK: if (!handle_mark(kw->value, &conn->mark_in)) { diff --git a/src/starter/confread.h b/src/starter/confread.h index 27e6fcdd9..d55a17e63 100644 --- a/src/starter/confread.h +++ b/src/starter/confread.h @@ -78,7 +78,6 @@ typedef enum { typedef enum { /* IPsec options */ - SA_OPTION_AUTHENTICATE = 1 << 0, /* use AH instead of ESP? */ SA_OPTION_COMPRESS = 1 << 1, /* use IPComp */ /* IKE and other other options */ diff --git a/src/starter/keywords.h b/src/starter/keywords.h index 32815e2f6..705a7c16e 100644 --- a/src/starter/keywords.h +++ b/src/starter/keywords.h @@ -36,7 +36,6 @@ typedef enum { KW_COMPRESS, KW_INSTALLPOLICY, KW_AGGRESSIVE, - KW_AUTH, KW_AUTHBY, KW_EAP_IDENTITY, KW_AAA_IDENTITY, diff --git a/src/starter/keywords.txt b/src/starter/keywords.txt index eb977f5f8..ad915bf2a 100644 --- a/src/starter/keywords.txt +++ b/src/starter/keywords.txt @@ -34,7 +34,6 @@ type, KW_TYPE compress, KW_COMPRESS installpolicy, KW_INSTALLPOLICY aggressive, KW_AGGRESSIVE -auth, KW_AUTH authby, KW_AUTHBY eap_identity, KW_EAP_IDENTITY aaa_identity, KW_AAA_IDENTITY |