summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/bgpd/bgpd.conf.514
-rw-r--r--usr.sbin/bgpd/parse.y6
2 files changed, 10 insertions, 10 deletions
diff --git a/usr.sbin/bgpd/bgpd.conf.5 b/usr.sbin/bgpd/bgpd.conf.5
index 4ecaad0f4bb..aecbf769d6b 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.36 2004/08/19 16:12:31 hshoexer Exp $
+.\" $OpenBSD: bgpd.conf.5,v 1.37 2004/08/20 14:56:09 claudio Exp $
.\"
.\" Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org>
.\" Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -355,7 +355,7 @@ section in
.Sx GLOBAL CONFIGURATION .
.Pp
.It Xo
-.Ic enforce neighbor-AS
+.Ic enforce neighbor-as
.Pq Ic yes Ns \&| Ns Ic no
.Xc
If set to
@@ -576,12 +576,12 @@ specified by the
.Ar as-type
is one of the following operators:
.Pp
-.Bl -tag -width transmit-AS -compact
+.Bl -tag -width transmit-as -compact
.It Ic AS
(any part)
-.It Ic source-AS
+.It Ic source-as
(rightmost AS number)
-.It Ic transit-AS
+.It Ic transit-as
(all but the rightmost AS number)
.El
.Pp
@@ -594,8 +594,8 @@ separated by commas or whitespace,
if enclosed in curly brackets:
.Bd -literal -offset indent
deny from any AS { 1, 2, 3 }
-deny from any { AS 1, source-AS 2, transit-AS 3 }
-deny from any { AS { 1, 2, 3 }, source-AS 4, transit-AS 5 }
+deny from any { AS 1, source-as 2, transit-as 3 }
+deny from any { AS { 1, 2, 3 }, source-as 4, transit-as 5 }
.Ed
.Pp
.It Xo
diff --git a/usr.sbin/bgpd/parse.y b/usr.sbin/bgpd/parse.y
index f34717bd509..5c6347cef6f 100644
--- a/usr.sbin/bgpd/parse.y
+++ b/usr.sbin/bgpd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.134 2004/08/17 16:06:39 claudio Exp $ */
+/* $OpenBSD: parse.y,v 1.135 2004/08/20 14:56:09 claudio Exp $ */
/*
* Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -1245,11 +1245,11 @@ lookup(char *s)
{ "route-reflector", REFLECTOR},
{ "router-id", ROUTERID},
{ "set", SET},
- { "source-AS", SOURCEAS},
+ { "source-as", SOURCEAS},
{ "spi", SPI},
{ "tcp", TCP},
{ "to", TO},
- { "transit-AS", TRANSITAS}
+ { "transit-as", TRANSITAS}
};
const struct keywords *p;