[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.414 and 1.415

version 1.414, 2015/01/20 23:14:00 version 1.415, 2015/02/20 22:17:21
Line 1042 
Line 1042 
             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 (options.control_persist &&
               options.update_hostkeys == SSH_UPDATE_HOSTKEYS_ASK) {
                   debug("UpdateHostKeys=ask is incompatible with ControlPersist; "
                       "disabling");
                   options.update_hostkeys = 0;
           }
         if (original_effective_uid != 0)          if (original_effective_uid != 0)
                 options.use_privileged_port = 0;                  options.use_privileged_port = 0;
   
Legend:
Removed from v.1.414  
changed lines
  Added in v.1.415