- (dtucker) [auth-sia.c] Bug #1241: support password expiry on Tru64 SIA

[openssh.git] / readconf.h

diff --git a/readconf.h b/readconf.h
index e99b1ff25690cff8baaf650eb7fbb1d47f012de4..5c16a0ba6c89e9ace88b93922e9156b828e01f5a 100644 (file)
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.h,v 1.70 2006/07/11 18:50:48 markus Exp $ */
+/* $OpenBSD: readconf.h,v 1.73 2008/06/11 21:01:35 grunk Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -16,8 +16,6 @@
 #ifndef READCONF_H
 #define READCONF_H
 
-#include "key.h"
-
 /* Data structure for representing a forwarding request. */
 
 typedef struct {
@@ -102,7 +100,7 @@ typedef struct {
        int     clear_forwardings;
 
        int     enable_ssh_keysign;
-       int     rekey_limit;
+       int64_t rekey_limit;
        int     no_host_authentication_for_localhost;
        int     identities_only;
        int     server_alive_interval;
@@ -125,6 +123,10 @@ typedef struct {
 
 }       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