1
0
mirror of https://gitlab.labs.nic.cz/labs/bird.git synced 2024-05-11 16:54:54 +00:00

Merge branch 'master' into int-new

This commit is contained in:
Ondrej Zajicek (work)
2017-05-25 23:37:50 +02:00
4 changed files with 93 additions and 117 deletions

View File

@@ -166,7 +166,7 @@ int
cli_parse(struct config *c)
{
int done = 0;
c->sym_fallback = config->sym_hash;
c->fallback = config;
new_config = c;
cfg_mem = c->mem;
if (setjmp(conf_jmpbuf))
@@ -177,7 +177,7 @@ cli_parse(struct config *c)
done = 1;
cleanup:
c->sym_fallback = NULL;
c->fallback = NULL;
new_config = NULL;
cfg_mem = NULL;
return done;