[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.185 and 1.186

version 1.185, 2010/06/25 07:14:46 version 1.186, 2010/06/25 23:15:36
Line 107 
Line 107 
   
 typedef enum {  typedef enum {
         oBadOption,          oBadOption,
         oForwardAgent, oForwardX11, oForwardX11Trusted, oGatewayPorts,          oForwardAgent, oForwardX11, oForwardX11Trusted, oForwardX11Timeout,
         oExitOnForwardFailure,          oGatewayPorts, oExitOnForwardFailure,
         oPasswordAuthentication, oRSAAuthentication,          oPasswordAuthentication, oRSAAuthentication,
         oChallengeResponseAuthentication, oXAuthLocation,          oChallengeResponseAuthentication, oXAuthLocation,
         oIdentityFile, oHostName, oPort, oCipher, oRemoteForward, oLocalForward,          oIdentityFile, oHostName, oPort, oCipher, oRemoteForward, oLocalForward,
Line 140 
Line 140 
         { "forwardagent", oForwardAgent },          { "forwardagent", oForwardAgent },
         { "forwardx11", oForwardX11 },          { "forwardx11", oForwardX11 },
         { "forwardx11trusted", oForwardX11Trusted },          { "forwardx11trusted", oForwardX11Trusted },
           { "forwardx11timeout", oForwardX11Timeout },
         { "exitonforwardfailure", oExitOnForwardFailure },          { "exitonforwardfailure", oExitOnForwardFailure },
         { "xauthlocation", oXAuthLocation },          { "xauthlocation", oXAuthLocation },
         { "gatewayports", oGatewayPorts },          { "gatewayports", oGatewayPorts },
Line 410 
Line 411 
         case oForwardX11Trusted:          case oForwardX11Trusted:
                 intptr = &options->forward_x11_trusted;                  intptr = &options->forward_x11_trusted;
                 goto parse_flag;                  goto parse_flag;
   
           case oForwardX11Timeout:
                   intptr = &options->forward_x11_timeout;
                   goto parse_time;
   
         case oGatewayPorts:          case oGatewayPorts:
                 intptr = &options->gateway_ports;                  intptr = &options->gateway_ports;
Line 1014 
Line 1019 
         options->forward_agent = -1;          options->forward_agent = -1;
         options->forward_x11 = -1;          options->forward_x11 = -1;
         options->forward_x11_trusted = -1;          options->forward_x11_trusted = -1;
           options->forward_x11_timeout = -1;
         options->exit_on_forward_failure = -1;          options->exit_on_forward_failure = -1;
         options->xauth_location = NULL;          options->xauth_location = NULL;
         options->gateway_ports = -1;          options->gateway_ports = -1;
Line 1100 
Line 1106 
                 options->forward_x11 = 0;                  options->forward_x11 = 0;
         if (options->forward_x11_trusted == -1)          if (options->forward_x11_trusted == -1)
                 options->forward_x11_trusted = 0;                  options->forward_x11_trusted = 0;
           if (options->forward_x11_timeout == -1)
                   options->forward_x11_timeout = 1200;
         if (options->exit_on_forward_failure == -1)          if (options->exit_on_forward_failure == -1)
                 options->exit_on_forward_failure = 0;                  options->exit_on_forward_failure = 0;
         if (options->xauth_location == NULL)          if (options->xauth_location == NULL)
Legend:
Removed from v.1.185  
changed lines
  Added in v.1.186