diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2010-02-11 14:40:07 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2010-02-11 14:40:07 +0000 |
| commit | 647c52d0a66bfb7d8171b02ca1b22e64e83ef901 (patch) | |
| tree | bffd8f594cced88ae09fd5162fe20d89bf79d4af | |
| parent | 3d3365878fb3953a18b6083c52afb914b56ef0bf (diff) | |
We need to load the config before kr_init() is called or fib-update is
ignored. Found and fix tested by Elisa Jasinska.
| -rw-r--r-- | usr.sbin/bgpd/bgpd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/bgpd/bgpd.c b/usr.sbin/bgpd/bgpd.c index 59ace434811..1ed66abd9f6 100644 --- a/usr.sbin/bgpd/bgpd.c +++ b/usr.sbin/bgpd/bgpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bgpd.c,v 1.153 2010/01/11 05:47:51 claudio Exp $ */ +/* $OpenBSD: bgpd.c,v 1.154 2010/02/11 14:40:06 claudio Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -250,12 +250,12 @@ main(int argc, char *argv[]) imsg_init(ibuf_se, pipe_m2s[0]); imsg_init(ibuf_rde, pipe_m2r[0]); mrt_init(ibuf_rde, ibuf_se); + quit = reconfigure(conffile, &conf, &mrt_l, &peer_l, rules_l); if ((rfd = kr_init(!(conf.flags & BGPD_FLAG_NO_FIB_UPDATE), conf.rtableid)) == -1) quit = 1; if (pftable_clear_all() != 0) quit = 1; - quit = reconfigure(conffile, &conf, &mrt_l, &peer_l, rules_l); while (quit == 0) { bzero(pfd, sizeof(pfd)); |