[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.275 and 1.276

version 1.275, 2015/07/01 02:39:06 version 1.276, 2015/07/10 06:21:53
Line 98 
Line 98 
         options->hostbased_authentication = -1;          options->hostbased_authentication = -1;
         options->hostbased_uses_name_from_packet_only = -1;          options->hostbased_uses_name_from_packet_only = -1;
         options->hostbased_key_types = NULL;          options->hostbased_key_types = NULL;
           options->hostkeyalgorithms = NULL;
         options->rsa_authentication = -1;          options->rsa_authentication = -1;
         options->pubkey_authentication = -1;          options->pubkey_authentication = -1;
         options->pubkey_key_types = NULL;          options->pubkey_key_types = NULL;
Line 242 
Line 243 
         if (options->hostbased_uses_name_from_packet_only == -1)          if (options->hostbased_uses_name_from_packet_only == -1)
                 options->hostbased_uses_name_from_packet_only = 0;                  options->hostbased_uses_name_from_packet_only = 0;
         if (options->hostbased_key_types == NULL)          if (options->hostbased_key_types == NULL)
                 options->hostbased_key_types = xstrdup("*");                  options->hostbased_key_types = xstrdup(KEX_DEFAULT_PK_ALG);
           if (options->hostkeyalgorithms == NULL)
                   options->hostkeyalgorithms = xstrdup(KEX_DEFAULT_PK_ALG);
         if (options->rsa_authentication == -1)          if (options->rsa_authentication == -1)
                 options->rsa_authentication = 1;                  options->rsa_authentication = 1;
         if (options->pubkey_authentication == -1)          if (options->pubkey_authentication == -1)
                 options->pubkey_authentication = 1;                  options->pubkey_authentication = 1;
         if (options->pubkey_key_types == NULL)          if (options->pubkey_key_types == NULL)
                 options->pubkey_key_types = xstrdup("*");                  options->pubkey_key_types = xstrdup(KEX_DEFAULT_PK_ALG);
         if (options->kerberos_authentication == -1)          if (options->kerberos_authentication == -1)
                 options->kerberos_authentication = 0;                  options->kerberos_authentication = 0;
         if (options->kerberos_or_local_passwd == -1)          if (options->kerberos_or_local_passwd == -1)
Line 370 
Line 373 
         sXAuthLocation, sSubsystem, sMaxStartups, sMaxAuthTries, sMaxSessions,          sXAuthLocation, sSubsystem, sMaxStartups, sMaxAuthTries, sMaxSessions,
         sBanner, sUseDNS, sHostbasedAuthentication,          sBanner, sUseDNS, sHostbasedAuthentication,
         sHostbasedUsesNameFromPacketOnly, sHostbasedAcceptedKeyTypes,          sHostbasedUsesNameFromPacketOnly, sHostbasedAcceptedKeyTypes,
           sHostKeyAlgorithms,
         sClientAliveInterval, sClientAliveCountMax, sAuthorizedKeysFile,          sClientAliveInterval, sClientAliveCountMax, sAuthorizedKeysFile,
         sGssAuthentication, sGssCleanupCreds, sGssStrictAcceptor,          sGssAuthentication, sGssCleanupCreds, sGssStrictAcceptor,
         sAcceptEnv, sPermitTunnel,          sAcceptEnv, sPermitTunnel,
Line 412 
Line 416 
         { "hostbasedauthentication", sHostbasedAuthentication, SSHCFG_ALL },          { "hostbasedauthentication", sHostbasedAuthentication, SSHCFG_ALL },
         { "hostbasedusesnamefrompacketonly", sHostbasedUsesNameFromPacketOnly, SSHCFG_ALL },          { "hostbasedusesnamefrompacketonly", sHostbasedUsesNameFromPacketOnly, SSHCFG_ALL },
         { "hostbasedacceptedkeytypes", sHostbasedAcceptedKeyTypes, SSHCFG_ALL },          { "hostbasedacceptedkeytypes", sHostbasedAcceptedKeyTypes, SSHCFG_ALL },
           { "hostkeyalgorithms", sHostKeyAlgorithms, SSHCFG_GLOBAL },
         { "rsaauthentication", sRSAAuthentication, SSHCFG_ALL },          { "rsaauthentication", sRSAAuthentication, SSHCFG_ALL },
         { "pubkeyauthentication", sPubkeyAuthentication, SSHCFG_ALL },          { "pubkeyauthentication", sPubkeyAuthentication, SSHCFG_ALL },
         { "pubkeyacceptedkeytypes", sPubkeyAcceptedKeyTypes, SSHCFG_ALL },          { "pubkeyacceptedkeytypes", sPubkeyAcceptedKeyTypes, SSHCFG_ALL },
Line 1135 
Line 1140 
                         *charptr = xstrdup(arg);                          *charptr = xstrdup(arg);
                 break;                  break;
   
           case sHostKeyAlgorithms:
                   charptr = &options->hostkeyalgorithms;
                   goto parse_keytypes;
   
         case sRSAAuthentication:          case sRSAAuthentication:
                 intptr = &options->rsa_authentication;                  intptr = &options->rsa_authentication;
                 goto parse_flag;                  goto parse_flag;
Line 2227 
Line 2236 
             o->kex_algorithms ? o->kex_algorithms : KEX_SERVER_KEX);              o->kex_algorithms ? o->kex_algorithms : KEX_SERVER_KEX);
         dump_cfg_string(sHostbasedAcceptedKeyTypes, o->hostbased_key_types ?          dump_cfg_string(sHostbasedAcceptedKeyTypes, o->hostbased_key_types ?
             o->hostbased_key_types : KEX_DEFAULT_PK_ALG);              o->hostbased_key_types : KEX_DEFAULT_PK_ALG);
           dump_cfg_string(sHostKeyAlgorithms, o->hostkeyalgorithms ?
               o->hostkeyalgorithms : KEX_DEFAULT_PK_ALG);
         dump_cfg_string(sPubkeyAcceptedKeyTypes, o->pubkey_key_types ?          dump_cfg_string(sPubkeyAcceptedKeyTypes, o->pubkey_key_types ?
             o->pubkey_key_types : KEX_DEFAULT_PK_ALG);              o->pubkey_key_types : KEX_DEFAULT_PK_ALG);
   
Legend:
Removed from v.1.275  
changed lines
  Added in v.1.276