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

Diff for /src/usr.bin/ssh/readconf.c between version 1.95 and 1.96

version 1.95, 2002/02/04 12:15:25 version 1.96, 2002/06/08 05:17:01
Line 41 
Line 41 
    # that they are given in.     # that they are given in.
   
    Host *.ngs.fi ngs.fi     Host *.ngs.fi ngs.fi
      FallBackToRsh no       User foo
   
    Host fake.com     Host fake.com
      HostName another.host.name.real.org       HostName another.host.name.real.org
Line 65 
Line 65 
      ProxyCommand ssh-proxy %h %p       ProxyCommand ssh-proxy %h %p
   
    Host *.fr     Host *.fr
      UseRsh yes       PublicKeyAuthentication no
   
    Host *.su     Host *.su
      Cipher none       Cipher none
Line 79 
Line 79 
      PasswordAuthentication yes       PasswordAuthentication yes
      RSAAuthentication yes       RSAAuthentication yes
      RhostsRSAAuthentication yes       RhostsRSAAuthentication yes
      FallBackToRsh no  
      UseRsh no  
      StrictHostKeyChecking yes       StrictHostKeyChecking yes
      KeepAlives no       KeepAlives no
      IdentityFile ~/.ssh/identity       IdentityFile ~/.ssh/identity
Line 94 
Line 92 
 typedef enum {  typedef enum {
         oBadOption,          oBadOption,
         oForwardAgent, oForwardX11, oGatewayPorts, oRhostsAuthentication,          oForwardAgent, oForwardX11, oGatewayPorts, oRhostsAuthentication,
         oPasswordAuthentication, oRSAAuthentication, oFallBackToRsh, oUseRsh,          oPasswordAuthentication, oRSAAuthentication,
         oChallengeResponseAuthentication, oXAuthLocation,          oChallengeResponseAuthentication, oXAuthLocation,
 #if defined(KRB4) || defined(KRB5)  #if defined(KRB4) || defined(KRB5)
         oKerberosAuthentication,          oKerberosAuthentication,
Line 115 
Line 113 
         oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias,          oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias,
         oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication,          oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication,
         oHostKeyAlgorithms, oBindAddress, oSmartcardDevice,          oHostKeyAlgorithms, oBindAddress, oSmartcardDevice,
         oClearAllForwardings, oNoHostAuthenticationForLocalhost          oClearAllForwardings, oNoHostAuthenticationForLocalhost,
           oDeprecated
 } OpCodes;  } OpCodes;
   
 /* Textual representations of the tokens. */  /* Textual representations of the tokens. */
Line 150 
Line 149 
 #ifdef AFS  #ifdef AFS
         { "afstokenpassing", oAFSTokenPassing },          { "afstokenpassing", oAFSTokenPassing },
 #endif  #endif
         { "fallbacktorsh", oFallBackToRsh },          { "fallbacktorsh", oDeprecated },
         { "usersh", oUseRsh },          { "usersh", oDeprecated },
         { "identityfile", oIdentityFile },          { "identityfile", oIdentityFile },
         { "identityfile2", oIdentityFile },                     /* alias */          { "identityfile2", oIdentityFile },                     /* alias */
         { "hostname", oHostName },          { "hostname", oHostName },
Line 371 
Line 370 
                 intptr = &options->afs_token_passing;                  intptr = &options->afs_token_passing;
                 goto parse_flag;                  goto parse_flag;
 #endif  #endif
         case oFallBackToRsh:  
                 intptr = &options->fallback_to_rsh;  
                 goto parse_flag;  
   
         case oUseRsh:  
                 intptr = &options->use_rsh;  
                 goto parse_flag;  
   
         case oBatchMode:          case oBatchMode:
                 intptr = &options->batch_mode;                  intptr = &options->batch_mode;
                 goto parse_flag;                  goto parse_flag;
Line 676 
Line 667 
                         *intptr = value;                          *intptr = value;
                 break;                  break;
   
           case oDeprecated:
                   fatal("%s line %d: Deprecated option \"%s\"",
                       filename, linenum, keyword);
                   break;
   
         default:          default:
                 fatal("process_config_line: Unimplemented opcode %d", opcode);                  fatal("process_config_line: Unimplemented opcode %d", opcode);
         }          }
Line 763 
Line 759 
         options->kbd_interactive_devices = NULL;          options->kbd_interactive_devices = NULL;
         options->rhosts_rsa_authentication = -1;          options->rhosts_rsa_authentication = -1;
         options->hostbased_authentication = -1;          options->hostbased_authentication = -1;
         options->fallback_to_rsh = -1;  
         options->use_rsh = -1;  
         options->batch_mode = -1;          options->batch_mode = -1;
         options->check_host_ip = -1;          options->check_host_ip = -1;
         options->strict_host_key_checking = -1;          options->strict_host_key_checking = -1;
Line 847 
Line 841 
                 options->rhosts_rsa_authentication = 1;                  options->rhosts_rsa_authentication = 1;
         if (options->hostbased_authentication == -1)          if (options->hostbased_authentication == -1)
                 options->hostbased_authentication = 0;                  options->hostbased_authentication = 0;
         if (options->fallback_to_rsh == -1)  
                 options->fallback_to_rsh = 0;  
         if (options->use_rsh == -1)  
                 options->use_rsh = 0;  
         if (options->batch_mode == -1)          if (options->batch_mode == -1)
                 options->batch_mode = 0;                  options->batch_mode = 0;
         if (options->check_host_ip == -1)          if (options->check_host_ip == -1)
Legend:
Removed from v.1.95  
changed lines
  Added in v.1.96