[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.487 and 1.488

version 1.487, 2018/07/18 11:34:04 version 1.488, 2018/07/19 10:28:47
Line 709 
Line 709 
                                 fatal("Invalid multiplex command.");                                  fatal("Invalid multiplex command.");
                         break;                          break;
                 case 'P':       /* deprecated */                  case 'P':       /* deprecated */
                         options.use_privileged_port = 0;  
                         break;                          break;
                 case 'Q':                  case 'Q':
                         cp = NULL;                          cp = NULL;
Line 1213 
Line 1212 
         if (options.connection_attempts <= 0)          if (options.connection_attempts <= 0)
                 fatal("Invalid number of ConnectionAttempts");                  fatal("Invalid number of ConnectionAttempts");
   
         if (original_effective_uid != 0)  
                 options.use_privileged_port = 0;  
   
         if (sshbuf_len(command) != 0 && options.remote_command != NULL)          if (sshbuf_len(command) != 0 && options.remote_command != NULL)
                 fatal("Cannot execute command-line and remote command.");                  fatal("Cannot execute command-line and remote command.");
   
Line 1349 
Line 1345 
         /* Open a connection to the remote host. */          /* Open a connection to the remote host. */
         if (ssh_connect(ssh, host, addrs, &hostaddr, options.port,          if (ssh_connect(ssh, host, addrs, &hostaddr, options.port,
             options.address_family, options.connection_attempts,              options.address_family, options.connection_attempts,
             &timeout_ms, options.tcp_keep_alive,              &timeout_ms, options.tcp_keep_alive) != 0)
             options.use_privileged_port) != 0)  
                 exit(255);                  exit(255);
   
         if (addrs != NULL)          if (addrs != NULL)
Legend:
Removed from v.1.487  
changed lines
  Added in v.1.488