denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add an ipsec.conf leftgroups2 parameter for the second authentication round

Browse Source
This commit is contained in:
Martin Willi
2012-07-26 11:51:58 +02:00
parent 15f78beb0f
commit 46df61dff7
9 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/starter/args.c
+1
View File
@@ -203,6 +203,7 @@ static const token_info_t token_info[] =
{ ARG_STR, offsetof(starter_end_t, ca), NULL },
{ ARG_STR, offsetof(starter_end_t, ca2), NULL },
{ ARG_STR, offsetof(starter_end_t, groups), NULL },
{ ARG_STR, offsetof(starter_end_t, groups2), NULL },
{ ARG_MISC, 0, NULL /* KW_END_DEPRECATED */ },
};
src/starter/confread.h
+1
View File
@@ -97,6 +97,7 @@ struct starter_end {
char *ca;
char *ca2;
char *groups;
char *groups2;
char *cert_policy;
char *host;
u_int ikeport;
src/starter/keywords.h
+3
View File
@@ -114,6 +114,7 @@ typedef enum {
KW_CA,
KW_CA2,
KW_GROUPS,
KW_GROUPS2,
KW_END_DEPRECATED,
#define KW_END_FIRST KW_HOST
@@ -142,6 +143,7 @@ typedef enum {
KW_LEFTCA,
KW_LEFTCA2,
KW_LEFTGROUPS,
KW_LEFTGROUPS2,
KW_LEFT_DEPRECATED,
#define KW_LEFT_FIRST KW_LEFT
@@ -170,6 +172,7 @@ typedef enum {
KW_RIGHTCA,
KW_RIGHTCA2,
KW_RIGHTGROUPS,
KW_RIGHTGROUPS2,
KW_RIGHT_DEPRECATED,
#define KW_RIGHT_FIRST KW_RIGHT
src/starter/keywords.txt
+2
View File
@@ -102,6 +102,7 @@ leftsendcert, KW_LEFTSENDCERT
leftca, KW_LEFTCA
leftca2, KW_LEFTCA2
leftgroups, KW_LEFTGROUPS
leftgroups2, KW_LEFTGROUPS2
right, KW_RIGHT
rightikeport, KW_RIGHTIKEPORT
rightsubnet, KW_RIGHTSUBNET
@@ -125,6 +126,7 @@ rightsendcert, KW_RIGHTSENDCERT
rightca, KW_RIGHTCA
rightca2, KW_RIGHTCA2
rightgroups, KW_RIGHTGROUPS
rightgroups2, KW_RIGHTGROUPS2
also, KW_ALSO
auto, KW_AUTO
# deprecated/removed keywords
src/starter/starterstroke.c
+1
View File
@@ -127,6 +127,7 @@ static void starter_stroke_add_end(stroke_msg_t *msg, stroke_end_t *msg_end, sta
msg_end->ca = push_string(msg, conn_end->ca);
msg_end->ca2 = push_string(msg, conn_end->ca2);
msg_end->groups = push_string(msg, conn_end->groups);
msg_end->groups2 = push_string(msg, conn_end->groups2);
msg_end->updown = push_string(msg, conn_end->updown);
if (conn_end->host)
{