diff options
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/bgpd/bgpd.c | 8 | ||||
| -rw-r--r-- | usr.sbin/bgpd/parse.y | 7 |
2 files changed, 7 insertions, 8 deletions
diff --git a/usr.sbin/bgpd/bgpd.c b/usr.sbin/bgpd/bgpd.c index 43ead525611..b06cd5c2b24 100644 --- a/usr.sbin/bgpd/bgpd.c +++ b/usr.sbin/bgpd/bgpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bgpd.c,v 1.75 2004/02/07 11:42:30 henning Exp $ */ +/* $OpenBSD: bgpd.c,v 1.76 2004/02/09 00:00:41 henning Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -154,7 +154,11 @@ main(int argc, char *argv[]) exit(1); if (conf.opts & BGPD_OPT_NOACTION) { - fprintf(stderr, "configuration OK\n"); + if (conf.opts & BGPD_OPT_VERBOSE) + TAILQ_FOREACH(r, rules_l, entries) + print_rule(peer_l, r); + else + fprintf(stderr, "configuration OK\n"); exit(0); } diff --git a/usr.sbin/bgpd/parse.y b/usr.sbin/bgpd/parse.y index 0b137d3b785..5aa9e7438b5 100644 --- a/usr.sbin/bgpd/parse.y +++ b/usr.sbin/bgpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.53 2004/02/08 23:44:57 henning Exp $ */ +/* $OpenBSD: parse.y,v 1.54 2004/02/09 00:00:41 henning Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -865,7 +865,6 @@ parse_config(char *filename, struct bgpd_config *xconf, { struct sym *sym, *next; struct peer *p, *pnext; - struct filter_rule *r; if ((conf = calloc(1, sizeof(struct bgpd_config))) == NULL) fatal(NULL); @@ -916,10 +915,6 @@ parse_config(char *filename, struct bgpd_config *xconf, } } - if (xconf->opts & BGPD_OPT_VERBOSE) - TAILQ_FOREACH(r, filter_l, entries) - print_rule(peer_l, r); - errors += merge_config(xconf, conf, peer_l); errors += mrt_mergeconfig(xmconf, mrtconf); *xpeers = peer_l; |