mirror of
https://gitlab.labs.nic.cz/labs/bird.git
synced 2024-05-11 16:54:54 +00:00
Merge commit '51f2e7af' into thread-next
Conflicts: conf/cf-lex.l conf/conf.h conf/confbase.Y filter/config.Y nest/config.Y nest/proto.c nest/rt-table.c proto/bgp/bgp.c sysdep/unix/main.c
This commit is contained in:
@@ -606,8 +606,8 @@ bgp_spawn(struct bgp_proto *pp, ip_addr remote_ip)
|
||||
/* This is hack, we would like to share config, but we need to copy it now */
|
||||
new_config = config;
|
||||
cfg_mem = config->mem;
|
||||
conf_this_scope = config->root_scope;
|
||||
sym = cf_default_name(fmt, &(pp->dynamic_name_counter));
|
||||
config->current_scope = config->root_scope;
|
||||
sym = cf_default_name(config, fmt, &(pp->dynamic_name_counter));
|
||||
proto_clone_config(sym, pp->p.cf);
|
||||
new_config = NULL;
|
||||
cfg_mem = NULL;
|
||||
|
||||
Reference in New Issue
Block a user