update version number for new patch release

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

diff --git a/openssh/readconf.c b/openssh/readconf.c
index a0adcb520caffa4cf59dfbe6e79f4c80710b39e8..6896dab129703f111dc359e8d032c6c3fb37d4ef 100644 (file)
--- a/openssh/readconf.c
+++ b/openssh/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.161 2007/01/21 01:45:35 stevesk Exp $ */
+/* $OpenBSD: readconf.c,v 1.162 2007/03/20 03:56:12 tedu Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -510,7 +510,6 @@ parse_flag:
                intptr = &options->verify_host_key_dns;
                goto parse_yesnoask;
 
-
        case oStrictHostKeyChecking:
                intptr = &options->strict_host_key_checking;
 parse_yesnoask:
@@ -1263,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)
@@ -1315,7 +1316,7 @@ parse_forward(Forward *fwd, const char *fwdspec)
        cp = p = xstrdup(fwdspec);
 
        /* skip leading spaces */
-       while (*cp && isspace(*cp))
+       while (isspace(*cp))
                cp++;
 
        for (i = 0; i < 4; ++i)