Skip to content

Commit 4a7ccfa

Browse files
committed
allow for END PROTOCOL, and END VENDOR too
which is obvious to use. Because using "BEGIN PROTOCOL" followed by "END-PROTOCOL" is just weird. Previously it would complain with an entirely opaque error.
1 parent 677e8ec commit 4a7ccfa

1 file changed

Lines changed: 14 additions & 1 deletion

File tree

src/lib/util/dict_tokenize.c

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2115,8 +2115,14 @@ static int dict_read_process_define(dict_tokenize_ctx_t *dctx, char **argv, int
21152115
return 0;
21162116
}
21172117

2118+
static int dict_read_process_end_protocol(dict_tokenize_ctx_t *dctx, char **argv, int argc,
2119+
fr_dict_attr_flags_t *base_flags);
2120+
2121+
static int dict_read_process_end_vendor(dict_tokenize_ctx_t *dctx, char **argv, int argc,
2122+
fr_dict_attr_flags_t *base_flags);
2123+
21182124
static int dict_read_process_end(dict_tokenize_ctx_t *dctx, char **argv, int argc,
2119-
UNUSED fr_dict_attr_flags_t *base_flags)
2125+
fr_dict_attr_flags_t *base_flags)
21202126
{
21212127
fr_dict_attr_t const *current;
21222128
fr_dict_attr_t const *da;
@@ -2130,6 +2136,13 @@ static int dict_read_process_end(dict_tokenize_ctx_t *dctx, char **argv, int arg
21302136
return -1;
21312137
}
21322138

2139+
/*
2140+
* Allow for the obvious.
2141+
*/
2142+
if (strcmp(argv[0], "PROTOCOL") == 0) return dict_read_process_end_protocol(dctx, argv + 1, argc - 1, base_flags);
2143+
2144+
if (strcmp(argv[0], "VENDOR") == 0) return dict_read_process_end_vendor(dctx, argv + 1, argc - 1, base_flags);
2145+
21332146
/*
21342147
* Unwind until we hit an attribute nesting section
21352148
*/

0 commit comments

Comments
 (0)