1 files changed, 11 insertions, 18 deletions

diff --git a/readconf.c b/readconf.c
index 1d61145c4..73f6eb361 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.166 2008/06/11 21:01:35 grunk Exp $ */
+/* $OpenBSD: readconf.c,v 1.167 2008/06/26 11:46:31 grunk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -130,6 +130,7 @@ typedef enum {
         oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
         oSendEnv, oControlPath, oControlMaster, oHashKnownHosts,
         oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,
+        oVisualHostKey,
         oDeprecated, oUnsupported
 } OpCodes;
 
@@ -226,6 +227,7 @@ static struct {
         { "tunneldevice", oTunnelDevice },
         { "localcommand", oLocalCommand },
         { "permitlocalcommand", oPermitLocalCommand },
+        { "visualhostkey", oVisualHostKey },
         { NULL, oBadOption }
 };
 
@@ -452,23 +454,7 @@ parse_flag:
 
         case oCheckHostIP:
                 intptr = &options->check_host_ip;
-                arg = strdelim(&s);
-                if (!arg || *arg == '\0')
-                        fatal("%.200s line %d: Missing CheckHostIP argument.",
-                            filename, linenum);
-                value = 0;      /* To avoid compiler warning... */
-                if (strcmp(arg, "yes") == 0 || strcmp(arg, "true") == 0)
-                        value = SSHCTL_CHECKHOSTIP_YES;
-                else if (strcmp(arg, "no") == 0 || strcmp(arg, "false") == 0)
-                        value = SSHCTL_CHECKHOSTIP_NO;
-                else if (strcmp(arg, "fingerprint") == 0)
-                        value = SSHCTL_CHECKHOSTIP_FPR;
-                else
-                        fatal("%.200s line %d: Bad CheckHostIP argument.",
-                            filename, linenum);
-                if (*activep && *intptr == -1)
-                        *intptr = value;
-                break;
+                goto parse_flag;
 
         case oVerifyHostKeyDNS:
                 intptr = &options->verify_host_key_dns;
@@ -931,6 +917,10 @@ parse_int:
                 intptr = &options->permit_local_command;
                 goto parse_flag;
 
+        case oVisualHostKey:
+                intptr = &options->visual_host_key;
+                goto parse_flag;
+
         case oDeprecated:
                 debug("%s line %d: Deprecated option \"%s\"",
                     filename, linenum, keyword);
@@ -1081,6 +1071,7 @@ initialize_options(Options * options)
         options->tun_remote = -1;
         options->local_command = NULL;
         options->permit_local_command = -1;
+        options->visual_host_key = -1;
 }
 
 /*
@@ -1215,6 +1206,8 @@ fill_default_options(Options * options)
                 options->tun_remote = SSH_TUNID_ANY;
         if (options->permit_local_command == -1)
                 options->permit_local_command = 0;
+        if (options->visual_host_key == -1)
+                options->visual_host_key = 0;
         /* options->local_command should not be set by default */
         /* options->proxy_command should not be set by default */
         /* options->user will be set in the main program if appropriate */