[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.116.2.1 and 1.116.2.2

version 1.116.2.1, 2001/09/27 19:03:55 version 1.116.2.2, 2001/11/15 00:15:19
Line 551 
Line 551 
   
         SSLeay_add_all_algorithms();          SSLeay_add_all_algorithms();
         ERR_load_crypto_strings();          ERR_load_crypto_strings();
           channel_set_af(IPv4or6);
   
         /* Initialize the command to execute on remote host. */          /* Initialize the command to execute on remote host. */
         buffer_init(&command);          buffer_init(&command);
Line 613 
Line 614 
         } else  {          } else  {
                 snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir,                  snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir,
                     _PATH_SSH_USER_CONFFILE);                      _PATH_SSH_USER_CONFFILE);
                   (void)read_config_file(buf, host, &options);
   
                 /* Read systemwide configuration file. */                  /* Read systemwide configuration file after use config. */
                 (void)read_config_file(_PATH_HOST_CONFIG_FILE, host, &options);                  (void)read_config_file(_PATH_HOST_CONFIG_FILE, host, &options);
                 (void)read_config_file(buf, host, &options);  
         }          }
   
         /* Fill configuration defaults. */          /* Fill configuration defaults. */
Line 660 
Line 661 
   
         /* Open a connection to the remote host. */          /* Open a connection to the remote host. */
   
         cerr = ssh_connect(host, &hostaddr, options.port,          cerr = ssh_connect(host, &hostaddr, options.port, IPv4or6,
             options.connection_attempts,              options.connection_attempts,
             original_effective_uid != 0 || !options.use_privileged_port,              original_effective_uid != 0 || !options.use_privileged_port,
             pw, options.proxy_command);              pw, options.proxy_command);
Legend:
Removed from v.1.116.2.1  
changed lines
  Added in v.1.116.2.2