starter: Remove obsolete 'auth' option

diff --git a/src/starter/args.c b/src/starter/args.c
index 9672c66db07a6b45d6cc89d4a873ef80564ca0a9..42deb86390e5037235e138a1eb320b5a9be03d0e 100644 (file)
--- 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 2fb022692f265be4933116a2e0bd269a1d1430b3..cec9399e326f60ec86eb08ce69bc8cc3a2dc9cd0 100644 (file)
--- 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 27e6fcdd9758bf9d12719cccb032254492921a34..d55a17e631c324bc9821f5d7650ed9403fc53164 100644 (file)
--- 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 32815e2f6cc6d0f6180d36195027b871a75fc6fa..705a7c16e97906f20b4c54eec4909dd862341a26 100644 (file)
--- 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 eb977f5f8c5d4d8a7aa70242a3a1a43320e00d68..ad915bf2afcf2b02a025dc909852975e4bc6de53 100644 (file)
--- 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