From: Martin Willi <martin@revosec.ch>
Date: Thu, 20 Jun 2013 15:10:13 +0000 (+0200)
Subject: starter: Remove obsolete 'auth' option
X-Git-Tag: 5.1.1rc1~48^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=25f74be8f962b38da65f23c8d3bc6aa75e35ab3c;p=thirdparty%2Fstrongswan.git

starter: Remove obsolete 'auth' option
---

diff --git a/src/starter/args.c b/src/starter/args.c
index 9672c66db0..42deb86390 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 2fb022692f..cec9399e32 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 27e6fcdd97..d55a17e631 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 32815e2f6c..705a7c16e9 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 eb977f5f8c..ad915bf2af 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