merging OPENSSH_5_2P1_SIMON_20090726_HPN13V6 to trunk:

[gssapi-openssh.git] / openssh / readconf.h

diff --git a/openssh/readconf.h b/openssh/readconf.h
index 1fc653b1b2b91eff1abf12a226c506cb028a8559..12477c05681b36dbfa5323ef5c142683a3749c80 100644 (file)
--- a/openssh/readconf.h
+++ b/openssh/readconf.h
@@ -61,6 +61,11 @@ typedef struct {
        int     compression_level;      /* Compression level 1 (fast) to 9
                                         * (best). */
        int     tcp_keep_alive; /* Set SO_KEEPALIVE. */
+        int     tcp_rcv_buf; /* user switch to set tcp recv buffer */
+       int     tcp_rcv_buf_poll; /* Option to poll recv buf every window transfer */
+       int     hpn_disabled;    /* Switch to disable HPN buffer management */
+       int     hpn_buffer_size; /* User definable size for HPN buffer window */
+
        LogLevel log_level;     /* Level for logging. */
 
        int     port;           /* Port to connect. */
@@ -80,6 +85,8 @@ typedef struct {
        char   *host_key_alias; /* hostname alias for .ssh/known_hosts */
        char   *proxy_command;  /* Proxy command for connecting the host. */
        char   *user;           /* User to log in as. */
+       int    implicit;        /* Login user was not specified.
+                                  Server may choose based on authctxt. */
        int     escape_char;    /* Escape character; -2 = none */
 
        char   *system_hostfile;/* Path for /etc/ssh/ssh_known_hosts. */
@@ -106,6 +113,8 @@ typedef struct {
 
        int     enable_ssh_keysign;
        int64_t rekey_limit;
+       int     none_switch;    /* Use none cipher */
+       int     none_enabled;   /* Allow none to be used */
        int     no_host_authentication_for_localhost;
        int     identities_only;
        int     server_alive_interval;