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

Diff for /src/usr.bin/ssh/ssh.c between version 1.383 and 1.384

version 1.383, 2013/10/14 23:28:23 version 1.384, 2013/10/14 23:31:01
Line 775 
Line 775 
         /* Open a connection to the remote host. */          /* Open a connection to the remote host. */
         if (ssh_connect(host, &hostaddr, options.port,          if (ssh_connect(host, &hostaddr, options.port,
             options.address_family, options.connection_attempts, &timeout_ms,              options.address_family, options.connection_attempts, &timeout_ms,
             options.tcp_keep_alive,              options.tcp_keep_alive,
             original_effective_uid == 0 && options.use_privileged_port,              original_effective_uid == 0 && options.use_privileged_port,
             options.proxy_command) != 0)              options.proxy_command) != 0)
                 exit(255);                  exit(255);
Line 1027 
Line 1027 
   
         if (stdio_forward_host == NULL)          if (stdio_forward_host == NULL)
                 return;                  return;
         if (!compat20)          if (!compat20)
                 fatal("stdio forwarding require Protocol 2");                  fatal("stdio forwarding require Protocol 2");
   
         debug3("%s: %s:%d", __func__, stdio_forward_host, stdio_forward_port);          debug3("%s: %s:%d", __func__, stdio_forward_host, stdio_forward_port);
Line 1199 
Line 1199 
                 char *proto, *data;                  char *proto, *data;
                 /* Get reasonable local authentication information. */                  /* Get reasonable local authentication information. */
                 client_x11_get_proto(display, options.xauth_location,                  client_x11_get_proto(display, options.xauth_location,
                     options.forward_x11_trusted,                      options.forward_x11_trusted,
                     options.forward_x11_timeout,                      options.forward_x11_timeout,
                     &proto, &data);                      &proto, &data);
                 /* Request forwarding with authentication spoofing. */                  /* Request forwarding with authentication spoofing. */

Legend:
Removed from v.1.383  
changed lines
  Added in v.1.384