Merged hpn13v5 to trunk.

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

diff --git a/openssh/servconf.c b/openssh/servconf.c
index 3194f850b091fe4f813753d405ab9d8397ff60d8..8b8b9954fa063ee7a7a6cecbd05f563416ba7100 100644 (file)
--- a/openssh/servconf.c
+++ b/openssh/servconf.c
@@ -136,15 +136,16 @@ initialize_server_options(ServerOptions *options)
        options->num_permitted_opens = -1;
        options->adm_forced_command = NULL;
        options->chroot_directory = NULL;
-        options->none_enabled = -1;
-        options->tcp_rcv_buf_poll = -1;
-        options->hpn_disabled = -1;
-        options->hpn_buffer_size = -1;
+       options->none_enabled = -1;
+       options->tcp_rcv_buf_poll = -1;
+       options->hpn_disabled = -1;
+       options->hpn_buffer_size = -1;
 }
 
 void
 fill_default_server_options(ServerOptions *options)
 {
+       /* needed for hpn socket tests */
        int sock;
        int socksize;
        int socksizelen = sizeof(int);
@@ -307,10 +308,10 @@ fill_default_server_options(ServerOptions *options)
        } 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_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 {
@@ -371,9 +372,8 @@ typedef enum {
        sGsiAllowLimitedProxy,
     sAcceptEnv, sPermitTunnel,
        sMatch, sPermitOpen, sForceCommand, sChrootDirectory,
-       sNoneEnabled, sTcpRcvBufPoll, 
-        sHPNDisabled, sHPNBufferSize,
        sUsePrivilegeSeparation, sAllowAgentForwarding,
+       sNoneEnabled, sTcpRcvBufPoll, sHPNDisabled, sHPNBufferSize,
        sDeprecated, sUnsupported
 } ServerOpCodes;
 
@@ -506,10 +506,10 @@ static struct {
        { "permitopen", sPermitOpen, SSHCFG_ALL },
        { "forcecommand", sForceCommand, SSHCFG_ALL },
        { "chrootdirectory", sChrootDirectory, SSHCFG_ALL },
-        { "noneenabled", sNoneEnabled },
-        { "hpndisabled", sHPNDisabled },
-        { "hpnbuffersize", sHPNBufferSize },
-        { "tcprcvbufpoll", sTcpRcvBufPoll },
+       { "noneenabled", sNoneEnabled },
+       { "hpndisabled", sHPNDisabled },
+       { "hpnbuffersize", sHPNBufferSize },
+       { "tcprcvbufpoll", sTcpRcvBufPoll },
        { NULL, sBadOption, 0 }
 };