summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--servconf.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/servconf.c b/servconf.c
index ad7e7a330..bc1350f76 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
1 1
2/* $OpenBSD: servconf.c,v 1.260 2015/02/02 01:57:44 deraadt Exp $ */ 2/* $OpenBSD: servconf.c,v 1.261 2015/04/17 04:12:35 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
@@ -2056,6 +2056,8 @@ dump_cfg_strarray_oneline(ServerOpCodes code, u_int count, char **vals)
2056{ 2056{
2057 u_int i; 2057 u_int i;
2058 2058
2059 if (count <= 0)
2060 return;
2059 printf("%s", lookup_opcode_name(code)); 2061 printf("%s", lookup_opcode_name(code));
2060 for (i = 0; i < count; i++) 2062 for (i = 0; i < count; i++)
2061 printf(" %s", vals[i]); 2063 printf(" %s", vals[i]);
@@ -2104,6 +2106,7 @@ dump_config(ServerOptions *o)
2104 dump_cfg_int(sMaxSessions, o->max_sessions); 2106 dump_cfg_int(sMaxSessions, o->max_sessions);
2105 dump_cfg_int(sClientAliveInterval, o->client_alive_interval); 2107 dump_cfg_int(sClientAliveInterval, o->client_alive_interval);
2106 dump_cfg_int(sClientAliveCountMax, o->client_alive_count_max); 2108 dump_cfg_int(sClientAliveCountMax, o->client_alive_count_max);
2109 dump_cfg_int(sStreamLocalBindMask, o->fwd_opts.streamlocal_bind_mask);
2107 2110
2108 /* formatted integer arguments */ 2111 /* formatted integer arguments */
2109 dump_cfg_fmtint(sPermitRootLogin, o->permit_root_login); 2112 dump_cfg_fmtint(sPermitRootLogin, o->permit_root_login);
@@ -2147,6 +2150,7 @@ dump_config(ServerOptions *o)
2147 dump_cfg_fmtint(sGatewayPorts, o->fwd_opts.gateway_ports); 2150 dump_cfg_fmtint(sGatewayPorts, o->fwd_opts.gateway_ports);
2148 dump_cfg_fmtint(sUseDNS, o->use_dns); 2151 dump_cfg_fmtint(sUseDNS, o->use_dns);
2149 dump_cfg_fmtint(sAllowTcpForwarding, o->allow_tcp_forwarding); 2152 dump_cfg_fmtint(sAllowTcpForwarding, o->allow_tcp_forwarding);
2153 dump_cfg_fmtint(sAllowAgentForwarding, o->allow_agent_forwarding);
2150 dump_cfg_fmtint(sAllowStreamLocalForwarding, o->allow_streamlocal_forwarding); 2154 dump_cfg_fmtint(sAllowStreamLocalForwarding, o->allow_streamlocal_forwarding);
2151 dump_cfg_fmtint(sUsePrivilegeSeparation, use_privsep); 2155 dump_cfg_fmtint(sUsePrivilegeSeparation, use_privsep);
2152 dump_cfg_fmtint(sFingerprintHash, o->fingerprint_hash); 2156 dump_cfg_fmtint(sFingerprintHash, o->fingerprint_hash);
@@ -2163,7 +2167,8 @@ dump_config(ServerOptions *o)
2163 dump_cfg_string(sRevokedKeys, o->revoked_keys_file); 2167 dump_cfg_string(sRevokedKeys, o->revoked_keys_file);
2164 dump_cfg_string(sAuthorizedPrincipalsFile, 2168 dump_cfg_string(sAuthorizedPrincipalsFile,
2165 o->authorized_principals_file); 2169 o->authorized_principals_file);
2166 dump_cfg_string(sVersionAddendum, o->version_addendum); 2170 dump_cfg_string(sVersionAddendum, *o->version_addendum == '\0'
2171 ? "none" : o->version_addendum);
2167 dump_cfg_string(sAuthorizedKeysCommand, o->authorized_keys_command); 2172 dump_cfg_string(sAuthorizedKeysCommand, o->authorized_keys_command);
2168 dump_cfg_string(sAuthorizedKeysCommandUser, o->authorized_keys_command_user); 2173 dump_cfg_string(sAuthorizedKeysCommandUser, o->authorized_keys_command_user);
2169 dump_cfg_string(sHostKeyAgent, o->host_key_agent); 2174 dump_cfg_string(sHostKeyAgent, o->host_key_agent);
@@ -2183,7 +2188,7 @@ dump_config(ServerOptions *o)
2183 o->authorized_keys_files); 2188 o->authorized_keys_files);
2184 dump_cfg_strarray(sHostKeyFile, o->num_host_key_files, 2189 dump_cfg_strarray(sHostKeyFile, o->num_host_key_files,
2185 o->host_key_files); 2190 o->host_key_files);
2186 dump_cfg_strarray(sHostKeyFile, o->num_host_cert_files, 2191 dump_cfg_strarray(sHostCertificate, o->num_host_cert_files,
2187 o->host_cert_files); 2192 o->host_cert_files);
2188 dump_cfg_strarray(sAllowUsers, o->num_allow_users, o->allow_users); 2193 dump_cfg_strarray(sAllowUsers, o->num_allow_users, o->allow_users);
2189 dump_cfg_strarray(sDenyUsers, o->num_deny_users, o->deny_users); 2194 dump_cfg_strarray(sDenyUsers, o->num_deny_users, o->deny_users);