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 9731af7c..d6e4a4a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
[ssh-keygen.c]
make internal strptime string match strftime format;
suggested by vinschen AT redhat.com and markus@
+ - djm@cvs.openbsd.org 2010/03/08 00:28:55
+ [ssh-keygen.1]
+ document permit-agent-forwarding certificate constraint; patch from
+ stevesk@
- djm@cvs.openbsd.org 2010/03/07 22:01:32
[version.h]
openssh-5.4
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 069d8764..6557f933 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-keygen.1,v 1.87 2010/03/04 22:52:40 jmc Exp $
+.\" $OpenBSD: ssh-keygen.1,v 1.88 2010/03/08 00:28:55 djm Exp $
.\"
.\" -*- nroff -*-
.\"
@@ -37,7 +37,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: March 4 2010 $
+.Dd $Mdocdate: March 8 2010 $
.Dt SSH-KEYGEN 1
.Os
.Sh NAME
@@ -329,6 +329,10 @@ 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 permit-agent-forwarding
+Allows
+.Xr ssh-agent 1
+forwarding.
.It Ic permit-port-forwarding
Allows port forwarding.
.It Ic permit-pty