- djm@cvs.openbsd.org 2010/01/30 02:54:53

[openssh.git] / readconf.h

diff --git a/readconf.h b/readconf.h
index e99b1ff25690cff8baaf650eb7fbb1d47f012de4..f7c0b9c6d13f93f8e17e4adb6a0b9e422ecbd6f8 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.81 2010/01/09 23:04:13 dtucker Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -16,15 +16,13 @@
 #ifndef READCONF_H
 #define READCONF_H
 
-#include "key.h"
-
 /* Data structure for representing a forwarding request. */
 
 typedef struct {
        char     *listen_host;          /* Host (address) to listen on. */
-       u_short   listen_port;          /* Port to forward. */
+       int       listen_port;          /* Port to forward. */
        char     *connect_host;         /* Host to connect. */
-       u_short   connect_port;         /* Port to connect on connect_host. */
+       int       connect_port;         /* Port to connect on connect_host. */
 }       Forward;
 /* Data structure for representing option data. */
 
@@ -51,6 +49,7 @@ typedef struct {
                                                 * authentication. */
        int     kbd_interactive_authentication; /* Try keyboard-interactive auth. */
        char    *kbd_interactive_devices; /* Keyboard-interactive auth devices. */
+       int     zero_knowledge_password_authentication; /* Try jpake */
        int     batch_mode;     /* Batch mode: do not ask for passwords. */
        int     check_host_ip;  /* Also keep track of keys for IP address */
        int     strict_host_key_checking;       /* Strict host key checking. */
@@ -102,7 +101,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;
@@ -122,6 +121,9 @@ typedef struct {
 
        char    *local_command;
        int     permit_local_command;
+       int     visual_host_key;
+
+       int     use_roaming;
 
 }       Options;
 
@@ -134,7 +136,7 @@ typedef struct {
 void     initialize_options(Options *);
 void     fill_default_options(Options *);
 int     read_config_file(const char *, const char *, Options *, int);
-int     parse_forward(Forward *, const char *);
+int     parse_forward(Forward *, const char *, int, int);
 
 int
 process_config_line(Options *, const char *, char *, const char *, int, int *);