- deraadt@cvs.openbsd.org 2001/04/14 04:31:01

[openssh.git] / hostfile.c

diff --git a/hostfile.c b/hostfile.c
index 1c3fb22ad43acba6c47fe79a666f394fb4545822..d532bd6adbb0ea6728cc082f6262e2021d597343 100644 (file)
--- a/hostfile.c
+++ b/hostfile.c
@@ -36,15 +36,13 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: hostfile.c,v 1.23 2000/12/21 15:10:16 markus Exp $");
+RCSID("$OpenBSD: hostfile.c,v 1.26 2001/04/12 19:15:24 markus Exp $");
 
 #include "packet.h"
 #include "match.h"
-#include "ssh.h"
-#include <openssl/rsa.h>
-#include <openssl/dsa.h>
 #include "key.h"
 #include "hostfile.h"
+#include "log.h"
 
 /*
  * Parses an RSA (number of bits, e, n) or DSA key from a string.  Moves the
@@ -113,10 +111,11 @@ check_host_in_hostfile(const char *filename, const char *host, Key *key,
        FILE *f;
        char line[8192];
        int linenum = 0;
-       u_int kbits, hostlen;
+       u_int kbits;
        char *cp, *cp2;
        HostStatus end_return;
 
+       debug3("check_host_in_hostfile: filename %s", filename);
        if (key == NULL)
                fatal("no key to look up");
        /* Open the file containing the list of known hosts. */
@@ -124,9 +123,6 @@ check_host_in_hostfile(const char *filename, const char *host, Key *key,
        if (!f)
                return HOST_NEW;
 
-       /* Cache the length of the host name. */
-       hostlen = strlen(host);
-
        /*
         * Return value when the loop terminates.  This is set to
         * HOST_CHANGED if we have seen a different key for the host and have
@@ -134,7 +130,7 @@ check_host_in_hostfile(const char *filename, const char *host, Key *key,
         */
        end_return = HOST_NEW;
 
-       /* Go trough the file. */
+       /* Go through the file. */
        while (fgets(line, sizeof(line), f)) {
                cp = line;
                linenum++;
@@ -171,6 +167,7 @@ check_host_in_hostfile(const char *filename, const char *host, Key *key,
                /* Check if the current key is the same as the given key. */
                if (key_equal(key, found)) {
                        /* Ok, they match. */
+                       debug3("check_host_in_hostfile: match line %d", linenum);
                        fclose(f);
                        return HOST_OK;
                }