diff options
-rw-r--r-- | servconf.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/servconf.c b/servconf.c index b7f329447..21ddd3581 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -1,5 +1,5 @@ | |||
1 | 1 | ||
2 | /* $OpenBSD: servconf.c,v 1.251 2014/07/15 15:54:14 millert Exp $ */ | 2 | /* $OpenBSD: servconf.c,v 1.252 2014/08/19 23:58:28 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 |
@@ -54,6 +54,7 @@ | |||
54 | #include "packet.h" | 54 | #include "packet.h" |
55 | #include "hostfile.h" | 55 | #include "hostfile.h" |
56 | #include "auth.h" | 56 | #include "auth.h" |
57 | #include "myproposal.h" | ||
57 | 58 | ||
58 | static void add_listen_addr(ServerOptions *, char *, int); | 59 | static void add_listen_addr(ServerOptions *, char *, int); |
59 | static void add_one_listen_addr(ServerOptions *, char *, int); | 60 | static void add_one_listen_addr(ServerOptions *, char *, int); |
@@ -2070,9 +2071,8 @@ dump_config(ServerOptions *o) | |||
2070 | /* string arguments */ | 2071 | /* string arguments */ |
2071 | dump_cfg_string(sPidFile, o->pid_file); | 2072 | dump_cfg_string(sPidFile, o->pid_file); |
2072 | dump_cfg_string(sXAuthLocation, o->xauth_location); | 2073 | dump_cfg_string(sXAuthLocation, o->xauth_location); |
2073 | dump_cfg_string(sCiphers, o->ciphers ? o->ciphers : | 2074 | dump_cfg_string(sCiphers, o->ciphers ? o->ciphers : KEX_SERVER_ENCRYPT); |
2074 | cipher_alg_list(',', 0)); | 2075 | dump_cfg_string(sMacs, o->macs ? o->macs : KEX_SERVER_MAC); |
2075 | dump_cfg_string(sMacs, o->macs ? o->macs : mac_alg_list(',')); | ||
2076 | dump_cfg_string(sBanner, o->banner); | 2076 | dump_cfg_string(sBanner, o->banner); |
2077 | dump_cfg_string(sForceCommand, o->adm_forced_command); | 2077 | dump_cfg_string(sForceCommand, o->adm_forced_command); |
2078 | dump_cfg_string(sChrootDirectory, o->chroot_directory); | 2078 | dump_cfg_string(sChrootDirectory, o->chroot_directory); |
@@ -2084,8 +2084,8 @@ dump_config(ServerOptions *o) | |||
2084 | dump_cfg_string(sAuthorizedKeysCommand, o->authorized_keys_command); | 2084 | dump_cfg_string(sAuthorizedKeysCommand, o->authorized_keys_command); |
2085 | dump_cfg_string(sAuthorizedKeysCommandUser, o->authorized_keys_command_user); | 2085 | dump_cfg_string(sAuthorizedKeysCommandUser, o->authorized_keys_command_user); |
2086 | dump_cfg_string(sHostKeyAgent, o->host_key_agent); | 2086 | dump_cfg_string(sHostKeyAgent, o->host_key_agent); |
2087 | dump_cfg_string(sKexAlgorithms, o->kex_algorithms ? o->kex_algorithms : | 2087 | dump_cfg_string(sKexAlgorithms, |
2088 | kex_alg_list(',')); | 2088 | o->kex_algorithms ? o->kex_algorithms : KEX_SERVER_KEX); |
2089 | 2089 | ||
2090 | /* string arguments requiring a lookup */ | 2090 | /* string arguments requiring a lookup */ |
2091 | dump_cfg_string(sLogLevel, log_level_name(o->log_level)); | 2091 | dump_cfg_string(sLogLevel, log_level_name(o->log_level)); |