[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.109 and 1.110

version 1.109, 2003/05/15 04:08:44 version 1.110, 2003/05/15 14:02:47
Line 107 
Line 107 
         oHostKeyAlgorithms, oBindAddress, oSmartcardDevice,          oHostKeyAlgorithms, oBindAddress, oSmartcardDevice,
         oClearAllForwardings, oNoHostAuthenticationForLocalhost,          oClearAllForwardings, oNoHostAuthenticationForLocalhost,
         oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS,          oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS,
         oDeprecated          oDeprecated, oUnsupported
 } OpCodes;  } OpCodes;
   
 /* Textual representations of the tokens. */  /* Textual representations of the tokens. */
Line 133 
Line 133 
         { "challengeresponseauthentication", oChallengeResponseAuthentication },          { "challengeresponseauthentication", oChallengeResponseAuthentication },
         { "skeyauthentication", oChallengeResponseAuthentication }, /* alias */          { "skeyauthentication", oChallengeResponseAuthentication }, /* alias */
         { "tisauthentication", oChallengeResponseAuthentication },  /* alias */          { "tisauthentication", oChallengeResponseAuthentication },  /* alias */
   #if defined(KRB4) || defined(KRB5)
         { "kerberosauthentication", oKerberosAuthentication },          { "kerberosauthentication", oKerberosAuthentication },
         { "kerberostgtpassing", oKerberosTgtPassing },          { "kerberostgtpassing", oKerberosTgtPassing },
   #else
           { "kerberosauthentication", oUnsupported },
           { "kerberostgtpassing", oUnsupported },
   #endif
   #if defined(AFS)
         { "afstokenpassing", oAFSTokenPassing },          { "afstokenpassing", oAFSTokenPassing },
   #else
           { "afstokenpassing", oUnsupported },
   #endif
         { "fallbacktorsh", oDeprecated },          { "fallbacktorsh", oDeprecated },
         { "usersh", oDeprecated },          { "usersh", oDeprecated },
         { "identityfile", oIdentityFile },          { "identityfile", oIdentityFile },
Line 170 
Line 179 
         { "preferredauthentications", oPreferredAuthentications },          { "preferredauthentications", oPreferredAuthentications },
         { "hostkeyalgorithms", oHostKeyAlgorithms },          { "hostkeyalgorithms", oHostKeyAlgorithms },
         { "bindaddress", oBindAddress },          { "bindaddress", oBindAddress },
   #ifdef SMARTCARD
         { "smartcarddevice", oSmartcardDevice },          { "smartcarddevice", oSmartcardDevice },
   #else
           { "smartcarddevice", oUnsupported },
   #endif
         { "clearallforwardings", oClearAllForwardings },          { "clearallforwardings", oClearAllForwardings },
         { "enablesshkeysign", oEnableSSHKeysign },          { "enablesshkeysign", oEnableSSHKeysign },
   #ifdef DNS
         { "verifyhostkeydns", oVerifyHostKeyDNS },          { "verifyhostkeydns", oVerifyHostKeyDNS },
   #else
           { "verifyhostkeydns", oUnsupported },
   #endif
         { "nohostauthenticationforlocalhost", oNoHostAuthenticationForLocalhost },          { "nohostauthenticationforlocalhost", oNoHostAuthenticationForLocalhost },
         { "rekeylimit", oRekeyLimit },          { "rekeylimit", oRekeyLimit },
         { NULL, oBadOption }          { NULL, oBadOption }
Line 695 
Line 712 
                     filename, linenum, keyword);                      filename, linenum, keyword);
                 return 0;                  return 0;
   
           case oUnsupported:
                   error("%s line %d: Unsupported option \"%s\"",
                       filename, linenum, keyword);
                   return 0;
   
         default:          default:
                 fatal("process_config_line: Unimplemented opcode %d", opcode);                  fatal("process_config_line: Unimplemented opcode %d", opcode);
         }          }
Line 842 
Line 864 
         if (options->challenge_response_authentication == -1)          if (options->challenge_response_authentication == -1)
                 options->challenge_response_authentication = 1;                  options->challenge_response_authentication = 1;
         if (options->kerberos_authentication == -1)          if (options->kerberos_authentication == -1)
 #if defined(KRB4) || defined(KRB5)  
                 options->kerberos_authentication = 1;                  options->kerberos_authentication = 1;
 #else  
                 options->kerberos_authentication = 0;  
 #endif  
         if (options->kerberos_tgt_passing == -1)          if (options->kerberos_tgt_passing == -1)
 #if defined(KRB4) || defined(KRB5)  
                 options->kerberos_tgt_passing = 1;                  options->kerberos_tgt_passing = 1;
 #else  
                 options->kerberos_tgt_passing = 0;  
 #endif  
         if (options->afs_token_passing == -1)          if (options->afs_token_passing == -1)
 #if defined(AFS)  
                 options->afs_token_passing = 1;                  options->afs_token_passing = 1;
 #else  
                 options->afs_token_passing = 0;  
 #endif  
         if (options->password_authentication == -1)          if (options->password_authentication == -1)
                 options->password_authentication = 1;                  options->password_authentication = 1;
         if (options->kbd_interactive_authentication == -1)          if (options->kbd_interactive_authentication == -1)
Legend:
Removed from v.1.109  
changed lines
  Added in v.1.110