Merge branch 'master' into rt-accepted
This commit is contained in:
commit
3e17e38059
2 changed files with 4 additions and 1 deletions
|
@ -224,6 +224,9 @@ static_start(struct proto *p)
|
|||
if (cf->igp_table)
|
||||
rt_lock_table(cf->igp_table->table);
|
||||
|
||||
/* We have to go UP before routes could be installed */
|
||||
proto_notify_state(p, PS_UP);
|
||||
|
||||
WALK_LIST(r, cf->other_routes)
|
||||
static_add(p, cf, r);
|
||||
return PS_UP;
|
||||
|
|
|
@ -269,7 +269,7 @@ cmd_reconfig(char *name, int type)
|
|||
if (!unix_read_config(&conf, name))
|
||||
{
|
||||
if (conf->err_msg)
|
||||
cli_msg(8002, "%s, line %d: %s", name, conf->err_lino, conf->err_msg);
|
||||
cli_msg(8002, "%s, line %d: %s", conf->err_file_name, conf->err_lino, conf->err_msg);
|
||||
else
|
||||
cli_msg(8002, "%s: %m", name);
|
||||
config_free(conf);
|
||||
|
|
Loading…
Reference in a new issue