[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.107 and 1.108

version 1.107, 2003/05/14 18:16:20 version 1.108, 2003/05/15 01:48:10
Line 94 
Line 94 
         oForwardAgent, oForwardX11, oGatewayPorts, oRhostsAuthentication,          oForwardAgent, oForwardX11, oGatewayPorts, oRhostsAuthentication,
         oPasswordAuthentication, oRSAAuthentication,          oPasswordAuthentication, oRSAAuthentication,
         oChallengeResponseAuthentication, oXAuthLocation,          oChallengeResponseAuthentication, oXAuthLocation,
 #if defined(KRB4) || defined(KRB5)          oKerberosAuthentication, oKerberosTgtPassing, oAFSTokenPassing,
         oKerberosAuthentication,  
 #endif  
 #if defined(AFS) || defined(KRB5)  
         oKerberosTgtPassing,  
 #endif  
 #ifdef AFS  
         oAFSTokenPassing,  
 #endif  
         oIdentityFile, oHostName, oPort, oCipher, oRemoteForward, oLocalForward,          oIdentityFile, oHostName, oPort, oCipher, oRemoteForward, oLocalForward,
         oUser, oHost, oEscapeChar, oRhostsRSAAuthentication, oProxyCommand,          oUser, oHost, oEscapeChar, oRhostsRSAAuthentication, oProxyCommand,
         oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts,          oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts,
Line 141 
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 },
 #endif  
 #if defined(AFS) || defined(KRB5)  
         { "kerberostgtpassing", oKerberosTgtPassing },          { "kerberostgtpassing", oKerberosTgtPassing },
 #endif  
 #ifdef AFS  
         { "afstokenpassing", oAFSTokenPassing },          { "afstokenpassing", oAFSTokenPassing },
 #endif  
         { "fallbacktorsh", oDeprecated },          { "fallbacktorsh", oDeprecated },
         { "usersh", oDeprecated },          { "usersh", oDeprecated },
         { "identityfile", oIdentityFile },          { "identityfile", oIdentityFile },
Line 368 
Line 354 
         case oChallengeResponseAuthentication:          case oChallengeResponseAuthentication:
                 intptr = &options->challenge_response_authentication;                  intptr = &options->challenge_response_authentication;
                 goto parse_flag;                  goto parse_flag;
 #if defined(KRB4) || defined(KRB5)  
         case oKerberosAuthentication:          case oKerberosAuthentication:
                 intptr = &options->kerberos_authentication;                  intptr = &options->kerberos_authentication;
                 goto parse_flag;                  goto parse_flag;
 #endif  
 #if defined(AFS) || defined(KRB5)  
         case oKerberosTgtPassing:          case oKerberosTgtPassing:
                 intptr = &options->kerberos_tgt_passing;                  intptr = &options->kerberos_tgt_passing;
                 goto parse_flag;                  goto parse_flag;
 #endif  
 #ifdef AFS  
         case oAFSTokenPassing:          case oAFSTokenPassing:
                 intptr = &options->afs_token_passing;                  intptr = &options->afs_token_passing;
                 goto parse_flag;                  goto parse_flag;
 #endif  
         case oBatchMode:          case oBatchMode:
                 intptr = &options->batch_mode;                  intptr = &options->batch_mode;
                 goto parse_flag;                  goto parse_flag;
Line 784 
Line 768 
         options->rsa_authentication = -1;          options->rsa_authentication = -1;
         options->pubkey_authentication = -1;          options->pubkey_authentication = -1;
         options->challenge_response_authentication = -1;          options->challenge_response_authentication = -1;
 #if defined(KRB4) || defined(KRB5)  
         options->kerberos_authentication = -1;          options->kerberos_authentication = -1;
 #endif  
 #if defined(AFS) || defined(KRB5)  
         options->kerberos_tgt_passing = -1;          options->kerberos_tgt_passing = -1;
 #endif  
 #ifdef AFS  
         options->afs_token_passing = -1;          options->afs_token_passing = -1;
 #endif  
         options->password_authentication = -1;          options->password_authentication = -1;
         options->kbd_interactive_authentication = -1;          options->kbd_interactive_authentication = -1;
         options->kbd_interactive_devices = NULL;          options->kbd_interactive_devices = NULL;
Line 863 
Line 841 
                 options->pubkey_authentication = 1;                  options->pubkey_authentication = 1;
         if (options->challenge_response_authentication == -1)          if (options->challenge_response_authentication == -1)
                 options->challenge_response_authentication = 1;                  options->challenge_response_authentication = 1;
 #if defined(KRB4) || defined(KRB5)  
         if (options->kerberos_authentication == -1)          if (options->kerberos_authentication == -1)
                 options->kerberos_authentication = 1;                  options->kerberos_authentication = 1;
 #endif  
 #if defined(AFS) || defined(KRB5)  
         if (options->kerberos_tgt_passing == -1)          if (options->kerberos_tgt_passing == -1)
                 options->kerberos_tgt_passing = 1;                  options->kerberos_tgt_passing = 1;
 #endif  
 #ifdef AFS  
         if (options->afs_token_passing == -1)          if (options->afs_token_passing == -1)
                 options->afs_token_passing = 1;                  options->afs_token_passing = 1;
 #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.107  
changed lines
  Added in v.1.108