summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2008-11-03 19:25:21 +1100
committerDamien Miller <djm@mindrot.org>2008-11-03 19:25:21 +1100
commita414cd3b196538a9ba5a0f0877bbf15f2dd4042d (patch)
tree6d88f8301eb197dc9bd5484dec0103d44bc7bc07
parentece92c8c5e03b1f927d0f8a8e6b3b37919c951c1 (diff)
- stevesk@cvs.openbsd.org 2008/10/17 18:36:24
[ssh_config.5] correct and clarify VisualHostKey; ok jmc@
-rw-r--r--ChangeLog5
-rw-r--r--ssh_config.510
2 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 0d5b400d6..c30fae694 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -73,6 +73,9 @@
73 - stevesk@cvs.openbsd.org 2008/10/14 18:11:33 73 - stevesk@cvs.openbsd.org 2008/10/14 18:11:33
74 [sshconnect.c] 74 [sshconnect.c]
75 use #define ROQUIET here; no binary change. ok dtucker@ 75 use #define ROQUIET here; no binary change. ok dtucker@
76 - stevesk@cvs.openbsd.org 2008/10/17 18:36:24
77 [ssh_config.5]
78 correct and clarify VisualHostKey; ok jmc@
76 79
7720080906 8020080906
78 - (dtucker) [config.guess config.sub] Update to latest versions from 81 - (dtucker) [config.guess config.sub] Update to latest versions from
@@ -4807,4 +4810,4 @@
4807 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4810 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4808 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4811 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4809 4812
4810$Id: ChangeLog,v 1.5115 2008/11/03 08:25:03 djm Exp $ 4813$Id: ChangeLog,v 1.5116 2008/11/03 08:25:21 djm Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 8ca55bd80..254940ef8 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -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_config.5,v 1.113 2008/10/10 16:43:27 stevesk Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.114 2008/10/17 18:36:24 stevesk Exp $
38.Dd $Mdocdate: October 10 2008 $ 38.Dd $Mdocdate: October 17 2008 $
39.Dt SSH_CONFIG 5 39.Dt SSH_CONFIG 5
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -1065,10 +1065,12 @@ in
1065If this flag is set to 1065If this flag is set to
1066.Dq yes , 1066.Dq yes ,
1067an ASCII art representation of the remote host key fingerprint is 1067an ASCII art representation of the remote host key fingerprint is
1068printed additionally to the hex fingerprint string. 1068printed in addition to the hex fingerprint string at login and
1069for unknown host keys.
1069If this flag is set to 1070If this flag is set to
1070.Dq no , 1071.Dq no ,
1071only the hex fingerprint string will be printed. 1072no fingerprint strings are printed at login and
1073only the hex fingerprint string will be printed for unknown host keys.
1072The default is 1074The default is
1073.Dq no . 1075.Dq no .
1074.It Cm XAuthLocation 1076.It Cm XAuthLocation