Import openssh_7.6p1.orig.tar.gz

1 files changed, 8 insertions, 8 deletions

diff --git a/readconf.h b/readconf.h
index cef55f71c..22fe5c187 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.h,v 1.117 2016/07/15 00:24:30 djm Exp $ */
+/* $OpenBSD: readconf.h,v 1.123 2017/09/03 23:33:13 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -37,9 +37,6 @@ typedef struct {
         char   *xauth_location; /* Location for xauth program */
         struct ForwardOptions fwd_opts; /* forwarding options */
         int     use_privileged_port;    /* Don't use privileged port if false. */
-        int     rhosts_rsa_authentication;      /* Try rhosts with RSA
-                                                 * authentication. */
-        int     rsa_authentication;     /* Try RSA authentication. */
         int     pubkey_authentication;  /* Try ssh2 pubkey authentication. */
         int     hostbased_authentication;       /* ssh2's rhosts_rsa */
         int     challenge_response_authentication;
@@ -54,11 +51,10 @@ typedef struct {
         int     check_host_ip;  /* Also keep track of keys for IP address */
         int     strict_host_key_checking;       /* Strict host key checking. */
         int     compression;    /* Compress packets in both directions. */
-        int     compression_level;      /* Compression level 1 (fast) to 9
-                                         * (best). */
         int     tcp_keep_alive; /* Set SO_KEEPALIVE. */
         int     ip_qos_interactive;     /* IP ToS/DSCP/class for interactive */
         int     ip_qos_bulk;            /* IP ToS/DSCP/class for bulk traffic */
+        SyslogFacility log_facility;    /* Facility for system logging. */
         LogLevel log_level;     /* Level for logging. */
 
         int     port;           /* Port to connect. */
@@ -69,12 +65,10 @@ typedef struct {
                                          * aborting connection attempt */
         int     number_of_password_prompts;     /* Max number of password
                                                  * prompts. */
-        int     cipher;         /* Cipher to use. */
         char   *ciphers;        /* SSH2 ciphers in order of preference. */
         char   *macs;           /* SSH2 macs in order of preference. */
         char   *hostkeyalgorithms;      /* SSH2 server key types in order of preference. */
         char   *kex_algorithms; /* SSH2 kex methods in order of preference. */
-        int     protocol;       /* Protocol in order of preference. */
         char   *hostname;       /* Real host to connect. */
         char   *host_key_alias; /* hostname alias for .ssh/known_hosts */
         char   *proxy_command;  /* Proxy command for connecting the host. */
@@ -140,6 +134,7 @@ typedef struct {
 
         char    *local_command;
         int     permit_local_command;
+        char    *remote_command;
         int     visual_host_key;
 
         int     request_tty;
@@ -195,6 +190,11 @@ typedef struct {
 #define SSH_UPDATE_HOSTKEYS_YES 1
 #define SSH_UPDATE_HOSTKEYS_ASK 2
 
+#define SSH_STRICT_HOSTKEY_OFF  0
+#define SSH_STRICT_HOSTKEY_NEW  1
+#define SSH_STRICT_HOSTKEY_YES  2
+#define SSH_STRICT_HOSTKEY_ASK  3
+
 void     initialize_options(Options *);
 void     fill_default_options(Options *);
 void     fill_default_options_for_canonicalization(Options *);