[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.245 and 1.246

version 1.245, 2005/06/18 04:30:36 version 1.246, 2005/06/25 22:47:49
Line 600 
Line 600 
                                 *p = tolower(*p);                                  *p = tolower(*p);
         }          }
   
           /* Get default port if port has not been set. */
           if (options.port == 0) {
                   sp = getservbyname(SSH_SERVICE_NAME, "tcp");
                   options.port = sp ? ntohs(sp->s_port) : SSH_DEFAULT_PORT;
           }
   
         if (options.proxy_command != NULL &&          if (options.proxy_command != NULL &&
             strcmp(options.proxy_command, "none") == 0)              strcmp(options.proxy_command, "none") == 0)
                 options.proxy_command = NULL;                  options.proxy_command = NULL;
Line 619 
Line 625 
                 fatal("No ControlPath specified for \"-O\" command");                  fatal("No ControlPath specified for \"-O\" command");
         if (options.control_path != NULL)          if (options.control_path != NULL)
                 control_client(options.control_path);                  control_client(options.control_path);
   
         /* Get default port if port has not been set. */  
         if (options.port == 0) {  
                 sp = getservbyname(SSH_SERVICE_NAME, "tcp");  
                 options.port = sp ? ntohs(sp->s_port) : SSH_DEFAULT_PORT;  
         }  
   
         /* Open a connection to the remote host. */          /* Open a connection to the remote host. */
         if (ssh_connect(host, &hostaddr, options.port,          if (ssh_connect(host, &hostaddr, options.port,
Legend:
Removed from v.1.245  
changed lines
  Added in v.1.246