Merge 4.0p1 to the trunk.

1 files changed, 7 insertions, 2 deletions

diff --git a/hostfile.h b/hostfile.h
index efcddc9f9..d6330752e 100644
--- a/hostfile.h
+++ b/hostfile.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: hostfile.h,v 1.14 2003/11/10 16:23:41 jakob Exp $     */
+/*      $OpenBSD: hostfile.h,v 1.15 2005/03/01 10:40:26 djm Exp $       */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -21,8 +21,13 @@ typedef enum {
 int      hostfile_read_key(char **, u_int *, Key *);
 HostStatus check_host_in_hostfile(const char *, const char *,
             const Key *, Key *, int *);
-int     add_host_to_hostfile(const char *, const char *, const Key *);
+int     add_host_to_hostfile(const char *, const char *, const Key *, int);
 int     lookup_key_in_hostfile_by_type(const char *, const char *,
             int, Key *, int *);
 
+#define HASH_MAGIC      "|1|"
+#define HASH_DELIM      '|'
+
+char    *host_hash(const char *, const char *, u_int);
+
 #endif