diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2012-04-15 15:17:03 +0200 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2012-04-15 15:17:03 +0200 |
| commit | 3e17e380598b9a512bb369f51a4cf55da269f608 (patch) | |
| tree | 50d1bdd4e82460861f1af2620032c46b33d340d3 | |
| parent | 00a09f3c367e79297f827b52ec5f16842db1ac4e (diff) | |
| parent | ae8b300164a975597f9b6caea0b205af2e4db30b (diff) | |
Merge branch 'master' into rt-accepted
| -rw-r--r-- | proto/static/static.c | 3 | ||||
| -rw-r--r-- | sysdep/unix/main.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/proto/static/static.c b/proto/static/static.c index aaa9bfad..6a027f50 100644 --- a/proto/static/static.c +++ b/proto/static/static.c @@ -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; diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c index 9219da9b..dfe0b89c 100644 --- a/sysdep/unix/main.c +++ b/sysdep/unix/main.c @@ -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); |