[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.114 and 1.115

version 1.114, 2003/07/03 08:09:05 version 1.115, 2003/07/22 13:35:22
Line 94 
Line 94 
         oForwardAgent, oForwardX11, oGatewayPorts, oRhostsAuthentication,          oForwardAgent, oForwardX11, oGatewayPorts, oRhostsAuthentication,
         oPasswordAuthentication, oRSAAuthentication,          oPasswordAuthentication, oRSAAuthentication,
         oChallengeResponseAuthentication, oXAuthLocation,          oChallengeResponseAuthentication, oXAuthLocation,
         oKerberosAuthentication, oKerberosTgtPassing, oAFSTokenPassing,          oKerberosAuthentication, oKerberosTgtPassing,
         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 134 
Line 134 
         { "challengeresponseauthentication", oChallengeResponseAuthentication },          { "challengeresponseauthentication", oChallengeResponseAuthentication },
         { "skeyauthentication", oChallengeResponseAuthentication }, /* alias */          { "skeyauthentication", oChallengeResponseAuthentication }, /* alias */
         { "tisauthentication", oChallengeResponseAuthentication },  /* alias */          { "tisauthentication", oChallengeResponseAuthentication },  /* alias */
 #if defined(KRB4) || defined(KRB5)  #ifdef KRB5
         { "kerberosauthentication", oKerberosAuthentication },          { "kerberosauthentication", oKerberosAuthentication },
         { "kerberostgtpassing", oKerberosTgtPassing },          { "kerberostgtpassing", oKerberosTgtPassing },
 #else  #else
         { "kerberosauthentication", oUnsupported },          { "kerberosauthentication", oUnsupported },
         { "kerberostgtpassing", oUnsupported },          { "kerberostgtpassing", oUnsupported },
 #endif  #endif
 #if defined(AFS)  
         { "afstokenpassing", oAFSTokenPassing },  
 #else  
         { "afstokenpassing", oUnsupported },          { "afstokenpassing", oUnsupported },
 #endif  
         { "fallbacktorsh", oDeprecated },          { "fallbacktorsh", oDeprecated },
         { "usersh", oDeprecated },          { "usersh", oDeprecated },
         { "identityfile", oIdentityFile },          { "identityfile", oIdentityFile },
Line 397 
Line 393 
                 intptr = &options->kerberos_tgt_passing;                  intptr = &options->kerberos_tgt_passing;
                 goto parse_flag;                  goto parse_flag;
   
         case oAFSTokenPassing:  
                 intptr = &options->afs_token_passing;  
                 goto parse_flag;  
   
         case oBatchMode:          case oBatchMode:
                 intptr = &options->batch_mode;                  intptr = &options->batch_mode;
                 goto parse_flag;                  goto parse_flag;
Line 826 
Line 818 
         options->challenge_response_authentication = -1;          options->challenge_response_authentication = -1;
         options->kerberos_authentication = -1;          options->kerberos_authentication = -1;
         options->kerberos_tgt_passing = -1;          options->kerberos_tgt_passing = -1;
         options->afs_token_passing = -1;  
         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 903 
Line 894 
                 options->kerberos_authentication = 1;                  options->kerberos_authentication = 1;
         if (options->kerberos_tgt_passing == -1)          if (options->kerberos_tgt_passing == -1)
                 options->kerberos_tgt_passing = 1;                  options->kerberos_tgt_passing = 1;
         if (options->afs_token_passing == -1)  
                 options->afs_token_passing = 1;  
         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.114  
changed lines
  Added in v.1.115