diff options
| author | Damien Miller <djm@mindrot.org> | 2010-03-22 05:50:31 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2010-03-22 05:50:31 +1100 |
| commit | c59e2443d30cc7ff2eebd57399e88d55748ba422 (patch) | |
| tree | 3e1d38cee5d2efe1451667b575d442eeb8a9fc14 | |
| parent | 1f574b254663776209951b0327090c19c41c0749 (diff) | |
- jmc@cvs.openbsd.org 2010/03/08 09:41:27
[ssh-keygen.1]
sort the list of constraints (to -O); ok djm
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ssh-keygen.1 | 30 |
2 files changed, 21 insertions, 15 deletions
@@ -1,3 +1,9 @@ +20100321 + - (djm) OpenBSD CVS Sync + - jmc@cvs.openbsd.org 2010/03/08 09:41:27 + [ssh-keygen.1] + sort the list of constraints (to -O); ok djm + 20100314 - (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix compilation failure when !HAVE_DLOPEN. Reported by felix-mindrot diff --git a/ssh-keygen.1 b/ssh-keygen.1 index 6557f933..c819320d 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ssh-keygen.1,v 1.88 2010/03/08 00:28:55 djm Exp $ +.\" $OpenBSD: ssh-keygen.1,v 1.89 2010/03/08 09:41:27 jmc Exp $ .\" .\" -*- nroff -*- .\" @@ -307,8 +307,15 @@ Please see the section for details. The constraints that are valid for user certificates are: .Bl -tag -width Ds -.It Ic no-x11-forwarding -Disable X11 forwarding (permitted by default). +.It Ic clear +Clear all enabled permissions. +This is useful for clearing the default set of permissions so permissions may +be added individually. +.It Ic force-command Ns = Ns Ar command +Forces the execution of +.Ar command +instead of any shell or command specified by the user when +the certificate is used for authentication. .It Ic no-agent-forwarding Disable .Xr ssh-agent 1 @@ -323,12 +330,8 @@ Disable execution of by .Xr sshd 8 (permitted by default). -.It Ic clear -Clear all enabled permissions. -This is useful for clearing the default set of permissions so permissions may -be added individually. -.It Ic permit-x11-forwarding -Allows X11 forwarding. +.It Ic no-x11-forwarding +Disable X11 forwarding (permitted by default). .It Ic permit-agent-forwarding Allows .Xr ssh-agent 1 @@ -342,12 +345,9 @@ Allows execution of .Pa ~/.ssh/rc by .Xr sshd 8 . -.It Ic force-command=command -Forces the execution of -.Ar command -instead of any shell or command specified by the user when -the certificate is used for authentication. -.It Ic source-address=address_list +.It Ic permit-x11-forwarding +Allows X11 forwarding. +.It Ic source-address Ns = Ns Ar address_list Restrict the source addresses from which the certificate is considered valid from. The |