summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-03-04 21:51:37 +1100
committerDamien Miller <djm@mindrot.org>2010-03-04 21:51:37 +1100
commitcd38c9c5551094261775b99994fa0c12d333c94c (patch)
tree5745f498ccc705261cafb43904266727f8d37726
parent41396573afc94d64973d9eb824ca510d39260b3e (diff)
- djm@cvs.openbsd.org 2010/03/03 22:49:50
[sshd.8] the authorized_keys option for CA keys is "cert-authority", not "from=cert-authority". spotted by imorgan AT nas.nasa.gov
-rw-r--r--ChangeLog4
-rw-r--r--sshd.86
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 36ef5c91..fd1ff648 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,10 @@
[auth-options.c key.c]
reject strings with embedded ASCII nul chars in certificate key IDs,
principal names and constraints
+ - djm@cvs.openbsd.org 2010/03/03 22:49:50
+ [sshd.8]
+ the authorized_keys option for CA keys is "cert-authority", not
+ "from=cert-authority". spotted by imorgan AT nas.nasa.gov
20100303
- (djm) [PROTOCOL.certkeys] Add RCS Ident
diff --git a/sshd.8 b/sshd.8
index 88a86f95..d3153817 100644
--- a/sshd.8
+++ b/sshd.8
@@ -34,8 +34,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: sshd.8,v 1.252 2010/02/26 22:09:28 jmc Exp $
-.Dd $Mdocdate: February 26 2010 $
+.\" $OpenBSD: sshd.8,v 1.253 2010/03/03 22:49:50 djm Exp $
+.Dd $Mdocdate: March 3 2010 $
.Dt SSHD 8
.Os
.Sh NAME
@@ -508,7 +508,7 @@ No spaces are permitted, except within double quotes.
The following option specifications are supported (note
that option keywords are case-insensitive):
.Bl -tag -width Ds
-.It Cm from="cert-authority"
+.It Cm cert-authority
Specifies that the listed key is a certification authority (CA) that is
trusted to validate signed certificates for user authentication.
.Pp