summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2006-10-18 07:53:06 +1000
committerDarren Tucker <dtucker@zip.com.au>2006-10-18 07:53:06 +1000
commitffe88e15afeb403e775d87cd45ae4bd5f1203172 (patch)
treecd13274ee7220f14ba379394e62cd5fefb90d270
parenta43c00582549a440fb744bdf8849ae53f97c9bc5 (diff)
- ray@cvs.openbsd.org 2006/09/25 04:55:38
[ssh-keyscan.1 ssh.1] Change "a SSH" to "an SSH". Hurray, I'm not the only one who pronounces "SSH" as "ess-ess-aich". OK jmc@ and stevesk@.
-rw-r--r--ChangeLog10
-rw-r--r--ssh-keyscan.14
-rw-r--r--ssh.14
3 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index fc86a6f94..d73ae5114 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
120061018
2 - (dtucker) OpenBSD CVS Sync
3 - ray@cvs.openbsd.org 2006/09/25 04:55:38
4 [ssh-keyscan.1 ssh.1]
5 Change "a SSH" to "an SSH". Hurray, I'm not the only one who
6 pronounces "SSH" as "ess-ess-aich".
7 OK jmc@ and stevesk@.
8
120061016 920061016
2 - (dtucker) [monitor_fdpass.c] Include sys/in.h, required for cmsg macros 10 - (dtucker) [monitor_fdpass.c] Include sys/in.h, required for cmsg macros
3 on older (2.0) Linuxes. Based on patch from thmo-13 at gmx de. 11 on older (2.0) Linuxes. Based on patch from thmo-13 at gmx de.
@@ -2528,4 +2536,4 @@
2528 OpenServer 6 and add osr5bigcrypt support so when someone migrates 2536 OpenServer 6 and add osr5bigcrypt support so when someone migrates
2529 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 2537 passwords between UnixWare and OpenServer they will still work. OK dtucker@
2530 2538
2531$Id: ChangeLog,v 1.4570 2006/10/16 09:49:12 dtucker Exp $ 2539$Id: ChangeLog,v 1.4571 2006/10/17 21:53:06 dtucker Exp $
diff --git a/ssh-keyscan.1 b/ssh-keyscan.1
index 80fc8cd96..a3656fc77 100644
--- a/ssh-keyscan.1
+++ b/ssh-keyscan.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keyscan.1,v 1.21 2005/09/30 20:34:26 jaredy Exp $ 1.\" $OpenBSD: ssh-keyscan.1,v 1.22 2006/09/25 04:55:38 ray Exp $
2.\" 2.\"
3.\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. 3.\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
4.\" 4.\"
@@ -102,7 +102,7 @@ Causes
102to print debugging messages about its progress. 102to print debugging messages about its progress.
103.El 103.El
104.Sh SECURITY 104.Sh SECURITY
105If a ssh_known_hosts file is constructed using 105If an ssh_known_hosts file is constructed using
106.Nm 106.Nm
107without verifying the keys, users will be vulnerable to 107without verifying the keys, users will be vulnerable to
108.Em man in the middle 108.Em man in the middle
diff --git a/ssh.1 b/ssh.1
index 6e41bcd8b..b6f09f400 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
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.263 2006/07/11 18:50:48 markus Exp $ 37.\" $OpenBSD: ssh.1,v 1.264 2006/09/25 04:55:38 ray Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -1105,7 +1105,7 @@ tunnel="1",command="sh /etc/netstart tun1" ssh-rsa ... jane
1105tunnel="2",command="sh /etc/netstart tun2" ssh-rsa ... john 1105tunnel="2",command="sh /etc/netstart tun2" ssh-rsa ... john
1106.Ed 1106.Ed
1107.Pp 1107.Pp
1108Since a SSH-based setup entails a fair amount of overhead, 1108Since an SSH-based setup entails a fair amount of overhead,
1109it may be more suited to temporary setups, 1109it may be more suited to temporary setups,
1110such as for wireless VPNs. 1110such as for wireless VPNs.
1111More permanent VPNs are better provided by tools such as 1111More permanent VPNs are better provided by tools such as