diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/cf-lex.l | 3 | ||||
| -rw-r--r-- | conf/confbase.Y | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/conf/cf-lex.l b/conf/cf-lex.l index 5fb88e03..2f95f2e1 100644 --- a/conf/cf-lex.l +++ b/conf/cf-lex.l @@ -242,7 +242,7 @@ WHITE [ \t] return IP4; } -({XIGIT}{2}){16,}|{XIGIT}{2}(:{XIGIT}{2}){15,}|hex:({XIGIT}{2}(:?{XIGIT}{2})*)? { +({XIGIT}{2}){16,}|{XIGIT}{2}(:{XIGIT}{2}){15,}|hex:({XIGIT}{2}*|{XIGIT}{2}(:{XIGIT}{2})*) { char *s = yytext; struct adata *bs; @@ -739,6 +739,7 @@ cf_lex_init(int is_cli, struct config *c) BEGIN(INITIAL); c->root_scope = c->current_scope = cfg_allocz(sizeof(struct sym_scope)); + c->root_scope->active = 1; if (is_cli) c->current_scope->next = config->root_scope; diff --git a/conf/confbase.Y b/conf/confbase.Y index 2c37bd4d..b2471198 100644 --- a/conf/confbase.Y +++ b/conf/confbase.Y @@ -294,7 +294,7 @@ net_roa6_: net_ip6_ MAX NUM AS NUM net_mpls_: MPLS NUM { - $$ = cfg_alloc(sizeof(net_addr_roa6)); + $$ = cfg_alloc(sizeof(net_addr_mpls)); net_fill_mpls($$, $2); } |