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

[openssh.git] / readconf.h

diff --git a/readconf.h b/readconf.h
index 6257f4b2f522415ff9dc3b127fbc140d3928c9cd..f7c0b9c6d13f93f8e17e4adb6a0b9e422ecbd6f8 100644 (file)
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.h,v 1.72 2008/01/19 23:09:49 djm Exp $ */
+/* $OpenBSD: readconf.h,v 1.81 2010/01/09 23:04:13 dtucker Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -20,9 +20,9 @@
 
 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. */
 
@@ -49,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. */
@@ -120,6 +121,9 @@ typedef struct {
 
        char    *local_command;
        int     permit_local_command;
+       int     visual_host_key;
+
+       int     use_roaming;
 
 }       Options;
 
@@ -132,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 *);