Merge 3.8p1 to the trunk. This builds and runs, but I haven't tested it

extensively yet.

ProtocolKeepAlives is now just a compatibility alias for
ServerAliveInterval.

1 files changed, 7 insertions, 8 deletions

diff --git a/dns.h b/dns.h
index ba0ea9fb4..c5da22ef6 100644
--- a/dns.h
+++ b/dns.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: dns.h,v 1.3 2003/05/14 22:56:51 jakob Exp $   */
+/*      $OpenBSD: dns.h,v 1.5 2003/11/12 16:39:58 jakob Exp $   */
 
 /*
  * Copyright (c) 2003 Wesley Griffin. All rights reserved.
@@ -28,7 +28,6 @@
 
 #include "includes.h"
 
-#ifdef DNS
 #ifndef DNS_H
 #define DNS_H
 
@@ -46,12 +45,12 @@ enum sshfp_hashes {
 #define DNS_RDATACLASS_IN       1
 #define DNS_RDATATYPE_SSHFP     44
 
-#define DNS_VERIFY_FAILED       -1
-#define DNS_VERIFY_OK           0
-#define DNS_VERIFY_ERROR        1
+#define DNS_VERIFY_FOUND        0x00000001
+#define DNS_VERIFY_MATCH        0x00000002
+#define DNS_VERIFY_SECURE       0x00000004
 
-int     verify_host_key_dns(const char *, struct sockaddr *, Key *);
-int     export_dns_rr(const char *, Key *, FILE *, int);
+
+int     verify_host_key_dns(const char *, struct sockaddr *, const Key *, int *);
+int     export_dns_rr(const char *, const Key *, FILE *, int);
 
 #endif /* DNS_H */
-#endif /* DNS */