[BACK]Return to readconf.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/readconf.c between version 1.204 and 1.205

version 1.204, 2013/06/10 19:19:44 version 1.205, 2013/08/20 00:11:37
Line 132 
Line 132 
         oHashKnownHosts,          oHashKnownHosts,
         oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,          oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,
         oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication,          oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication,
         oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown,          oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass,
         oIgnoredUnknownOption, oDeprecated, oUnsupported          oIgnoredUnknownOption, oDeprecated, oUnsupported
 } OpCodes;  } OpCodes;
   
Line 244 
Line 244 
         { "kexalgorithms", oKexAlgorithms },          { "kexalgorithms", oKexAlgorithms },
         { "ipqos", oIPQoS },          { "ipqos", oIPQoS },
         { "requesttty", oRequestTTY },          { "requesttty", oRequestTTY },
           { "proxyusefdpass", oProxyUseFdpass },
         { "ignoreunknown", oIgnoreUnknown },          { "ignoreunknown", oIgnoreUnknown },
   
         { NULL, oBadOption }          { NULL, oBadOption }
Line 1066 
Line 1067 
                 charptr = &options->ignored_unknown;                  charptr = &options->ignored_unknown;
                 goto parse_string;                  goto parse_string;
   
           case oProxyUseFdpass:
                   intptr = &options->proxy_use_fdpass;
                   goto parse_flag;
   
         case oDeprecated:          case oDeprecated:
                 debug("%s line %d: Deprecated option \"%s\"",                  debug("%s line %d: Deprecated option \"%s\"",
                     filename, linenum, keyword);                      filename, linenum, keyword);
Line 1227 
Line 1232 
         options->ip_qos_interactive = -1;          options->ip_qos_interactive = -1;
         options->ip_qos_bulk = -1;          options->ip_qos_bulk = -1;
         options->request_tty = -1;          options->request_tty = -1;
           options->proxy_use_fdpass = -1;
         options->ignored_unknown = NULL;          options->ignored_unknown = NULL;
 }  }
   
Line 1377 
Line 1383 
                 options->ip_qos_bulk = IPTOS_THROUGHPUT;                  options->ip_qos_bulk = IPTOS_THROUGHPUT;
         if (options->request_tty == -1)          if (options->request_tty == -1)
                 options->request_tty = REQUEST_TTY_AUTO;                  options->request_tty = REQUEST_TTY_AUTO;
           if (options->proxy_use_fdpass == -1)
                   options->proxy_use_fdpass = 0;
         /* options->local_command should not be set by default */          /* options->local_command should not be set by default */
         /* options->proxy_command should not be set by default */          /* options->proxy_command should not be set by default */
         /* options->user will be set in the main program if appropriate */          /* options->user will be set in the main program if appropriate */
Legend:
Removed from v.1.204  
changed lines
  Added in v.1.205