summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--ssh.15
-rw-r--r--sshd.86
3 files changed, 8 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index efb7a0940..99ec97956 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,9 @@
23 - djm@cvs.openbsd.org 2010/03/05 02:58:11 23 - djm@cvs.openbsd.org 2010/03/05 02:58:11
24 [auth.c] 24 [auth.c]
25 make the warning for a revoked key louder and more noticable 25 make the warning for a revoked key louder and more noticable
26 - jmc@cvs.openbsd.org 2010/03/05 06:50:35
27 [ssh.1 sshd.8]
28 tweak previous;
26 - (tim) [ssh-pkcs11.c] Fix "non-constant initializer" errors in older 29 - (tim) [ssh-pkcs11.c] Fix "non-constant initializer" errors in older
27 compilers. OK djm@ 30 compilers. OK djm@
28 - (djm) [ssh-rand-helper.c] declare optind, avoiding compilation failure 31 - (djm) [ssh-rand-helper.c] declare optind, avoiding compilation failure
diff --git a/ssh.1 b/ssh.1
index b201d87de..fd713e3b4 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,8 +34,8 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh.1,v 1.299 2010/03/04 23:19:29 djm Exp $ 37.\" $OpenBSD: ssh.1,v 1.300 2010/03/05 06:50:34 jmc Exp $
38.Dd $Mdocdate: March 4 2010 $ 38.Dd $Mdocdate: March 5 2010 $
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -1103,7 +1103,6 @@ See the
1103option in 1103option in
1104.Xr ssh_config 5 1104.Xr ssh_config 5
1105for more information. 1105for more information.
1106.Pp
1107.Sh SSH-BASED VIRTUAL PRIVATE NETWORKS 1106.Sh SSH-BASED VIRTUAL PRIVATE NETWORKS
1108.Nm 1107.Nm
1109contains support for Virtual Private Network (VPN) tunnelling 1108contains support for Virtual Private Network (VPN) tunnelling
diff --git a/sshd.8 b/sshd.8
index 577d19940..5f1966005 100644
--- a/sshd.8
+++ b/sshd.8
@@ -34,8 +34,8 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: sshd.8,v 1.254 2010/03/04 23:19:29 djm Exp $ 37.\" $OpenBSD: sshd.8,v 1.255 2010/03/05 06:50:35 jmc Exp $
38.Dd $Mdocdate: March 4 2010 $ 38.Dd $Mdocdate: March 5 2010 $
39.Dt SSHD 8 39.Dt SSHD 8
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -721,7 +721,7 @@ or by taking
721.Pa /etc/ssh/ssh_host_key.pub 721.Pa /etc/ssh/ssh_host_key.pub
722and adding the host names at the front. 722and adding the host names at the front.
723.Xr ssh-keygen 1 723.Xr ssh-keygen 1
724also offers some basic automated editing for 724also offers some basic automated editing for
725.Pa ~/.ssh/known_hosts 725.Pa ~/.ssh/known_hosts
726including removing hosts matching a host name and converting all host 726including removing hosts matching a host name and converting all host
727names to their hashed representations. 727names to their hashed representations.