[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.436 and 1.437

version 1.436, 2016/02/15 09:47:49 version 1.437, 2016/03/07 19:02:43
Line 498 
Line 498 
 int  int
 main(int ac, char **av)  main(int ac, char **av)
 {  {
           struct ssh *ssh = NULL;
         int i, r, opt, exit_status, use_syslog, config_test = 0;          int i, r, opt, exit_status, use_syslog, config_test = 0;
         char *p, *cp, *line, *argv0, buf[PATH_MAX], *host_arg, *logfile;          char *p, *cp, *line, *argv0, buf[PATH_MAX], *host_arg, *logfile;
         char thishost[NI_MAXHOST], shorthost[NI_MAXHOST], portstr[NI_MAXSERV];          char thishost[NI_MAXHOST], shorthost[NI_MAXHOST], portstr[NI_MAXSERV];
Line 1187 
Line 1188 
         packet_set_timeout(options.server_alive_interval,          packet_set_timeout(options.server_alive_interval,
             options.server_alive_count_max);              options.server_alive_count_max);
   
           ssh = active_state; /* XXX */
   
         if (timeout_ms > 0)          if (timeout_ms > 0)
                 debug3("timeout: %d ms remain after connect", timeout_ms);                  debug3("timeout: %d ms remain after connect", timeout_ms);
   
Line 1297 
Line 1300 
   
         if (packet_connection_is_on_socket()) {          if (packet_connection_is_on_socket()) {
                 verbose("Authenticated to %s ([%s]:%d).", host,                  verbose("Authenticated to %s ([%s]:%d).", host,
                     get_remote_ipaddr(), get_remote_port());                      ssh_remote_ipaddr(ssh), ssh_remote_port(ssh));
         } else {          } else {
                 verbose("Authenticated to %s (via proxy).", host);                  verbose("Authenticated to %s (via proxy).", host);
         }          }
Legend:
Removed from v.1.436  
changed lines
  Added in v.1.437