diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2005-09-15 20:24:47 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2005-09-15 20:24:47 +0000 |
| commit | b98d1245c2526851092c2f6f70e9d6650776ab36 (patch) | |
| tree | 00722e10f07543a655f1e93efdc4276467de1a38 /usr.sbin | |
| parent | 6759b09d281d276d3b3d54ffbef1c9980df9d67f (diff) | |
auth-md-keyid 0 is valid but is not allowed on Cis^H^Hrap routers.
Default to id 1 and mention it in the man page.
From a discussion with msf@ OK norby@
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/ospfd/ospfd.conf.5 | 5 | ||||
| -rw-r--r-- | usr.sbin/ospfd/parse.y | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/usr.sbin/ospfd/ospfd.conf.5 b/usr.sbin/ospfd/ospfd.conf.5 index 94e5daaddd0..27e40b4b0b4 100644 --- a/usr.sbin/ospfd/ospfd.conf.5 +++ b/usr.sbin/ospfd/ospfd.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ospfd.conf.5,v 1.10 2005/05/24 20:38:20 claudio Exp $ +.\" $OpenBSD: ospfd.conf.5,v 1.11 2005/09/15 20:24:46 claudio Exp $ .\" .\" Copyright (c) 2005 Esben Norby <norby@openbsd.org> .\" Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org> @@ -164,7 +164,8 @@ If the auth-type is set to crypt, up to 16 characters can be specified. Multiple keys may be specified. .It Ic auth-md-keyid Ar key-id Configure which key-id to use when using crypt authentication. -The default key-id is 0. +The default key-id is 1. +While key-id 0 is valid, it is unavailable on Cisco devices. .It Xo .Ic auth-type .Po Ic none Ns \&| Ns diff --git a/usr.sbin/ospfd/parse.y b/usr.sbin/ospfd/parse.y index 544be85073e..90cd81b6bae 100644 --- a/usr.sbin/ospfd/parse.y +++ b/usr.sbin/ospfd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.16 2005/06/28 22:35:34 claudio Exp $ */ +/* $OpenBSD: parse.y,v 1.17 2005/09/15 20:24:46 claudio Exp $ */ /* * Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org> @@ -958,6 +958,7 @@ conf_get_if(struct kif *kif) i->rxmt_interval = area->rxmt_interval; i->metric = area->metric; i->priority = area->priority; + i->auth_keyid = 1; return (i); } |