[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.514 and 1.515

version 1.514, 2020/01/25 00:03:36 version 1.515, 2020/01/25 00:21:08
Line 1227 
Line 1227 
             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 &&          if (options.control_persist && options.control_path != NULL &&
             options.update_hostkeys == SSH_UPDATE_HOSTKEYS_ASK) {              options.update_hostkeys == SSH_UPDATE_HOSTKEYS_ASK) {
                 debug("UpdateHostKeys=ask is incompatible with ControlPersist; "                  debug("UpdateHostKeys=ask is incompatible with ControlPersist; "
                     "disabling");                      "disabling");
Legend:
Removed from v.1.514  
changed lines
  Added in v.1.515