diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2015-08-21 23:52:30 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-08-22 11:17:07 +1000 |
| commit | 6310f60fffca2d1e464168e7d1f7e3b6b0268897 (patch) | |
| tree | 0045d63dce614a9d7abd029d504d6d140eaff1ce /servconf.c | |
| parent | e774e5ea56237fd626a8161f9005023dff3e76c9 (diff) | |
| download | openssh-git-6310f60fffca2d1e464168e7d1f7e3b6b0268897.tar.gz | |
upstream commit
Fix expansion of HostkeyAlgorithms=+...
Reported by Bryan Drewery
Upstream-ID: 70ca1deea39d758ba36d36428ae832e28566f78d
Diffstat (limited to 'servconf.c')
| -rw-r--r-- | servconf.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,5 +1,5 @@ -/* $OpenBSD: servconf.c,v 1.280 2015/08/06 14:53:21 deraadt Exp $ */ +/* $OpenBSD: servconf.c,v 1.281 2015/08/21 23:52:30 djm Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -259,8 +259,6 @@ fill_default_server_options(ServerOptions *options) options->hostbased_authentication = 0; if (options->hostbased_uses_name_from_packet_only == -1) options->hostbased_uses_name_from_packet_only = 0; - if (options->hostkeyalgorithms == NULL) - options->hostkeyalgorithms = xstrdup(KEX_DEFAULT_PK_ALG); if (options->rsa_authentication == -1) options->rsa_authentication = 1; if (options->pubkey_authentication == -1) @@ -346,6 +344,8 @@ fill_default_server_options(ServerOptions *options) kex_assemble_names(KEX_SERVER_MAC, &options->macs) != 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, &options->hostbased_key_types) != 0 || kex_assemble_names(KEX_DEFAULT_PK_ALG, &options->pubkey_key_types) != 0) |