summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorClaudio Jeker <claudio@cvs.openbsd.org>2007-01-26 23:17:19 +0000
committerClaudio Jeker <claudio@cvs.openbsd.org>2007-01-26 23:17:19 +0000
commita3f355d44d986a17843978dc23d4ad14b8ca673f (patch)
tree70ffd9f0e16895b05a7b6dc4b6c0009f6215a725 /usr.sbin
parent19aad8f90cb7b1ecf6f7c046006a7668721cc12e (diff)
Finally document announce capabilities (yes|no).
With help from jmc@
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/bgpd/bgpd.conf.513
1 files changed, 12 insertions, 1 deletions
diff --git a/usr.sbin/bgpd/bgpd.conf.5 b/usr.sbin/bgpd/bgpd.conf.5
index 89648366ac7..86183640e69 100644
--- a/usr.sbin/bgpd/bgpd.conf.5
+++ b/usr.sbin/bgpd/bgpd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bgpd.conf.5,v 1.79 2007/01/26 21:39:10 claudio Exp $
+.\" $OpenBSD: bgpd.conf.5,v 1.80 2007/01/26 23:17:18 claudio Exp $
.\"
.\" Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org>
.\" Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -433,6 +433,17 @@ are supported) are announced during the capabilities negotiation.
Only routes for that address family and subsequent address family will be
announced and processed.
.Pp
+.It Xo
+.Ic announce capabilities
+.Pq Ic yes Ns \&| Ns Ic no
+.Xc
+If set to
+.Ic no ,
+capability negotiation is disabled during the establishment of the session.
+This can be helpful to connect to old or broken BGP implementations.
+The default is
+.Ic yes .
+.Pp
.It Ic demote Ar group
Increase the
.Xr carp 4