Update to hpn12v20 from hpn12v18.

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

diff --git a/openssh/readconf.c b/openssh/readconf.c
index 3dce5a2344f3d6ea1c444a71d501dd11a1d9c7f2..6896dab129703f111dc359e8d032c6c3fb37d4ef 100644 (file)
--- a/openssh/readconf.c
+++ b/openssh/readconf.c
@@ -1262,21 +1262,23 @@ fill_default_options(Options * options)
                options->hpn_disabled = 0;
        if (options->hpn_buffer_size > -1)
        {
+         /* if a user tries to set the size to 0 set it to 1KB */
                if (options->hpn_buffer_size == 0)
-               options->hpn_buffer_size = 1;
+               options->hpn_buffer_size = 1024;
                /*limit the buffer to 64MB*/
-                       if (options->hpn_buffer_size > 65536)
+               if (options->hpn_buffer_size > 65536)
                {
-                       options->hpn_buffer_size = 65536;
+                       options->hpn_buffer_size = 65536*1024;
                        debug("User requested buffer larger than 64MB. Request reverted to 64MB");
                }
-               options->hpn_buffer_size *=1024;
                debug("hpn_buffer_size set to %d", options->hpn_buffer_size);
        }
        if (options->tcp_rcv_buf == 0)
                options->tcp_rcv_buf = 1;
        if (options->tcp_rcv_buf > -1) 
                options->tcp_rcv_buf *=1024;
+       if (options->tcp_rcv_buf_poll == -1)
+               options->tcp_rcv_buf_poll = 1;
        if (options->control_master == -1)
                options->control_master = 0;
        if (options->hash_known_hosts == -1)