starter: Remove obsolete 'auth' option
This commit is contained in:
@@ -140,7 +140,6 @@ static const token_info_t token_info[] =
|
|||||||
{ ARG_MISC, 0, NULL /* KW_COMPRESS */ },
|
{ ARG_MISC, 0, NULL /* KW_COMPRESS */ },
|
||||||
{ ARG_ENUM, offsetof(starter_conn_t, install_policy), LST_bool },
|
{ ARG_ENUM, offsetof(starter_conn_t, install_policy), LST_bool },
|
||||||
{ ARG_ENUM, offsetof(starter_conn_t, aggressive), 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, authby), LST_authby },
|
||||||
{ ARG_STR, offsetof(starter_conn_t, eap_identity), NULL },
|
{ ARG_STR, offsetof(starter_conn_t, eap_identity), NULL },
|
||||||
{ ARG_STR, offsetof(starter_conn_t, aaa_identity), NULL },
|
{ ARG_STR, offsetof(starter_conn_t, aaa_identity), NULL },
|
||||||
|
|||||||
@@ -521,9 +521,6 @@ static void load_conn(starter_conn_t *conn, kw_list_t *kw, starter_config_t *cfg
|
|||||||
case KW_COMPRESS:
|
case KW_COMPRESS:
|
||||||
KW_SA_OPTION_FLAG("yes", "no", SA_OPTION_COMPRESS)
|
KW_SA_OPTION_FLAG("yes", "no", SA_OPTION_COMPRESS)
|
||||||
break;
|
break;
|
||||||
case KW_AUTH:
|
|
||||||
KW_SA_OPTION_FLAG("ah", "esp", SA_OPTION_AUTHENTICATE)
|
|
||||||
break;
|
|
||||||
case KW_MARK:
|
case KW_MARK:
|
||||||
if (!handle_mark(kw->value, &conn->mark_in))
|
if (!handle_mark(kw->value, &conn->mark_in))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -78,7 +78,6 @@ typedef enum {
|
|||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
/* IPsec options */
|
/* IPsec options */
|
||||||
SA_OPTION_AUTHENTICATE = 1 << 0, /* use AH instead of ESP? */
|
|
||||||
SA_OPTION_COMPRESS = 1 << 1, /* use IPComp */
|
SA_OPTION_COMPRESS = 1 << 1, /* use IPComp */
|
||||||
|
|
||||||
/* IKE and other other options */
|
/* IKE and other other options */
|
||||||
|
|||||||
@@ -36,7 +36,6 @@ typedef enum {
|
|||||||
KW_COMPRESS,
|
KW_COMPRESS,
|
||||||
KW_INSTALLPOLICY,
|
KW_INSTALLPOLICY,
|
||||||
KW_AGGRESSIVE,
|
KW_AGGRESSIVE,
|
||||||
KW_AUTH,
|
|
||||||
KW_AUTHBY,
|
KW_AUTHBY,
|
||||||
KW_EAP_IDENTITY,
|
KW_EAP_IDENTITY,
|
||||||
KW_AAA_IDENTITY,
|
KW_AAA_IDENTITY,
|
||||||
|
|||||||
@@ -34,7 +34,6 @@ type, KW_TYPE
|
|||||||
compress, KW_COMPRESS
|
compress, KW_COMPRESS
|
||||||
installpolicy, KW_INSTALLPOLICY
|
installpolicy, KW_INSTALLPOLICY
|
||||||
aggressive, KW_AGGRESSIVE
|
aggressive, KW_AGGRESSIVE
|
||||||
auth, KW_AUTH
|
|
||||||
authby, KW_AUTHBY
|
authby, KW_AUTHBY
|
||||||
eap_identity, KW_EAP_IDENTITY
|
eap_identity, KW_EAP_IDENTITY
|
||||||
aaa_identity, KW_AAA_IDENTITY
|
aaa_identity, KW_AAA_IDENTITY
|
||||||
|
|||||||
Reference in New Issue
Block a user