- grunk@cvs.openbsd.org 2008/06/26 11:46:31

     [readconf.c readconf.h ssh.1 ssh_config.5 sshconnect.c]
     Move SSH Fingerprint Visualization away from sharing the config option
     CheckHostIP to an own config option named VisualHostKey.
     While there, fix the behaviour that ssh would draw a random art picture
     on every newly seen host even when the option was not enabled.
     prodded by deraadt@, discussions,
     help and ok markus@ djm@ dtucker@

1 files changed, 2 insertions, 5 deletions

diff --git a/readconf.h b/readconf.h
index 5c16a0ba6..47c7aef4e 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.h,v 1.73 2008/06/11 21:01:35 grunk Exp $ */
+/* $OpenBSD: readconf.h,v 1.74 2008/06/26 11:46:31 grunk Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -120,13 +120,10 @@ typedef struct {
 
         char    *local_command;
         int     permit_local_command;
+        int     visual_host_key;
 
 }       Options;
 
-#define SSHCTL_CHECKHOSTIP_NO   0
-#define SSHCTL_CHECKHOSTIP_YES  1
-#define SSHCTL_CHECKHOSTIP_FPR  2
-
 #define SSHCTL_MASTER_NO        0
 #define SSHCTL_MASTER_YES       1
 #define SSHCTL_MASTER_AUTO      2