[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.467 and 1.468

version 1.467, 2017/10/25 00:21:37 version 1.468, 2017/10/27 01:57:06
Line 992 
Line 992 
         if (logfile != NULL)          if (logfile != NULL)
                 log_redirect_stderr_to(logfile);                  log_redirect_stderr_to(logfile);
         log_init(argv0,          log_init(argv0,
             options.log_level == SYSLOG_LEVEL_NOT_SET ?              options.log_level == SYSLOG_LEVEL_NOT_SET ?
             SYSLOG_LEVEL_INFO : options.log_level,              SYSLOG_LEVEL_INFO : options.log_level,
             options.log_facility == SYSLOG_FACILITY_NOT_SET ?              options.log_facility == SYSLOG_FACILITY_NOT_SET ?
             SYSLOG_FACILITY_USER : options.log_facility,              SYSLOG_FACILITY_USER : options.log_facility,
             !use_syslog);              !use_syslog);
   
Line 1033 
Line 1033 
          * If CanonicalizePermittedCNAMEs have been specified but           * If CanonicalizePermittedCNAMEs have been specified but
          * other canonicalization did not happen (by not being requested           * other canonicalization did not happen (by not being requested
          * or by failing with fallback) then the hostname may still be changed           * or by failing with fallback) then the hostname may still be changed
          * as a result of CNAME following.           * as a result of CNAME following.
          *           *
          * Try to resolve the bare hostname name using the system resolver's           * Try to resolve the bare hostname name using the system resolver's
          * usual search rules and then apply the CNAME follow rules.           * usual search rules and then apply the CNAME follow rules.
Line 1528 
Line 1528 
                         channel_update_permitted_opens(ssh, rfwd->handle, -1);                          channel_update_permitted_opens(ssh, rfwd->handle, -1);
                 }                  }
         }          }
   
         if (type == SSH2_MSG_REQUEST_FAILURE) {          if (type == SSH2_MSG_REQUEST_FAILURE) {
                 if (options.exit_on_forward_failure) {                  if (options.exit_on_forward_failure) {
                         if (rfwd->listen_path != NULL)                          if (rfwd->listen_path != NULL)
Line 1656 
Line 1656 
                         else                          else
                                 error("Could not request tunnel forwarding.");                                  error("Could not request tunnel forwarding.");
                 }                  }
         }          }
 }  }
   
 static void  static void
Legend:
Removed from v.1.467  
changed lines
  Added in v.1.468