diff options
Diffstat (limited to 'src/starter/args.c')
| -rw-r--r-- | src/starter/args.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/starter/args.c b/src/starter/args.c index 0c1a835ae..4d8003aab 100644 --- a/src/starter/args.c +++ b/src/starter/args.c @@ -239,10 +239,7 @@ static const token_info_t token_info[] = { ARG_MISC, 0, NULL /* KW_MARK */ }, { ARG_MISC, 0, NULL /* KW_MARK_IN */ }, { ARG_MISC, 0, NULL /* KW_MARK_OUT */ }, -<<<<<<< HEAD -======= { ARG_MISC, 0, NULL /* KW_TFC */ }, ->>>>>>> upstream/4.5.1 /* ca section keywords */ { ARG_STR, offsetof(starter_ca_t, name), NULL }, @@ -276,10 +273,7 @@ static const token_info_t token_info[] = { ARG_STR, offsetof(starter_end_t, rsakey), NULL }, { ARG_STR, offsetof(starter_end_t, cert), NULL }, { ARG_STR, offsetof(starter_end_t, cert2), NULL }, -<<<<<<< HEAD -======= { ARG_STR, offsetof(starter_end_t, cert_policy), NULL }, ->>>>>>> upstream/4.5.1 { ARG_ENUM, offsetof(starter_end_t, sendcert), LST_sendcert }, { ARG_STR, offsetof(starter_end_t, ca), NULL }, { ARG_STR, offsetof(starter_end_t, ca2), NULL }, @@ -548,6 +542,7 @@ bool assign_arg(kw_token_t token, kw_token_t first, kw_list_t *kw, char *base, } } } + /* fall through */ default: return TRUE; } |