diff options
| author | Maria Matejka <mq@ucw.cz> | 2022-09-27 12:39:07 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2022-09-27 12:39:07 +0200 |
| commit | 32a67c93ebf29309286dca5195f026eeda3f78a2 (patch) | |
| tree | 578c6038187d0c50c4a4f250e440983dbb93029d /conf/conf.c | |
| parent | 57a34d466e85bedbf40a0f7cbde23b843a303c8d (diff) | |
| parent | cae5979871ee7aa341334f8b1af6bafc60ee9692 (diff) | |
Merge commit 'cae5979871ee7aa341334f8b1af6bafc60ee9692' into tmp-bad-learn
Diffstat (limited to 'conf/conf.c')
| -rw-r--r-- | conf/conf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/conf/conf.c b/conf/conf.c index 58abcde1..580a6472 100644 --- a/conf/conf.c +++ b/conf/conf.c @@ -46,7 +46,7 @@ #undef LOCAL_DEBUG #include "nest/bird.h" -#include "nest/route.h" +#include "nest/rt.h" #include "nest/protocol.h" #include "nest/iface.h" #include "lib/resource.h" @@ -168,7 +168,6 @@ int cli_parse(struct config *c) { int done = 0; - c->fallback = config; new_config = c; cfg_mem = c->mem; if (setjmp(conf_jmpbuf)) @@ -179,7 +178,6 @@ cli_parse(struct config *c) done = 1; cleanup: - c->fallback = NULL; new_config = NULL; cfg_mem = NULL; return done; @@ -520,6 +518,8 @@ order_shutdown(int gr) memcpy(c, config, sizeof(struct config)); init_list(&c->protos); init_list(&c->tables); + init_list(&c->symbols); + memset(c->def_tables, 0, sizeof(c->def_tables)); c->shutdown = 1; c->gr_down = gr; |