diff options
author | Damien Miller <djm@mindrot.org> | 2013-11-08 12:16:49 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-11-08 12:16:49 +1100 |
commit | 690d989008e18af3603a5e03f1276c9bad090370 (patch) | |
tree | 60dc95d5ad849ee6600da56ac4635b42740aad60 /servconf.c | |
parent | 08998c5fb9c7c1d248caa73b76e02ca0482e6d85 (diff) |
- dtucker@cvs.openbsd.org 2013/11/07 11:58:27
[cipher.c cipher.h kex.c kex.h mac.c mac.h servconf.c ssh.c]
Output the effective values of Ciphers, MACs and KexAlgorithms when
the default has not been overridden. ok markus@
Diffstat (limited to 'servconf.c')
-rw-r--r-- | servconf.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/servconf.c b/servconf.c index 0f1bdd09a..3593223f7 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -1,5 +1,5 @@ | |||
1 | 1 | ||
2 | /* $OpenBSD: servconf.c,v 1.244 2013/10/29 09:48:02 djm Exp $ */ | 2 | /* $OpenBSD: servconf.c,v 1.245 2013/11/07 11:58:27 dtucker 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 |
@@ -2037,8 +2037,9 @@ dump_config(ServerOptions *o) | |||
2037 | /* string arguments */ | 2037 | /* string arguments */ |
2038 | dump_cfg_string(sPidFile, o->pid_file); | 2038 | dump_cfg_string(sPidFile, o->pid_file); |
2039 | dump_cfg_string(sXAuthLocation, o->xauth_location); | 2039 | dump_cfg_string(sXAuthLocation, o->xauth_location); |
2040 | dump_cfg_string(sCiphers, o->ciphers); | 2040 | dump_cfg_string(sCiphers, o->ciphers ? o->ciphers : |
2041 | dump_cfg_string(sMacs, o->macs); | 2041 | cipher_alg_list(',')); |
2042 | dump_cfg_string(sMacs, o->macs ? o->macs : mac_alg_list(',')); | ||
2042 | dump_cfg_string(sBanner, o->banner); | 2043 | dump_cfg_string(sBanner, o->banner); |
2043 | dump_cfg_string(sForceCommand, o->adm_forced_command); | 2044 | dump_cfg_string(sForceCommand, o->adm_forced_command); |
2044 | dump_cfg_string(sChrootDirectory, o->chroot_directory); | 2045 | dump_cfg_string(sChrootDirectory, o->chroot_directory); |
@@ -2050,6 +2051,8 @@ dump_config(ServerOptions *o) | |||
2050 | dump_cfg_string(sAuthorizedKeysCommand, o->authorized_keys_command); | 2051 | dump_cfg_string(sAuthorizedKeysCommand, o->authorized_keys_command); |
2051 | dump_cfg_string(sAuthorizedKeysCommandUser, o->authorized_keys_command_user); | 2052 | dump_cfg_string(sAuthorizedKeysCommandUser, o->authorized_keys_command_user); |
2052 | dump_cfg_string(sHostKeyAgent, o->host_key_agent); | 2053 | dump_cfg_string(sHostKeyAgent, o->host_key_agent); |
2054 | dump_cfg_string(sKexAlgorithms, o->kex_algorithms ? o->kex_algorithms : | ||
2055 | kex_alg_list(',')); | ||
2053 | 2056 | ||
2054 | /* string arguments requiring a lookup */ | 2057 | /* string arguments requiring a lookup */ |
2055 | dump_cfg_string(sLogLevel, log_level_name(o->log_level)); | 2058 | dump_cfg_string(sLogLevel, log_level_name(o->log_level)); |