View | Details | Raw Unified | Return to bug 2346
Collapse All | Expand All

(-)a/servconf.c (-4 / +8 lines)
Lines 1974-1979 dump_cfg_strarray_oneline(ServerOpCodes code, u_int count, char **vals) Link Here
1974
{
1974
{
1975
	u_int i;
1975
	u_int i;
1976
1976
1977
	if (count <= 0)
1978
		return;
1977
	printf("%s", lookup_opcode_name(code));
1979
	printf("%s", lookup_opcode_name(code));
1978
	for (i = 0; i < count; i++)
1980
	for (i = 0; i < count; i++)
1979
		printf(" %s",  vals[i]);
1981
		printf(" %s",  vals[i]);
Lines 2011-2017 dump_config(ServerOptions *o) Link Here
2011
2011
2012
	/* integer arguments */
2012
	/* integer arguments */
2013
#ifdef USE_PAM
2013
#ifdef USE_PAM
2014
	dump_cfg_int(sUsePAM, o->use_pam);
2014
	dump_cfg_fmtint(sUsePAM, o->use_pam);
2015
#endif
2015
#endif
2016
	dump_cfg_int(sServerKeyBits, o->server_key_bits);
2016
	dump_cfg_int(sServerKeyBits, o->server_key_bits);
2017
	dump_cfg_int(sLoginGraceTime, o->login_grace_time);
2017
	dump_cfg_int(sLoginGraceTime, o->login_grace_time);
Lines 2021-2026 dump_config(ServerOptions *o) Link Here
2021
	dump_cfg_int(sMaxSessions, o->max_sessions);
2021
	dump_cfg_int(sMaxSessions, o->max_sessions);
2022
	dump_cfg_int(sClientAliveInterval, o->client_alive_interval);
2022
	dump_cfg_int(sClientAliveInterval, o->client_alive_interval);
2023
	dump_cfg_int(sClientAliveCountMax, o->client_alive_count_max);
2023
	dump_cfg_int(sClientAliveCountMax, o->client_alive_count_max);
2024
	dump_cfg_int(sStreamLocalBindMask, o->fwd_opts.streamlocal_bind_mask);
2024
2025
2025
	/* formatted integer arguments */
2026
	/* formatted integer arguments */
2026
	dump_cfg_fmtint(sPermitRootLogin, o->permit_root_login);
2027
	dump_cfg_fmtint(sPermitRootLogin, o->permit_root_login);
Lines 2064-2069 dump_config(ServerOptions *o) Link Here
2064
	dump_cfg_fmtint(sGatewayPorts, o->fwd_opts.gateway_ports);
2065
	dump_cfg_fmtint(sGatewayPorts, o->fwd_opts.gateway_ports);
2065
	dump_cfg_fmtint(sUseDNS, o->use_dns);
2066
	dump_cfg_fmtint(sUseDNS, o->use_dns);
2066
	dump_cfg_fmtint(sAllowTcpForwarding, o->allow_tcp_forwarding);
2067
	dump_cfg_fmtint(sAllowTcpForwarding, o->allow_tcp_forwarding);
2068
	dump_cfg_fmtint(sAllowAgentForwarding, o->allow_agent_forwarding);
2067
	dump_cfg_fmtint(sAllowStreamLocalForwarding, o->allow_streamlocal_forwarding);
2069
	dump_cfg_fmtint(sAllowStreamLocalForwarding, o->allow_streamlocal_forwarding);
2068
	dump_cfg_fmtint(sUsePrivilegeSeparation, use_privsep);
2070
	dump_cfg_fmtint(sUsePrivilegeSeparation, use_privsep);
2069
2071
Lines 2080-2086 dump_config(ServerOptions *o) Link Here
2080
	dump_cfg_string(sRevokedKeys, o->revoked_keys_file);
2082
	dump_cfg_string(sRevokedKeys, o->revoked_keys_file);
2081
	dump_cfg_string(sAuthorizedPrincipalsFile,
2083
	dump_cfg_string(sAuthorizedPrincipalsFile,
2082
	    o->authorized_principals_file);
2084
	    o->authorized_principals_file);
2083
	dump_cfg_string(sVersionAddendum, o->version_addendum);
2085
	dump_cfg_string(sVersionAddendum, *o->version_addendum == '\0'
2086
	    ? "none" : o->version_addendum);
2084
	dump_cfg_string(sAuthorizedKeysCommand, o->authorized_keys_command);
2087
	dump_cfg_string(sAuthorizedKeysCommand, o->authorized_keys_command);
2085
	dump_cfg_string(sAuthorizedKeysCommandUser, o->authorized_keys_command_user);
2088
	dump_cfg_string(sAuthorizedKeysCommandUser, o->authorized_keys_command_user);
2086
	dump_cfg_string(sHostKeyAgent, o->host_key_agent);
2089
	dump_cfg_string(sHostKeyAgent, o->host_key_agent);
Lines 2096-2102 dump_config(ServerOptions *o) Link Here
2096
	    o->authorized_keys_files);
2101
	    o->authorized_keys_files);
2097
	dump_cfg_strarray(sHostKeyFile, o->num_host_key_files,
2102
	dump_cfg_strarray(sHostKeyFile, o->num_host_key_files,
2098
	     o->host_key_files);
2103
	     o->host_key_files);
2099
	dump_cfg_strarray(sHostKeyFile, o->num_host_cert_files,
2104
	dump_cfg_strarray(sHostCertificate, o->num_host_cert_files,
2100
	     o->host_cert_files);
2105
	     o->host_cert_files);
2101
	dump_cfg_strarray(sAllowUsers, o->num_allow_users, o->allow_users);
2106
	dump_cfg_strarray(sAllowUsers, o->num_allow_users, o->allow_users);
2102
	dump_cfg_strarray(sDenyUsers, o->num_deny_users, o->deny_users);
2107
	dump_cfg_strarray(sDenyUsers, o->num_deny_users, o->deny_users);
2103
- 

Return to bug 2346