[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.280 and 1.281

version 1.280, 2015/08/06 14:53:21 version 1.281, 2015/08/21 23:52:30
Line 242 
Line 242 
                 options->hostbased_authentication = 0;                  options->hostbased_authentication = 0;
         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->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)
Line 328 
Line 326 
         if (kex_assemble_names(KEX_SERVER_ENCRYPT, &options->ciphers) != 0 ||          if (kex_assemble_names(KEX_SERVER_ENCRYPT, &options->ciphers) != 0 ||
             kex_assemble_names(KEX_SERVER_MAC, &options->macs) != 0 ||              kex_assemble_names(KEX_SERVER_MAC, &options->macs) != 0 ||
             kex_assemble_names(KEX_SERVER_KEX, &options->kex_algorithms) != 0 ||              kex_assemble_names(KEX_SERVER_KEX, &options->kex_algorithms) != 0 ||
               kex_assemble_names(KEX_DEFAULT_PK_ALG,
               &options->hostkeyalgorithms) != 0 ||
             kex_assemble_names(KEX_DEFAULT_PK_ALG,              kex_assemble_names(KEX_DEFAULT_PK_ALG,
             &options->hostbased_key_types) != 0 ||              &options->hostbased_key_types) != 0 ||
             kex_assemble_names(KEX_DEFAULT_PK_ALG,              kex_assemble_names(KEX_DEFAULT_PK_ALG,
Legend:
Removed from v.1.280  
changed lines
  Added in v.1.281