From f9333d5246d979a448c5ff4d466de2fd2d286cfd Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Fri, 7 Dec 2012 13:06:13 +1100 Subject: [PATCH] - jmc@cvs.openbsd.org 2012/12/03 08:33:03 [ssh-add.1 sshd_config.5] tweak previous; --- ChangeLog | 3 +++ ssh-add.1 | 6 +++--- sshd_config.5 | 7 ++++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index be3118146..19dc33403 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,9 @@ - check that KEY_COMMAND is executable (which it won't be if eg /var/run is mounted noexec). ok djm. + - jmc@cvs.openbsd.org 2012/12/03 08:33:03 + [ssh-add.1 sshd_config.5] + tweak previous; 20121205 - (tim) [defines.h] Some platforms are missing ULLONG_MAX. Feedback djm@. diff --git a/ssh-add.1 b/ssh-add.1 index af93762ae..44846b67e 100644 --- a/ssh-add.1 +++ b/ssh-add.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ssh-add.1,v 1.57 2012/12/02 20:42:15 djm Exp $ +.\" $OpenBSD: ssh-add.1,v 1.58 2012/12/03 08:33:02 jmc Exp $ .\" .\" Author: Tatu Ylonen .\" Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -35,7 +35,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: December 2 2012 $ +.Dd $Mdocdate: December 3 2012 $ .Dt SSH-ADD 1 .Os .Sh NAME @@ -99,7 +99,7 @@ Instead of adding identities, removes identities from the agent. If .Nm has been run without arguments, the keys for the default identities and -their corresponding certificateswill be removed. +their corresponding certificates will be removed. Otherwise, the argument list will be interpreted as a list of paths to public key files to specify keys and certificates to be removed from the agent. If no public key is found at a given path, diff --git a/sshd_config.5 b/sshd_config.5 index d2c4db55b..ad3692b38 100644 --- a/sshd_config.5 +++ b/sshd_config.5 @@ -33,8 +33,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_config.5,v 1.150 2012/12/02 20:46:11 djm Exp $ -.Dd $Mdocdate: December 2 2012 $ +.\" $OpenBSD: sshd_config.5,v 1.151 2012/12/03 08:33:03 jmc Exp $ +.Dd $Mdocdate: December 3 2012 $ .Dt SSHD_CONFIG 5 .Os .Sh NAME @@ -133,7 +133,8 @@ to allow TCP forwarding, to prevent all TCP forwarding, .Dq local to allow local (from the perspective of -.Xr ssh 1 ) forwarding only or +.Xr ssh 1 ) +forwarding only or .Dq remote to allow remote forwarding only. The default is