[network-manager-openswan] core: allow -flags keys through validation



commit 8c37dc566b86ab010e57c2e675ca68cd5863d44d
Author: Dan Williams <dcbw redhat com>
Date:   Tue Apr 19 13:25:13 2011 -0500

    core: allow -flags keys through validation

 src/nm-openswan-service.c |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 deletions(-)
---
diff --git a/src/nm-openswan-service.c b/src/nm-openswan-service.c
index 39c3dac..0a4630c 100644
--- a/src/nm-openswan-service.c
+++ b/src/nm-openswan-service.c
@@ -62,25 +62,27 @@ typedef struct {
 
 
 static ValidProperty valid_properties[] = {
-	{ NM_OPENSWAN_RIGHT,               G_TYPE_STRING, 0, 0 },
-	{ NM_OPENSWAN_LEFTID,                    G_TYPE_STRING, 0, 0 },
-	{ NM_OPENSWAN_LEFTXAUTHUSER,            G_TYPE_STRING, 0, 0 },
-	{ NM_OPENSWAN_DOMAIN,                G_TYPE_STRING, 0, 0 },
-	{ NM_OPENSWAN_DHGROUP,               G_TYPE_STRING, 0, 0 },
-	{ NM_OPENSWAN_PFSGROUP,       G_TYPE_STRING, 0, 0 },
-	{ NM_OPENSWAN_DPDTIMEOUT,      G_TYPE_INT, 0, 86400 },
-	{ NM_OPENSWAN_IKE,            G_TYPE_STRING, 0, 0 },
-	{ NM_OPENSWAN_ESP,            G_TYPE_STRING, 0, 0 },
+	{ NM_OPENSWAN_RIGHT,                      G_TYPE_STRING, 0, 0 },
+	{ NM_OPENSWAN_LEFTID,                     G_TYPE_STRING, 0, 0 },
+	{ NM_OPENSWAN_LEFTXAUTHUSER,              G_TYPE_STRING, 0, 0 },
+	{ NM_OPENSWAN_DOMAIN,                     G_TYPE_STRING, 0, 0 },
+	{ NM_OPENSWAN_DHGROUP,                    G_TYPE_STRING, 0, 0 },
+	{ NM_OPENSWAN_PFSGROUP,                   G_TYPE_STRING, 0, 0 },
+	{ NM_OPENSWAN_DPDTIMEOUT,                 G_TYPE_INT, 0, 86400 },
+	{ NM_OPENSWAN_IKE,                        G_TYPE_STRING, 0, 0 },
+	{ NM_OPENSWAN_ESP,                        G_TYPE_STRING, 0, 0 },
 	/* Ignored option for internal use */
 	{ NM_OPENSWAN_PSK_INPUT_MODES,            G_TYPE_NONE, 0, 0 },
-	{ NM_OPENSWAN_XAUTH_PASSWORD_INPUT_MODES,   G_TYPE_NONE, 0, 0 },
-	{ NULL,                              G_TYPE_NONE, 0, 0 }
+	{ NM_OPENSWAN_XAUTH_PASSWORD_INPUT_MODES, G_TYPE_NONE, 0, 0 },
+	{ NM_OPENSWAN_PSK_VALUE "-flags",         G_TYPE_STRING, 0, 0 },
+	{ NM_OPENSWAN_XAUTH_PASSWORD "-flags",    G_TYPE_STRING, 0, 0 },
+	{ NULL,                                   G_TYPE_NONE, 0, 0 }
 };
 
 static ValidProperty valid_secrets[] = {
-	{ NM_OPENSWAN_PSK_VALUE,                G_TYPE_STRING, 0, 0 },
-	{ NM_OPENSWAN_XAUTH_PASSWORD,        G_TYPE_STRING, 0, 0 },
-	{ NULL,                              G_TYPE_NONE, 0, 0 }
+	{ NM_OPENSWAN_PSK_VALUE,                  G_TYPE_STRING, 0, 0 },
+	{ NM_OPENSWAN_XAUTH_PASSWORD,             G_TYPE_STRING, 0, 0 },
+	{ NULL,                                   G_TYPE_NONE, 0, 0 }
 };
 
 typedef struct ValidateInfo {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]