summaryrefslogtreecommitdiffstats
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 0d5b400d..c30fae69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -73,6 +73,9 @@
- stevesk@cvs.openbsd.org 2008/10/14 18:11:33
[sshconnect.c]
use #define ROQUIET here; no binary change. ok dtucker@
+ - stevesk@cvs.openbsd.org 2008/10/17 18:36:24
+ [ssh_config.5]
+ correct and clarify VisualHostKey; ok jmc@
20080906
- (dtucker) [config.guess config.sub] Update to latest versions from
@@ -4807,4 +4810,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@
-$Id: ChangeLog,v 1.5115 2008/11/03 08:25:03 djm Exp $
+$Id: ChangeLog,v 1.5116 2008/11/03 08:25:21 djm Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 8ca55bd8..254940ef 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,8 +34,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: ssh_config.5,v 1.113 2008/10/10 16:43:27 stevesk Exp $
-.Dd $Mdocdate: October 10 2008 $
+.\" $OpenBSD: ssh_config.5,v 1.114 2008/10/17 18:36:24 stevesk Exp $
+.Dd $Mdocdate: October 17 2008 $
.Dt SSH_CONFIG 5
.Os
.Sh NAME
@@ -1065,10 +1065,12 @@ in
If this flag is set to
.Dq yes ,
an ASCII art representation of the remote host key fingerprint is
-printed additionally to the hex fingerprint string.
+printed in addition to the hex fingerprint string at login and
+for unknown host keys.
If this flag is set to
.Dq no ,
-only the hex fingerprint string will be printed.
+no fingerprint strings are printed at login and
+only the hex fingerprint string will be printed for unknown host keys.
The default is
.Dq no .
.It Cm XAuthLocation