[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.387 and 1.388

version 1.387, 2013/10/16 22:58:01 version 1.388, 2013/10/17 00:46:49
Line 833 
Line 833 
             strcmp(options.proxy_command, "-") == 0 &&              strcmp(options.proxy_command, "-") == 0 &&
             options.proxy_use_fdpass)              options.proxy_use_fdpass)
                 fatal("ProxyCommand=- and ProxyUseFDPass are incompatible");                  fatal("ProxyCommand=- and ProxyUseFDPass are incompatible");
           if (original_effective_uid != 0)
                   options.use_privileged_port = 0;
   
         /* reinit */          /* reinit */
         log_init(argv0, options.log_level, SYSLOG_FACILITY_USER, !use_syslog);          log_init(argv0, options.log_level, SYSLOG_FACILITY_USER, !use_syslog);
Line 925 
Line 927 
         if (ssh_connect(host, addrs, &hostaddr, options.port,          if (ssh_connect(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,
             original_effective_uid == 0 && options.use_privileged_port) != 0)              options.use_privileged_port) != 0)
                 exit(255);                  exit(255);
   
         freeaddrinfo(addrs);          freeaddrinfo(addrs);
Legend:
Removed from v.1.387  
changed lines
  Added in v.1.388