summaryrefslogtreecommitdiffstats
path: root/usr.sbin/ripd
diff options
context:
space:
mode:
authorremi <remi@openbsd.org>2018-11-11 13:55:07 +0000
committerremi <remi@openbsd.org>2018-11-11 13:55:07 +0000
commit7bc1b36b64c50ff67a3462357fae3adaf50ef160 (patch)
treeefe6d6699d0352d146097dfadcadabd178d591b7 /usr.sbin/ripd
parentcopy the mpls cos and use it as the ip dscp/tos/tclass thing. (diff)
downloadwireguard-openbsd-7bc1b36b64c50ff67a3462357fae3adaf50ef160.tar.xz
wireguard-openbsd-7bc1b36b64c50ff67a3462357fae3adaf50ef160.zip
accept "interface ifX" without parameters. Extend the man page to show
an interface config example with and one without parameters. comment and OK claudio@
Diffstat (limited to 'usr.sbin/ripd')
-rw-r--r--usr.sbin/ripd/parse.y5
-rw-r--r--usr.sbin/ripd/ripd.conf.57
2 files changed, 8 insertions, 4 deletions
diff --git a/usr.sbin/ripd/parse.y b/usr.sbin/ripd/parse.y
index fc504d6c828..f77493a88f6 100644
--- a/usr.sbin/ripd/parse.y
+++ b/usr.sbin/ripd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.43 2018/11/01 00:18:44 sashan Exp $ */
+/* $OpenBSD: parse.y,v 1.44 2018/11/11 13:55:07 remi Exp $ */
/*
* Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it>
@@ -354,7 +354,8 @@ interface : INTERFACE STRING {
}
;
-interface_block : '{' optnl interfaceopts_l '}'
+interface_block : /* empty */
+ | '{' optnl interfaceopts_l '}'
| '{' optnl '}'
;
diff --git a/usr.sbin/ripd/ripd.conf.5 b/usr.sbin/ripd/ripd.conf.5
index 0c819fee624..d353c270d21 100644
--- a/usr.sbin/ripd/ripd.conf.5
+++ b/usr.sbin/ripd/ripd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ripd.conf.5,v 1.16 2018/11/10 19:12:34 remi Exp $
+.\" $OpenBSD: ripd.conf.5,v 1.17 2018/11/11 13:55:07 remi Exp $
.\"
.\" Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it>
.\" Copyright (c) 2005, 2006 Esben Norby <norby@openbsd.org>
@@ -18,7 +18,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: November 10 2018 $
+.Dd $Mdocdate: November 11 2018 $
.Dt RIPD.CONF 5
.Os
.Sh NAME
@@ -156,7 +156,10 @@ Each interface can have several parameters configured individually, otherwise
they are inherited.
.Bd -literal -offset indent
interface em0 {
+ cost 9
+ auth-type none
}
+interface ix1
.Ed
.Pp
Interface-specific parameters are listed below.