summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-03-08 11:30:00 +1100
committerDamien Miller <djm@mindrot.org>2010-03-08 11:30:00 +1100
commit081c976e1cac3a1588f484c89f2f48f7a554d1e5 (patch)
treeac450627cb7ec2c0eeaaa3799ce5dcec3d4d90e1
parent958678726c398457036d63c715494e53bd84c5b9 (diff)
- djm@cvs.openbsd.org 2010/03/08 00:28:55
[ssh-keygen.1] document permit-agent-forwarding certificate constraint; patch from stevesk@
-rw-r--r--ChangeLog4
-rw-r--r--ssh-keygen.18
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9731af7c0..d6e4a4a25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
4 [ssh-keygen.c] 4 [ssh-keygen.c]
5 make internal strptime string match strftime format; 5 make internal strptime string match strftime format;
6 suggested by vinschen AT redhat.com and markus@ 6 suggested by vinschen AT redhat.com and markus@
7 - djm@cvs.openbsd.org 2010/03/08 00:28:55
8 [ssh-keygen.1]
9 document permit-agent-forwarding certificate constraint; patch from
10 stevesk@
7 - djm@cvs.openbsd.org 2010/03/07 22:01:32 11 - djm@cvs.openbsd.org 2010/03/07 22:01:32
8 [version.h] 12 [version.h]
9 openssh-5.4 13 openssh-5.4
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 069d87649..6557f9336 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keygen.1,v 1.87 2010/03/04 22:52:40 jmc Exp $ 1.\" $OpenBSD: ssh-keygen.1,v 1.88 2010/03/08 00:28:55 djm Exp $
2.\" 2.\"
3.\" -*- nroff -*- 3.\" -*- nroff -*-
4.\" 4.\"
@@ -37,7 +37,7 @@
37.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 37.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
38.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 38.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
39.\" 39.\"
40.Dd $Mdocdate: March 4 2010 $ 40.Dd $Mdocdate: March 8 2010 $
41.Dt SSH-KEYGEN 1 41.Dt SSH-KEYGEN 1
42.Os 42.Os
43.Sh NAME 43.Sh NAME
@@ -329,6 +329,10 @@ This is useful for clearing the default set of permissions so permissions may
329be added individually. 329be added individually.
330.It Ic permit-x11-forwarding 330.It Ic permit-x11-forwarding
331Allows X11 forwarding. 331Allows X11 forwarding.
332.It Ic permit-agent-forwarding
333Allows
334.Xr ssh-agent 1
335forwarding.
332.It Ic permit-port-forwarding 336.It Ic permit-port-forwarding
333Allows port forwarding. 337Allows port forwarding.
334.It Ic permit-pty 338.It Ic permit-pty