Tweak the environment variables set by the configure script for the

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

diff --git a/openssh/servconf.c b/openssh/servconf.c
index efed3dabb1a00e1caf2716d7801b6c84f6738e0c..34faed963ad931089ddc55d2371e77ed09ed5eda 100644 (file)
--- a/openssh/servconf.c
+++ b/openssh/servconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.c,v 1.170 2007/03/01 10:28:02 dtucker Exp $ */
+/* $OpenBSD: servconf.c,v 1.172 2007/04/23 10:15:39 dtucker Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -275,16 +275,12 @@ fill_default_server_options(ServerOptions *options)
        if (options->hpn_disabled == -1) 
                options->hpn_disabled = 0;
 
-       if (options->hpn_buffer_size == -1) 
-       {
+       if (options->hpn_buffer_size == -1) {
                /* option not explicitly set. Now we have to figure out */
                /* what value to use */
-               if (options->hpn_disabled == 1) 
-               {
+               if (options->hpn_disabled == 1) {
                        options->hpn_buffer_size = CHAN_SES_WINDOW_DEFAULT;
-               }
-               else 
-               {
+               } else {
                        /* get the current RCV size and set it to that */
                        /*create a socket but don't connect it */
                        /* we use that the get the rcv socket size */
@@ -296,30 +292,26 @@ fill_default_server_options(ServerOptions *options)
                        debug ("HPN Buffer Size: %d", options->hpn_buffer_size);
                        
                } 
-       }
-       else 
-       {
+       } else {
                /* we have to do this incase the user sets both values in a contradictory */
                /* manner. hpn_disabled overrrides hpn_buffer_size*/
-               if (options->hpn_disabled <= 0) 
-               {
-                       if (options->hpn_buffer_size == 0)
-                               options->hpn_buffer_size = 1;
-                       /* limit the maximum buffer to 64MB */
-                       if (options->hpn_buffer_size > 64*1024)
-                               options->hpn_buffer_size = 64*1024;
-                       options->hpn_buffer_size *=1024;
-               }
-               else
-                       options->hpn_buffer_size = CHAN_SES_WINDOW_DEFAULT;
+               if (options->hpn_disabled <= 0) {
+                       if (options->hpn_buffer_size == 0)
+                               options->hpn_buffer_size = 1;
+                       /* limit the maximum buffer to 64MB */
+                       if (options->hpn_buffer_size > 64*1024) {
+                               options->hpn_buffer_size = 64*1024*1024;
+                       } else {
+                               options->hpn_buffer_size *= 1024;
+                       }
+               } else
+                       options->hpn_buffer_size = CHAN_TCP_WINDOW_DEFAULT;
        }
 
        /* Turn privilege separation on by default */
        if (use_privsep == -1)
                use_privsep = 1;
 
-
-
 #ifndef HAVE_MMAP
        if (use_privsep && options->compression == 1) {
                error("This platform does not support both privilege "
@@ -688,7 +680,6 @@ match_cfg_line(char **condition, int line, const char *user, const char *host,
                                debug("connection from %.100s matched 'Host "
                                    "%.100s' at line %d", host, arg, line);
                } else if (strcasecmp(attrib, "address") == 0) {
-                       debug("address '%s' arg '%s'", address, arg);
                        if (!address) {
                                result = 0;
                                continue;
@@ -1532,8 +1523,4 @@ parse_server_config(ServerOptions *options, const char *filename, Buffer *conf,
        if (bad_options > 0)
                fatal("%s: terminating, %d bad configuration options",
                    filename, bad_options);
-
-       /* challenge-response is implemented via keyboard interactive */
-       if (options->challenge_response_authentication == 1)
-               options->kbd_interactive_authentication = 1;
 }