diff options
author | Darren Tucker <dtucker@zip.com.au> | 2012-12-07 13:06:13 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2012-12-07 13:06:13 +1100 |
commit | f9333d5246d979a448c5ff4d466de2fd2d286cfd (patch) | |
tree | 930757c09738a55b6d88fff7739777964b72d64b | |
parent | 3dfb877046b40638ac7c88de9bb07091eb463205 (diff) |
- jmc@cvs.openbsd.org 2012/12/03 08:33:03
[ssh-add.1 sshd_config.5]
tweak previous;
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | ssh-add.1 | 6 | ||||
-rw-r--r-- | sshd_config.5 | 7 |
3 files changed, 10 insertions, 6 deletions
@@ -9,6 +9,9 @@ | |||
9 | - check that KEY_COMMAND is executable (which it won't be if eg /var/run | 9 | - check that KEY_COMMAND is executable (which it won't be if eg /var/run |
10 | is mounted noexec). | 10 | is mounted noexec). |
11 | ok djm. | 11 | ok djm. |
12 | - jmc@cvs.openbsd.org 2012/12/03 08:33:03 | ||
13 | [ssh-add.1 sshd_config.5] | ||
14 | tweak previous; | ||
12 | 15 | ||
13 | 20121205 | 16 | 20121205 |
14 | - (tim) [defines.h] Some platforms are missing ULLONG_MAX. Feedback djm@. | 17 | - (tim) [defines.h] Some platforms are missing ULLONG_MAX. Feedback djm@. |
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-add.1,v 1.57 2012/12/02 20:42:15 djm Exp $ | 1 | .\" $OpenBSD: ssh-add.1,v 1.58 2012/12/03 08:33:02 jmc Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | .\" Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -35,7 +35,7 @@ | |||
35 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 35 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
36 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 36 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
37 | .\" | 37 | .\" |
38 | .Dd $Mdocdate: December 2 2012 $ | 38 | .Dd $Mdocdate: December 3 2012 $ |
39 | .Dt SSH-ADD 1 | 39 | .Dt SSH-ADD 1 |
40 | .Os | 40 | .Os |
41 | .Sh NAME | 41 | .Sh NAME |
@@ -99,7 +99,7 @@ Instead of adding identities, removes identities from the agent. | |||
99 | If | 99 | If |
100 | .Nm | 100 | .Nm |
101 | has been run without arguments, the keys for the default identities and | 101 | has been run without arguments, the keys for the default identities and |
102 | their corresponding certificateswill be removed. | 102 | their corresponding certificates will be removed. |
103 | Otherwise, the argument list will be interpreted as a list of paths to | 103 | Otherwise, the argument list will be interpreted as a list of paths to |
104 | public key files to specify keys and certificates to be removed from the agent. | 104 | public key files to specify keys and certificates to be removed from the agent. |
105 | If no public key is found at a given path, | 105 | 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 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: sshd_config.5,v 1.150 2012/12/02 20:46:11 djm Exp $ | 36 | .\" $OpenBSD: sshd_config.5,v 1.151 2012/12/03 08:33:03 jmc Exp $ |
37 | .Dd $Mdocdate: December 2 2012 $ | 37 | .Dd $Mdocdate: December 3 2012 $ |
38 | .Dt SSHD_CONFIG 5 | 38 | .Dt SSHD_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -133,7 +133,8 @@ to allow TCP forwarding, | |||
133 | to prevent all TCP forwarding, | 133 | to prevent all TCP forwarding, |
134 | .Dq local | 134 | .Dq local |
135 | to allow local (from the perspective of | 135 | to allow local (from the perspective of |
136 | .Xr ssh 1 ) forwarding only or | 136 | .Xr ssh 1 ) |
137 | forwarding only or | ||
137 | .Dq remote | 138 | .Dq remote |
138 | to allow remote forwarding only. | 139 | to allow remote forwarding only. |
139 | The default is | 140 | The default is |