Merged hpn13v5 to trunk.

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

diff --git a/openssh/readconf.c b/openssh/readconf.c
index 791d9e49e7fb5f7afa9fc5cb34607fba358605ee..7d248fe94196fceb8bd421862304d4548fc0feb8 100644 (file)
--- a/openssh/readconf.c
+++ b/openssh/readconf.c
@@ -132,9 +132,9 @@ typedef enum {
        oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
        oSendEnv, oControlPath, oControlMaster, oHashKnownHosts,
        oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,
+       oVisualHostKey,
        oNoneEnabled, oTcpRcvBufPoll, oTcpRcvBuf, oNoneSwitch, oHPNDisabled,
        oHPNBufferSize,
-       oVisualHostKey,
        oDeprecated, oUnsupported
 } OpCodes;
 
@@ -242,6 +242,12 @@ static struct {
        { "hpndisabled", oHPNDisabled },
        { "hpnbuffersize", oHPNBufferSize },
        { "visualhostkey", oVisualHostKey },
+       { "noneenabled", oNoneEnabled },
+       { "tcprcvbufpoll", oTcpRcvBufPoll },
+       { "tcprcvbuf", oTcpRcvBuf },
+       { "noneswitch", oNoneSwitch },
+       { "hpndisabled", oHPNDisabled },
+       { "hpnbuffersize", oHPNBufferSize },
        { NULL, oBadOption }
 };
 
@@ -1137,6 +1143,12 @@ initialize_options(Options * options)
        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;
 }
 
 /*