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

Diff for /src/usr.bin/ssh/servconf.c between version 1.3 and 1.4

version 1.3, 1999/09/29 00:10:16 version 1.4, 1999/09/29 18:16:20
Line 46 
Line 46 
 #ifdef KRB4  #ifdef KRB4
   options->kerberos_authentication = -1;    options->kerberos_authentication = -1;
   options->kerberos_or_local_passwd = -1;    options->kerberos_or_local_passwd = -1;
 #endif  
 #if defined(KRB4) || defined(AFS)  
   options->kerberos_ticket_cleanup = -1;    options->kerberos_ticket_cleanup = -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 116 
Line 112 
     options->kerberos_authentication = 1;      options->kerberos_authentication = 1;
   if (options->kerberos_or_local_passwd == -1)    if (options->kerberos_or_local_passwd == -1)
     options->kerberos_or_local_passwd = 0;      options->kerberos_or_local_passwd = 0;
 #endif  
 #if defined(KRB4) || defined(AFS)  
   if (options->kerberos_ticket_cleanup == -1)    if (options->kerberos_ticket_cleanup == -1)
     options->kerberos_ticket_cleanup = 1;      options->kerberos_ticket_cleanup = 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 = 0;      options->kerberos_tgt_passing = 0;
 #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->permit_empty_passwd == -1)    if (options->permit_empty_passwd == -1)
Line 144 
Line 136 
   sPermitRootLogin, sQuietMode, sFascistLogging, sLogFacility,    sPermitRootLogin, sQuietMode, sFascistLogging, sLogFacility,
   sRhostsAuthentication, sRhostsRSAAuthentication, sRSAAuthentication,    sRhostsAuthentication, sRhostsRSAAuthentication, sRSAAuthentication,
 #ifdef KRB4  #ifdef KRB4
   sKerberosAuthentication, sKerberosOrLocalPasswd,    sKerberosAuthentication, sKerberosOrLocalPasswd, sKerberosTicketCleanup,
 #endif  #endif
 #if defined(KRB4) || defined(AFS)  
   sKerberosTicketCleanup,  
 #endif  
 #ifdef KERBEROS_TGT_PASSING  
   sKerberosTgtPassing,  
 #endif  
 #ifdef AFS  #ifdef AFS
   sAFSTokenPassing,    sKerberosTgtPassing, sAFSTokenPassing,
 #endif  #endif
   sPasswordAuthentication, sAllowHosts, sDenyHosts, sListenAddress,    sPasswordAuthentication, sAllowHosts, sDenyHosts, sListenAddress,
   sPrintMotd, sIgnoreRhosts, sX11Forwarding, sX11DisplayOffset,    sPrintMotd, sIgnoreRhosts, sX11Forwarding, sX11DisplayOffset,
Line 182 
Line 168 
 #ifdef KRB4  #ifdef KRB4
   { "kerberosauthentication", sKerberosAuthentication },    { "kerberosauthentication", sKerberosAuthentication },
   { "kerberosorlocalpasswd", sKerberosOrLocalPasswd },    { "kerberosorlocalpasswd", sKerberosOrLocalPasswd },
 #endif  
 #if defined(KRB4) || defined(AFS)  
   { "kerberosticketcleanup", sKerberosTicketCleanup },    { "kerberosticketcleanup", sKerberosTicketCleanup },
 #endif  #endif
 #ifdef KERBEROS_TGT_PASSING  
   { "kerberostgtpassing", sKerberosTgtPassing },  
 #endif  
 #ifdef AFS  #ifdef AFS
     { "kerberostgtpassing", sKerberosTgtPassing },
   { "afstokenpassing", sAFSTokenPassing },    { "afstokenpassing", sAFSTokenPassing },
 #endif  #endif
   { "passwordauthentication", sPasswordAuthentication },    { "passwordauthentication", sPasswordAuthentication },
Line 396 
Line 378 
         case sKerberosOrLocalPasswd:          case sKerberosOrLocalPasswd:
           intptr = &options->kerberos_or_local_passwd;            intptr = &options->kerberos_or_local_passwd;
           goto parse_flag;            goto parse_flag;
 #endif  
   
 #if defined(KRB4) || defined(AFS)  
         case sKerberosTicketCleanup:          case sKerberosTicketCleanup:
           intptr = &options->kerberos_ticket_cleanup;            intptr = &options->kerberos_ticket_cleanup;
           goto parse_flag;            goto parse_flag;
 #endif  #endif
   
 #ifdef KERBEROS_TGT_PASSING  #ifdef AFS
         case sKerberosTgtPassing:          case sKerberosTgtPassing:
           intptr = &options->kerberos_tgt_passing;            intptr = &options->kerberos_tgt_passing;
           goto parse_flag;            goto parse_flag;
 #endif  
   
 #ifdef AFS  
         case sAFSTokenPassing:          case sAFSTokenPassing:
           intptr = &options->afs_token_passing;            intptr = &options->afs_token_passing;
           goto parse_flag;            goto parse_flag;
Legend:
Removed from v.1.3  
changed lines
  Added in v.1.4