merging OPENSSH_5_2P1_SIMON_20090726_HPN13V6 to trunk:

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

diff --git a/openssh/readconf.c b/openssh/readconf.c
index dc78c6f613617522d26b6660bcee6a7e7ac505a8..0f29417f3b0440764909eb27a3b7dfcee5639e21 100644 (file)
--- a/openssh/readconf.c
+++ b/openssh/readconf.c
@@ -251,7 +251,6 @@ static struct {
        { "noneswitch", oNoneSwitch },
        { "hpndisabled", oHPNDisabled },
        { "hpnbuffersize", oHPNBufferSize },
-
        { NULL, oBadOption }
 };
 
@@ -1135,7 +1134,19 @@ initialize_options(Options * options)
        options->tun_remote = -1;
        options->local_command = NULL;
        options->permit_local_command = -1;
+       options->none_switch = -1;
+       options->none_enabled = -1;
+       options->hpn_disabled = -1;
+       options->hpn_buffer_size = -1;
+       options->tcp_rcv_buf_poll = -1;
+       options->tcp_rcv_buf = -1;
        options->visual_host_key = -1;
+       options->none_switch = -1;
+       options->none_enabled = -1;
+       options->hpn_disabled = -1;
+       options->hpn_buffer_size = -1;
+       options->tcp_rcv_buf_poll = -1;
+       options->tcp_rcv_buf = -1;
        options->zero_knowledge_password_authentication = -1;
        options->none_switch = -1;
        options->none_enabled = -1;
@@ -1176,13 +1187,13 @@ fill_default_options(Options * options)
        if (options->challenge_response_authentication == -1)
                options->challenge_response_authentication = 1;
        if (options->gss_authentication == -1)
-               options->gss_authentication = 0;
+               options->gss_authentication = 1;
        if (options->gss_keyex == -1)
-               options->gss_keyex = 0;
+               options->gss_keyex = 1;
        if (options->gss_deleg_creds == -1)
-               options->gss_deleg_creds = 0;
+               options->gss_deleg_creds = 1;
        if (options->gss_trust_dns == -1)
-               options->gss_trust_dns = 0;
+               options->gss_trust_dns = 1;
        if (options->gss_renewal_rekey == -1)
                options->gss_renewal_rekey = 0;
        if (options->password_authentication == -1)