[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.4 and 1.5

version 1.4, 1999/09/29 17:52:12 version 1.5, 1999/09/29 18:16:19
Line 93 
Line 93 
 #ifdef KRB4  #ifdef KRB4
   oKerberosAuthentication,    oKerberosAuthentication,
 #endif /* KRB4 */  #endif /* KRB4 */
 #ifdef KERBEROS_TGT_PASSING  
   oKerberosTgtPassing,  
 #endif  
 #ifdef AFS  #ifdef AFS
   oAFSTokenPassing,    oKerberosTgtPassing, oAFSTokenPassing,
 #endif  #endif
   oIdentityFile, oHostName, oPort, oCipher, oRemoteForward, oLocalForward,    oIdentityFile, oHostName, oPort, oCipher, oRemoteForward, oLocalForward,
   oUser, oHost, oEscapeChar, oRhostsRSAAuthentication, oProxyCommand,    oUser, oHost, oEscapeChar, oRhostsRSAAuthentication, oProxyCommand,
Line 123 
Line 120 
 #ifdef KRB4  #ifdef KRB4
   { "kerberosauthentication", oKerberosAuthentication },    { "kerberosauthentication", oKerberosAuthentication },
 #endif /* KRB4 */  #endif /* KRB4 */
 #ifdef KERBEROS_TGT_PASSING  
   { "kerberostgtpassing", oKerberosTgtPassing },  
 #endif  
 #ifdef AFS  #ifdef AFS
     { "kerberostgtpassing", oKerberosTgtPassing },
   { "afstokenpassing", oAFSTokenPassing },    { "afstokenpassing", oAFSTokenPassing },
 #endif  #endif
   { "fallbacktorsh", oFallBackToRsh },    { "fallbacktorsh", oFallBackToRsh },
Line 287 
Line 282 
       goto parse_flag;        goto parse_flag;
 #endif /* KRB4 */  #endif /* KRB4 */
   
 #ifdef KERBEROS_TGT_PASSING  #ifdef AFS
     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;
Line 574 
Line 567 
 #ifdef KRB4  #ifdef KRB4
   options->kerberos_authentication = -1;    options->kerberos_authentication = -1;
 #endif  #endif
 #ifdef KERBEROS_TGT_PASSING  
   options->kerberos_tgt_passing = -1;  
 #endif  
 #ifdef AFS  #ifdef AFS
     options->kerberos_tgt_passing = -1;
   options->afs_token_passing = -1;    options->afs_token_passing = -1;
 #endif  #endif
   options->password_authentication = -1;    options->password_authentication = -1;
Line 625 
Line 616 
 #ifdef KRB4  #ifdef KRB4
   if (options->kerberos_authentication == -1)    if (options->kerberos_authentication == -1)
     options->kerberos_authentication = 1;      options->kerberos_authentication = 1;
 #endif  #endif /* KRB4 */
 #ifdef KERBEROS_TGT_PASSING  #ifdef AFS
   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  #endif /* AFS */
   if (options->password_authentication == -1)    if (options->password_authentication == -1)
     options->password_authentication = 1;      options->password_authentication = 1;
   if (options->rhosts_rsa_authentication == -1)    if (options->rhosts_rsa_authentication == -1)
Legend:
Removed from v.1.4  
changed lines
  Added in v.1.5