diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2006-04-18 19:00:53 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2006-04-18 19:00:53 +0000 |
| commit | 939584fef88ea83d5126ff046d9d329ae42ff43f (patch) | |
| tree | ebbcffe4e9410c2ac77e6d0e29ba4205e15ceae8 /usr.sbin/bgpd/parse.y | |
| parent | 4a876bf4f9db5c8cc334e88a8d7480d091b7dfad (diff) | |
Fix "announce self" that got broken by "nexthop self". Found by Thomas Bader.
OK henning@
Diffstat (limited to 'usr.sbin/bgpd/parse.y')
| -rw-r--r-- | usr.sbin/bgpd/parse.y | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/usr.sbin/bgpd/parse.y b/usr.sbin/bgpd/parse.y index 632f4cbd965..593602a1129 100644 --- a/usr.sbin/bgpd/parse.y +++ b/usr.sbin/bgpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.185 2006/04/04 12:03:26 henning Exp $ */ +/* $OpenBSD: parse.y,v 1.186 2006/04/18 19:00:52 claudio Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -690,6 +690,12 @@ peeropts : REMOTEAS asnumber { fatal("king bula sees borked AFI"); } } + | ANNOUNCE CAPABILITIES yesno { + curpeer->conf.announce_capa = $3; + } + | ANNOUNCE SELF { + curpeer->conf.announce_type = ANNOUNCE_SELF; + } | ANNOUNCE STRING { if (!strcmp($2, "self")) curpeer->conf.announce_type = ANNOUNCE_SELF; @@ -847,9 +853,6 @@ peeropts : REMOTEAS asnumber { } free($7); } - | ANNOUNCE CAPABILITIES yesno { - curpeer->conf.announce_capa = $3; - } | SET filter_set_opt { struct filter_rule *r; |