[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.117 and 1.118

version 1.117, 2003/08/13 09:07:09 version 1.118, 2003/08/22 10:56:09
Line 105 
Line 105 
         oHostKeyAlgorithms, oBindAddress, oSmartcardDevice,          oHostKeyAlgorithms, oBindAddress, oSmartcardDevice,
         oClearAllForwardings, oNoHostAuthenticationForLocalhost,          oClearAllForwardings, oNoHostAuthenticationForLocalhost,
         oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,          oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
         oAddressFamily,          oAddressFamily, oGssAuthentication, oGssDelegateCreds,
         oDeprecated, oUnsupported          oDeprecated, oUnsupported
 } OpCodes;  } OpCodes;
   
Line 140 
Line 140 
         { "kerberostgtpassing", oUnsupported },          { "kerberostgtpassing", oUnsupported },
 #endif  #endif
         { "afstokenpassing", oUnsupported },          { "afstokenpassing", oUnsupported },
   #if defined(GSSAPI)
           { "gssapiauthentication", oGssAuthentication },
           { "gssapidelegatecreds", oGssDelegateCreds },
           { "gssapidelegatecredentials", oGssDelegateCreds },
   #else
           { "gssapiauthentication", oUnsupported },
           { "gssapidelegatecredentials", oUnsupported },
   #endif
         { "fallbacktorsh", oDeprecated },          { "fallbacktorsh", oDeprecated },
         { "usersh", oDeprecated },          { "usersh", oDeprecated },
         { "identityfile", oIdentityFile },          { "identityfile", oIdentityFile },
Line 387 
Line 395 
                 intptr = &options->kerberos_tgt_passing;                  intptr = &options->kerberos_tgt_passing;
                 goto parse_flag;                  goto parse_flag;
   
           case oGssAuthentication:
                   intptr = &options->gss_authentication;
                   goto parse_flag;
   
           case oGssDelegateCreds:
                   intptr = &options->gss_deleg_creds;
                   goto parse_flag;
   
         case oBatchMode:          case oBatchMode:
                 intptr = &options->batch_mode;                  intptr = &options->batch_mode;
                 goto parse_flag;                  goto parse_flag;
Line 811 
Line 827 
         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->gss_authentication = -1;
           options->gss_deleg_creds = -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 885 
Line 903 
                 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->gss_authentication == -1)
                   options->gss_authentication = 1;
           if (options->gss_deleg_creds == -1)
                   options->gss_deleg_creds = 0;
         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.117  
changed lines
  Added in v.1.118