[BACK]Return to sshd.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/sshd.c between version 1.304 and 1.305

version 1.304, 2004/09/25 03:45:14 version 1.305, 2004/12/23 23:11:00
Line 108 
Line 108 
 char *config_file_name = _PATH_SERVER_CONFIG_FILE;  char *config_file_name = _PATH_SERVER_CONFIG_FILE;
   
 /*  /*
  * Flag indicating whether IPv4 or IPv6.  This can be set on the command line.  
  * Default value is AF_UNSPEC means both IPv4 and IPv6.  
  */  
 int IPv4or6 = AF_UNSPEC;  
   
 /*  
  * Debug mode flag.  This can be set on the command line.  If debug   * Debug mode flag.  This can be set on the command line.  If debug
  * mode is enabled, extra debugging output will be sent to the system   * mode is enabled, extra debugging output will be sent to the system
  * log, the daemon will not go to background, and will exit after processing   * log, the daemon will not go to background, and will exit after processing
Line 891 
Line 885 
         while ((opt = getopt(ac, av, "f:p:b:k:h:g:u:o:dDeiqrtQR46")) != -1) {          while ((opt = getopt(ac, av, "f:p:b:k:h:g:u:o:dDeiqrtQR46")) != -1) {
                 switch (opt) {                  switch (opt) {
                 case '4':                  case '4':
                         IPv4or6 = AF_INET;                          options.address_family = AF_INET;
                         break;                          break;
                 case '6':                  case '6':
                         IPv4or6 = AF_INET6;                          options.address_family = AF_INET6;
                         break;                          break;
                 case 'f':                  case 'f':
                         config_file_name = optarg;                          config_file_name = optarg;
Line 995 
Line 989 
                 closefrom(REEXEC_DEVCRYPTO_RESERVED_FD);                  closefrom(REEXEC_DEVCRYPTO_RESERVED_FD);
   
         SSLeay_add_all_algorithms();          SSLeay_add_all_algorithms();
         channel_set_af(IPv4or6);  
   
         /*          /*
          * Force logging to stderr until we have loaded the private host           * Force logging to stderr until we have loaded the private host
Line 1028 
Line 1021 
   
         /* Fill in default values for those options not explicitly set. */          /* Fill in default values for those options not explicitly set. */
         fill_default_server_options(&options);          fill_default_server_options(&options);
   
           /* set default channel AF */
           channel_set_af(options.address_family);
   
         /* Check that there are no remaining arguments. */          /* Check that there are no remaining arguments. */
         if (optind < ac) {          if (optind < ac) {
Legend:
Removed from v.1.304  
changed lines
  Added in v.1.305