diff options
Diffstat (limited to 'servconf.c')
-rw-r--r-- | servconf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/servconf.c b/servconf.c index 6c7a91e6b..b5db0f743 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -1,5 +1,5 @@ | |||
1 | 1 | ||
2 | /* $OpenBSD: servconf.c,v 1.280 2015/08/06 14:53:21 deraadt Exp $ */ | 2 | /* $OpenBSD: servconf.c,v 1.281 2015/08/21 23:52:30 djm Exp $ */ |
3 | /* | 3 | /* |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
5 | * All rights reserved | 5 | * All rights reserved |
@@ -259,8 +259,6 @@ fill_default_server_options(ServerOptions *options) | |||
259 | options->hostbased_authentication = 0; | 259 | options->hostbased_authentication = 0; |
260 | if (options->hostbased_uses_name_from_packet_only == -1) | 260 | if (options->hostbased_uses_name_from_packet_only == -1) |
261 | options->hostbased_uses_name_from_packet_only = 0; | 261 | options->hostbased_uses_name_from_packet_only = 0; |
262 | if (options->hostkeyalgorithms == NULL) | ||
263 | options->hostkeyalgorithms = xstrdup(KEX_DEFAULT_PK_ALG); | ||
264 | if (options->rsa_authentication == -1) | 262 | if (options->rsa_authentication == -1) |
265 | options->rsa_authentication = 1; | 263 | options->rsa_authentication = 1; |
266 | if (options->pubkey_authentication == -1) | 264 | if (options->pubkey_authentication == -1) |
@@ -346,6 +344,8 @@ fill_default_server_options(ServerOptions *options) | |||
346 | kex_assemble_names(KEX_SERVER_MAC, &options->macs) != 0 || | 344 | kex_assemble_names(KEX_SERVER_MAC, &options->macs) != 0 || |
347 | kex_assemble_names(KEX_SERVER_KEX, &options->kex_algorithms) != 0 || | 345 | kex_assemble_names(KEX_SERVER_KEX, &options->kex_algorithms) != 0 || |
348 | kex_assemble_names(KEX_DEFAULT_PK_ALG, | 346 | kex_assemble_names(KEX_DEFAULT_PK_ALG, |
347 | &options->hostkeyalgorithms) != 0 || | ||
348 | kex_assemble_names(KEX_DEFAULT_PK_ALG, | ||
349 | &options->hostbased_key_types) != 0 || | 349 | &options->hostbased_key_types) != 0 || |
350 | kex_assemble_names(KEX_DEFAULT_PK_ALG, | 350 | kex_assemble_names(KEX_DEFAULT_PK_ALG, |
351 | &options->pubkey_key_types) != 0) | 351 | &options->pubkey_key_types) != 0) |